From 4fd6a42bdf3ca9dc66d41ef2b6ed9b46f746e7f1 Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe@live.com>
Date: Wed, 9 Nov 2022 15:29:49 +0700
Subject: [PATCH] Update MapRuanganToAkomodasiService Perbaikan pilihan produk
 akomodasi saat mapping karena tarif baru

---
 .../medifirst2000/dao/MapRuanganToProdukDao.java          | 5 +++--
 .../service/impl/MapRuanganToAkomodasiServiceImpl.java    | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapRuanganToProdukDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapRuanganToProdukDao.java
index 594d5d53..0ec93fd4 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapRuanganToProdukDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapRuanganToProdukDao.java
@@ -31,8 +31,9 @@ public interface MapRuanganToProdukDao extends PagingAndSortingRepository<MapRua
 			+ "where model.ruanganId=:ruanganId")
 	List<Integer> findJenisProdukExepetion(@Param("ruanganId") Integer ruanganId);
 
-	@Query("select distinct new Map(pr.id as id, pr.namaProduk as namaProduk) " + "from MapRuanganToProduk mapr "
-			+ "left join mapr.produk pr " + "where mapr.statusEnabled is true and pr.statusEnabled is true "
+	@Query("select distinct new Map(pr.id as id, pr.namaProduk as namaProduk, pr.reportDisplay as reportDisplay) "
+			+ "from MapRuanganToProduk mapr " + "left join mapr.produk pr "
+			+ "where mapr.statusEnabled is true and pr.statusEnabled is true "
 			+ "and mapr.ruanganId = :ruanganId and pr.namaProduk like %:namaProduk%")
 	List<Map<String, Object>> findProdukRuanganByMapProduk(@Param("ruanganId") Integer ruanganId,
 			@Param("namaProduk") String namaProduk);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapRuanganToAkomodasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapRuanganToAkomodasiServiceImpl.java
index 814a15b4..35e78f3d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapRuanganToAkomodasiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapRuanganToAkomodasiServiceImpl.java
@@ -158,7 +158,13 @@ public class MapRuanganToAkomodasiServiceImpl implements MapRuanganToAkomodasiSe
 
 	@Override
 	public List<Map<String, Object>> getAkomodasiRuanganByMapProduk(Integer idRuangan) {
-		List<Map<String, Object>> result = mapRuanganToProdukDao.findProdukRuanganByMapProduk(idRuangan, "Akomodasi");
+		List<Map<String, Object>> result = new ArrayList<>();
+		List<Map<String, Object>> data = mapRuanganToProdukDao.findProdukRuanganByMapProduk(idRuangan, "Akomodasi");
+		data.stream().forEach(produk -> {
+			if (produk.get("reportDisplay").equals("tarif_2022_Nov")) {
+				result.add(produk);
+			}
+		});
 		return result;
 	}