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 ae39a44f..0b7a60b3 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
@@ -333,7 +333,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "inner join pelayananpasienpetugas_t ppp on pp.norec = ppp.pelayananpasien "
 			+ "inner join mappegawaijabatantounitkerja_m mj on ppp.objectpegawaifk = mj.objectpegawaifk "
 			+ "where ppp.objectpegawaifk = :pegawaiId " + "and pp.tglpelayanan between :tglAwal and :tglAkhir "
-			+ "and mj.statusenabled = true " + "and ppp.objectjenispetugaspefk in (:listJenisPetugasPelaksanaId)")
+			+ "and mj.statusenabled = true " + "and pp.statusenabled = true " + "and ppp.objectjenispetugaspefk in (:listJenisPetugasPelaksanaId)")
 	List<String> findIdPelayananByDokter(@Param("pegawaiId") Integer idPegawai, @Param("tglAwal") Date tglAwal,
 			@Param("tglAkhir") Date tglAkhir,
 			@Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana);
@@ -341,14 +341,14 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 	@Query(nativeQuery = true, value = "select pp.norec " + "from pelayananpasien_t pp "
 			+ "inner join pelayananpasienpetugas_t ppp on pp.norec = ppp.pelayananpasien "
 			+ "inner join mappegawaijabatantounitkerja_m mj on ppp.objectpegawaifk = mj.objectpegawaifk "
-			+ "where pp.tglpelayanan between :tglAwal and :tglAkhir " + "and mj.statusenabled = true "
+			+ "where pp.tglpelayanan between :tglAwal and :tglAkhir " + "and mj.statusenabled = true " + "and pp.statusenabled = true "
 			+ "and mj.objectunitkerjapegawaifk in (:listKsmId) "
 			+ "and ppp.objectjenispetugaspefk in (:listJenisPetugasPelaksanaId) "
 			+ "group by pp.norec having count(pp.norec) > 1")
 	List<String> findIdPelayananByKsm(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir,
 			@Param("listKsmId") List<Integer> listIdKsm,
 			@Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana);
-
+	
 	@Query("select distinct new com.jasamedika.medifirst2000.dto.PelayananDokterBedahDto("
 			+ "pp.noRec as noRec,pp.produkId as idProduk,"
 			+ "ppp.ObjectPegawaiId as idPegawai,ppp.ObjectJenisPetugasPeId as idJenisPetugasPelaksana) "
@@ -357,7 +357,16 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "and ppp.ObjectPegawaiId = mj.pegawaiId " + "and ppp.ObjectPegawaiId = pg.id "
 			+ "and pp.tglPelayanan between :tglAwal and :tglAkhir " + "and mj.unitKerjaPegawaiId in (:listKsmId) "
 			+ "and ppp.ObjectJenisPetugasPeId in (:listJenisPetugasPelaksanaId) "
+			+ "and pp.statusEnabled is true "
 			+ "and pp.noRec in (:listPelayananIdByDokter) " + "and pp.noRec in (:listPelayananIdByKsm)")
+	List<PelayananDokterBedahDto> findPelayananBedahOriginal(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir,
+			@Param("listKsmId") List<Integer> listIdKsm,
+			@Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana,
+			@Param("listPelayananIdByDokter") List<String> listIdPelayananByDokter,
+			@Param("listPelayananIdByKsm") List<String> listIdPelayananByKsm);
+
+	@Query(nativeQuery = true, value = "select distinct pp.noRec as noRec, pp.produkfk as idProduk, ppp.objectpegawaifk as idPegawai, ppp.objectjenispetugaspefk as idJenisPetugasPelaksana from pelayananpasienpetugas_t ppp inner join mappegawaijabatantounitkerja_m mj on mj.objectpegawaifk = ppp.objectpegawaifk inner join pelayananpasien_t pp on pp.norec = ppp.pelayananpasien inner join pegawai_m pg on mj.objectpegawaifk = pg.id where mj.statusEnabled is true and ppp.objectpegawaifk = mj.objectpegawaifk and ppp.objectpegawaifk = pg.id and pp.tglPelayanan between :tglAwal and :tglAkhir and mj.objectunitkerjapegawaifk in (:listKsmId) and ppp.objectjenispetugaspefk in (:listJenisPetugasPelaksanaId) and pp.statusEnabled is true and pp.noRec in (:listPelayananIdByDokter) and pp.noRec in (:listPelayananIdByKsm)")
+			
 	List<PelayananDokterBedahDto> findPelayananBedah(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir,
 			@Param("listKsmId") List<Integer> listIdKsm,
 			@Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana,