From 24e11b53911208da2407d755111cc661369f1c28 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Mon, 2 Sep 2024 10:26:32 +0700
Subject: [PATCH] Update PelayananPasienServiceImpl.java

Penyesuaian logbook dokter di superapp hanya menampilkan tanggal-tanggal capaian remun > Rp0
---
 .../impl/PelayananPasienServiceImpl.java      | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 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 4725e1f9..92791cf0 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
@@ -509,36 +509,38 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					.mapToDouble(tail -> Double.parseDouble(tail.get("hargaJasa").toString())
 							* Double.parseDouble(tail.get("jumlah").toString()))
 					.sum();
-			Map<String, Object> capaianTanggal = new HashMap<>();
-			capaianTanggal.put("tanggal", tanggalFormatter.format(date));
-			capaianTanggal.put("capaian", nf.format(jumlahHargaJasa));
-			{
-				List<Map<String, Object>> deskripsi = new ArrayList<>();
-				data.forEach(d -> {
-					Map<String, Object> detailDeskripsi = new HashMap<>();
-					List<Map<String, Object>> detailData = (List<Map<String, Object>>) d.get("detail");
-					detailData.stream().filter(tail -> tail.get("tanggal").toString().equals(tanggal)).findFirst()
-							.ifPresent(tail -> {
-								detailDeskripsi.put("layanan", d.get("namaProduk").toString());
-								if (CommonUtil.isNotNullOrEmpty(d.get("persenJasa"))) {
-									detailDeskripsi.put("tarifJasa",
-											nf.format(Double.parseDouble(d.get("hargaJual").toString())) + "/"
-													+ d.get("persenJasa").toString());
-								} else {
-									detailDeskripsi.put("tarifJasa",
-											nf.format(Double.parseDouble(d.get("hargaJual").toString())));
-								}
-								detailDeskripsi.put("remun",
-										nf.format(Double.parseDouble(d.get("hargaJasa").toString())));
-								detailDeskripsi.put("jumlah", tail.get("jumlah").toString());
-								detailDeskripsi.put("keterangan", d.get("keterangan").toString());
-							});
-					if (CommonUtil.isNotNullOrEmpty(detailDeskripsi))
-						deskripsi.add(detailDeskripsi);
-				});
-				capaianTanggal.put("deskripsi", deskripsi);
+			if (jumlahHargaJasa > 0.0) {
+				Map<String, Object> capaianTanggal = new HashMap<>();
+				capaianTanggal.put("tanggal", tanggalFormatter.format(date));
+				capaianTanggal.put("capaian", nf.format(jumlahHargaJasa));
+				{
+					List<Map<String, Object>> deskripsi = new ArrayList<>();
+					data.forEach(d -> {
+						Map<String, Object> detailDeskripsi = new HashMap<>();
+						List<Map<String, Object>> detailData = (List<Map<String, Object>>) d.get("detail");
+						detailData.stream().filter(tail -> tail.get("tanggal").toString().equals(tanggal)).findFirst()
+								.ifPresent(tail -> {
+									detailDeskripsi.put("layanan", d.get("namaProduk").toString());
+									if (CommonUtil.isNotNullOrEmpty(d.get("persenJasa"))) {
+										detailDeskripsi.put("tarifJasa",
+												nf.format(Double.parseDouble(d.get("hargaJual").toString())) + "/"
+														+ d.get("persenJasa").toString());
+									} else {
+										detailDeskripsi.put("tarifJasa",
+												nf.format(Double.parseDouble(d.get("hargaJual").toString())));
+									}
+									detailDeskripsi.put("remun",
+											nf.format(Double.parseDouble(d.get("hargaJasa").toString())));
+									detailDeskripsi.put("jumlah", tail.get("jumlah").toString());
+									detailDeskripsi.put("keterangan", d.get("keterangan").toString());
+								});
+						if (CommonUtil.isNotNullOrEmpty(detailDeskripsi))
+							deskripsi.add(detailDeskripsi);
+					});
+					capaianTanggal.put("deskripsi", deskripsi);
+				}
+				result.add(capaianTanggal);
 			}
-			result.add(capaianTanggal);
 		}
 		return result;
 	}
@@ -2119,7 +2121,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 										: byDetailTarifNonKelas.get().getHargaSatuan()));
 					}
 				}
-			} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(d.get("idDepartemen"))
+			} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(Integer.parseInt(d.get("idDepartemen").toString()))
 					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
 				Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 						.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
@@ -2129,7 +2131,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
 								? byDetailTarifNonKelas.get().getHargaNetto1()
 								: byDetailTarifNonKelas.get().getHargaSatuan()));
-			} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(d.get("idDepartemen"))
+			} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(Integer.parseInt(d.get("idDepartemen").toString()))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
 						.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))