diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java index cff247e0..8724ccfd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java @@ -1572,15 +1572,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel private List> transformPelayananPaket(Integer idPegawai, String bulan, List> listData) { List drKsmObgyn = pegawaiDao.getDokterByKsm(KSM_OBGYN); - DateFormat df = new SimpleDateFormat("yyyy-MM"); SimpleDateFormat month = new SimpleDateFormat("MMM-yyyy", new Locale("in", "ID")); - Date date; - try { - date = df.parse(bulan); - } catch (ParseException e) { - throw new ServiceVOException(e.getMessage()); - } - Date tglAwal = DateUtil.startMonth(date); listData.forEach(d -> { if (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) @@ -1652,8 +1644,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("bulanPulangIbu", month.format((Date) first.get().get("tglKeluar"))); first.ifPresent(f -> d.put("isBatalPaket", f.get("isBatal"))); if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().get("tglKeluar")) - && (tglAwal.equals(first.get().get("tglKeluar")) - || ((Date) first.get().get("tglKeluar")).after(tglAwal)) && !PERAWAT.name().equals(d.get("paketType")) && !Boolean.parseBoolean(d.get("isBatalPaket").toString())) { d.put("tglPulangIbu", first.get().get("tglKeluar"));