From 70c2be46a213f2609e4bacb69d800f0aeed5c500 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Tue, 16 Jul 2024 08:20:28 +0700
Subject: [PATCH] Update PelayananPasienServiceImpl.java

Penambahan kemungkinan paket dilakukan di selain departemen setara rawat inap
---
 .../impl/PelayananPasienServiceImpl.java      | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 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 b9440145..87c20562 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
@@ -2005,7 +2005,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					.parseInt(d.get("pasienId").toString()) == Integer.parseInt(bn.get("idIbu").toString())
 					|| Integer.parseInt(d.get("pasienId").toString()) == Integer.parseInt(bn.get("idAnak").toString()))
 					.map(bn -> Integer.parseInt(bn.get("idAnak").toString())).collect(Collectors.toList());
-			Optional<Map<String, Object>> first = ibuPaketDiRanapByDokter.stream()
+			Optional<Map<String, Object>> validateIbuPaketDiRanap = ibuPaketDiRanapByDokter.stream()
 					.filter(paket -> Integer.parseInt(d.get("pasienId").toString()) == Integer
 							.parseInt(paket.get("pasienId").toString())
 							|| (listIdAnak.contains(Integer.parseInt(d.get("pasienId").toString()))
@@ -2017,13 +2017,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			d.put("bulanPulangIbu", "");
 			d.put("hargaJasa", 0.0);
 			d.put("isBatalPaket", false);
-			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"))
+			if (validateIbuPaketDiRanap.isPresent()
+					&& CommonUtil.isNotNullOrEmpty(validateIbuPaketDiRanap.get().get("tglKeluar")))
+				d.put("bulanPulangIbu", month.format((Date) validateIbuPaketDiRanap.get().get("tglKeluar")));
+			validateIbuPaketDiRanap.ifPresent(f -> d.put("isBatalPaket", f.get("isBatal")));
+			if (validateIbuPaketDiRanap.isPresent()
+					&& CommonUtil.isNotNullOrEmpty(validateIbuPaketDiRanap.get().get("tglKeluar"))
 					&& !PERAWAT.name().equals(d.get("paketType"))
 					&& !Boolean.parseBoolean(d.get("isBatalPaket").toString())) {
-				d.put("tglPulangIbu", first.get().get("tglKeluar"));
+				d.put("tglPulangIbu", validateIbuPaketDiRanap.get().get("tglKeluar"));
 				if (drKsmObgyn.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
 						&& TINDAKAN_UTAMA.name().equals(d.get("paketType"))) {
 					Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
@@ -2117,6 +2119,14 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 										: byDetailTarifNonKelas.get().getHargaSatuan()));
 					}
 				}
+			} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(d.get("idDepartemen"))) {
+				Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
+						.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
+						.filter(dt -> dt.getKelasId().equals(d.get("idKelas"))).findFirst();
+				byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
+						CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
+								? byDetailTarifNonKelas.get().getHargaNetto1()
+								: byDetailTarifNonKelas.get().getHargaSatuan()));
 			}
 		});
 		return listData;