From ccccbf804d9ff98f4bb2df01c8d17359ce2211f1 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Mon, 3 Apr 2023 09:06:00 +0700
Subject: [PATCH] Update PelayananPasienDao.java

filter barang farmasi
---
 .../jasamedika/medifirst2000/dao/PelayananPasienDao.java    | 6 +++---
 1 file 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 a46ae0d0..1dd24d0a 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
@@ -207,10 +207,10 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
 			+ "pd.noRec as idPasienDaftar) " + "from PelayananPasienPetugas ppp " + "inner join ppp.pelayananPasien pp "
 			+ "inner join pp.pasienDaftar apd " + "inner join apd.pasienDaftar pd " + "left join pp.produk pr "
 			+ "left join pp.kelas kls " + "left join pd.kelompokPasien kp " + "left join apd.ruangan ru "
-			+ "where (ppp.statusEnabled is true or ppp.statusEnabled is null) "
+			+ "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.tglPelayanan between :tglAwal and :tglAkhir "
+			+ "and (pd.statusEnabled is true or pd.statusEnabled is null) " + "and djp.jenisProdukId <> 97 "
+			+ "and ppp.ObjectPegawaiId = :pegawaiId " + "and pp.tglPelayanan between :tglAwal and :tglAkhir "
 			+ "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")