From 6101a18093f0db58837e68e3b58af58530163318 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Sat, 29 Jul 2023 10:07:09 +0700
Subject: [PATCH] Update service pelayanan pasien

Perbaikan detail logbook dokter yang sama untuk komponen lebih dari 1 di satu layanan yang sama
---
 .../com/jasamedika/medifirst2000/dao/PelayananPasienDao.java  | 2 +-
 .../service/impl/PelayananPasienServiceImpl.java              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
index 3d0ae9e8..078ac3c3 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
@@ -247,7 +247,7 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
 			+ "left join pr.detailJenisProduk djp " + "where (ppp.statusEnabled is true or ppp.statusEnabled is null) "
 			+ "and (pp.statusEnabled is true or pp.statusEnabled is null) "
 			+ "and (pd.statusEnabled is true or pd.statusEnabled is null) " + "and ppp.ObjectPegawaiId = :pegawaiId "
-			+ "and pp.noRec in (:norecs) "
+			+ "and ppp.noRec in (:norecs) "
 			+ "order by case when kp.id = 2 then 1 when kp.id = 4 then 2 when kp.id = 8 then 3 when kp.id = 9 then 4 "
 			+ "when kp.id = 1 then 5 when kp.id = 5 then 6 when kp.id = 6 then 7 when kp.id = 3 then 8 when kp.id = 7 then 9 else 10 end asc, "
 			+ "pp.tglPelayanan, " + "pp.hargaJual, "
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 0fb4ca0d..86e0daee 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
@@ -1576,7 +1576,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					map.put("hargaJual", k4);
 					map.put("idKelompokPasien", k5);
 					map.put("tanggal", k6);
-					List<String> norecs = v6.stream().map(e -> e.get("idPelayananPasien").toString())
+					List<String> norecs = v6.stream().map(e -> e.get("idPelayananPasienPetugas").toString())
 							.collect(Collectors.toList());
 					map.put("norecs", norecs);
 					double jumlah = v6.stream().mapToDouble(e -> Double.parseDouble(e.get("jumlah").toString())).sum();
@@ -1852,7 +1852,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					map.put("idKelompokPasien", k5);
 					map.put("jenisRuangan", k6);
 					map.put("tanggal", k7);
-					List<String> norecs = v7.stream().map(e -> e.get("idPelayananPasien").toString())
+					List<String> norecs = v7.stream().map(e -> e.get("idPelayananPasienPetugas").toString())
 							.collect(Collectors.toList());
 					map.put("norecs", norecs);
 					double jumlah = v7.stream().mapToDouble(e -> Double.parseDouble(e.get("jumlah").toString())).sum();