From 2277288e02ceb2fc904f7d49e04d09ce8d07832e Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Sat, 18 Nov 2023 15:47:06 +0700 Subject: [PATCH] Update PelayananPasienServiceImpl.java Perbaikan formatting tgl ibu keluar ranap dan akomodasi ibu belum pulang ranap di logbook fixed-pay --- .../service/impl/PelayananPasienServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 360f18ec..1405504a 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 @@ -1653,11 +1653,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("bulanPulangIbu", ""); d.put("hargaJasa", 0.0); d.put("isBatalPaket", false); - first.ifPresent(f -> { - d.put("bulanPulangIbu", month.format(f.get("tglKeluar"))); - d.put("isBatalPaket", f.get("isBatal")); - }); - if (first.isPresent() + if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().get("tglKeluar"))) + 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"))