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 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> 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> getAkomodasiRuanganByMapProduk(Integer idRuangan) { - List> result = mapRuanganToProdukDao.findProdukRuanganByMapProduk(idRuangan, "Akomodasi"); + List> result = new ArrayList<>(); + List> data = mapRuanganToProdukDao.findProdukRuanganByMapProduk(idRuangan, "Akomodasi"); + data.stream().forEach(produk -> { + if (produk.get("reportDisplay").equals("tarif_2022_Nov")) { + result.add(produk); + } + }); return result; }