From ee2a5f9bb1b8d8ad81f556b4852053d8815f5cc1 Mon Sep 17 00:00:00 2001
From: salmanoersabhk <salmanoe.rsabhk@gmail.com>
Date: Tue, 27 Sep 2022 16:55:23 +0700
Subject: [PATCH] Update PelayananNakesDao.java Perbaikan logbook pelayanan
 nakes dengan filter master produk hanya yang aktif

---
 .../com/jasamedika/medifirst2000/dao/PelayananNakesDao.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananNakesDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananNakesDao.java
index 6b5c21e1..0c926fa8 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananNakesDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananNakesDao.java
@@ -28,9 +28,8 @@ public interface PelayananNakesDao extends PagingAndSortingRepository<PelayananN
 			+ "when pn.kdProduk = 2 then 'Pelayanan Non-Pasien' end) as kodeProduk,"
 			+ "pg.id as pegawaiId,pg.namaLengkap as namaLengkap) " + "from PelayananNakes pnt "
 			+ "inner join pnt.produk pn " + "inner join pnt.pegawai pg " + "where pnt.statusEnabled is true "
-			+ "and pn.statusEnabled is true " + "and pg.statusEnabled is true "
-			+ "and to_char(pnt.tglPelayanan,'yyyy-MM') = :bulan " + "and pnt.pegawaiId = :pegawaiId "
-			+ "order by pn.namaProduk, pnt.tglPelayanan")
+			+ "and pg.statusEnabled is true " + "and to_char(pnt.tglPelayanan,'yyyy-MM') = :bulan "
+			+ "and pnt.pegawaiId = :pegawaiId " + "order by pn.namaProduk, pnt.tglPelayanan")
 	List<Map<String, Object>> findPelayananNakes(@Param("bulan") String bulan, @Param("pegawaiId") Integer idPegawai);
 
 	@Query("select new Map(pnt.tglPelayanan as tglPelayanan,"