diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
index b68dad46..c3718bff 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
@@ -112,10 +112,9 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "and mrtp.ruanganId = apd.ruanganId " + "and ppp.ObjectPegawaiId = mpju.pegawaiId "
 			+ "and mpju.pegawaiId = pg.id " + "and pjk.pegawaiId = ppp.ObjectPegawaiId "
 			+ "and pjk.pegawaiId = mpju.pegawaiId " + "and pjk.pegawaiId = pg.id "
-			+ "and mpju.unitKerjaPegawaiId in (:listKsmId) " + "and mrtp.statusEnabled is true "
-			+ "and mpju.statusEnabled is true " + "and pg.statusEnabled is true " + "and su.statusEnabled is true "
-			+ "and pd.statusEnabled is true " + "and sk.statusEnabled is true "
-			+ "and pp.tglPelayanan between :tglAwal and :tglAkhir "
+			+ "and mpju.unitKerjaPegawaiId in (:listKsmId) " + "and mpju.statusEnabled is true "
+			+ "and pg.statusEnabled is true " + "and su.statusEnabled is true " + "and pd.statusEnabled is true "
+			+ "and sk.statusEnabled is true " + "and pp.tglPelayanan between :tglAwal and :tglAkhir "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
 			+ "and (((((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
 			+ "and to_char(pp.tglPelayanan,'HH24:MM:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId = 18 then '14:00:00' else '15:30:00' end)) "
@@ -144,10 +143,9 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "left join pjk.tanggal kl " + "where mrtp.produkId = pr.id " + "and mrtp.ruanganId = apd.ruanganId "
 			+ "and ppp.ObjectPegawaiId = mpju.pegawaiId " + "and mpju.pegawaiId = pg.id "
 			+ "and pjk.pegawaiId = ppp.ObjectPegawaiId " + "and pjk.pegawaiId = pg.id "
-			+ "and mpju.unitKerjaPegawaiId in (:listKsmId) " + "and mrtp.statusEnabled is true "
-			+ "and mpju.statusEnabled is true " + "and pg.statusEnabled is true " + "and jb.statusEnabled is true "
-			+ "and pd.statusEnabled is true " + "and sk.statusEnabled is true "
-			+ "and pp.tglPelayanan between :tglAwal and :tglAkhir "
+			+ "and mpju.unitKerjaPegawaiId in (:listKsmId) " + "and mpju.statusEnabled is true "
+			+ "and pg.statusEnabled is true " + "and jb.statusEnabled is true " + "and pd.statusEnabled is true "
+			+ "and sk.statusEnabled is true " + "and pp.tglPelayanan between :tglAwal and :tglAkhir "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
 			+ "and (((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
 			+ "and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId = 18 then '14:00:01' else '15:30:01' end) and '23:59:59' "
@@ -176,8 +174,8 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "left join apd.pasienDaftar pd " + "left join apd.ruangan ru " + "left join pjk.shift sk "
 			+ "left join pjk.tanggal kl " + "where mrtp.produkId = pr.id " + "and mrtp.ruanganId = apd.ruanganId "
 			+ "and pjk.pegawaiId = ppp.ObjectPegawaiId " + "and pjk.pegawaiId = pg.id "
-			+ "and mrtp.statusEnabled is true " + "and pg.statusEnabled is true " + "and pd.statusEnabled is true "
-			+ "and sk.statusEnabled is true " + "and to_char(pp.tglPelayanan,'yyyy-MM') = :bulan "
+			+ "and pg.statusEnabled is true " + "and pd.statusEnabled is true " + "and sk.statusEnabled is true "
+			+ "and to_char(pp.tglPelayanan,'yyyy-MM') = :bulan "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
 			+ "and (((((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
 			+ "and to_char(pp.tglPelayanan,'HH24:MM:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId = 18 then '14:00:00' else '15:30:00' end)) "
@@ -205,8 +203,8 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "left join apd.pasienDaftar pd " + "left join apd.ruangan ru " + "left join pjk.shift sk "
 			+ "left join pjk.tanggal kl " + "where mrtp.produkId = pr.id " + "and mrtp.ruanganId = apd.ruanganId "
 			+ "and pjk.pegawaiId = ppp.ObjectPegawaiId " + "and pjk.pegawaiId = pg.id "
-			+ "and mrtp.statusEnabled is true " + "and pg.statusEnabled is true " + "and pd.statusEnabled is true "
-			+ "and sk.statusEnabled is true " + "and to_char(pp.tglPelayanan,'yyyy-MM') = :bulan "
+			+ "and pg.statusEnabled is true " + "and pd.statusEnabled is true " + "and sk.statusEnabled is true "
+			+ "and to_char(pp.tglPelayanan,'yyyy-MM') = :bulan "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
 			+ "and (((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
 			+ "and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId = 18 then '14:00:01' else '15:30:01' end) and '23:59:59' "
@@ -238,8 +236,8 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "left join pd.pasien ps " + "left join pjk.shift sk " + "left join pjk.tanggal kl "
 			+ "where mrtp.produkId = pr.id " + "and mrtp.ruanganId = apd.ruanganId "
 			+ "and pjk.pegawaiId = ppp.ObjectPegawaiId " + "and pjk.pegawaiId = pg.id "
-			+ "and mrtp.statusEnabled is true " + "and pg.statusEnabled is true " + "and pd.statusEnabled is true "
-			+ "and pr.id = :produkId " + "and to_char(pp.tglPelayanan,'yyyy-MM-dd') = :tglPelayanan "
+			+ "and pg.statusEnabled is true " + "and pd.statusEnabled is true " + "and pr.id = :produkId "
+			+ "and to_char(pp.tglPelayanan,'yyyy-MM-dd') = :tglPelayanan "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
 			+ "and (((((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
 			+ "and to_char(pp.tglPelayanan,'HH24:MM:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId = 18 then '14:00:00' else '15:30:00' end)) "
@@ -270,8 +268,8 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "left join pd.pasien ps " + "left join pjk.shift sk " + "left join pjk.tanggal kl "
 			+ "where mrtp.produkId = pr.id " + "and mrtp.ruanganId = apd.ruanganId "
 			+ "and pjk.pegawaiId = ppp.ObjectPegawaiId " + "and pjk.pegawaiId = pg.id "
-			+ "and mrtp.statusEnabled is true " + "and pg.statusEnabled is true " + "and pd.statusEnabled is true "
-			+ "and pr.id = :produkId " + "and to_char(pp.tglPelayanan,'yyyy-MM-dd') = :tglPelayanan "
+			+ "and pg.statusEnabled is true " + "and pd.statusEnabled is true " + "and pr.id = :produkId "
+			+ "and to_char(pp.tglPelayanan,'yyyy-MM-dd') = :tglPelayanan "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
 			+ "and (((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
 			+ "and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId = 18 then '14:00:01' else '15:30:01' end) and '23:59:59' "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDokterDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDokterDao.java
index d2ce7e8f..a7cff282 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDokterDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDokterDao.java
@@ -39,7 +39,7 @@ public interface LogbookKinerjaDokterDao extends PagingAndSortingRepository<Logb
 	public List<LogbookKinerjaDokter> findAllTargetLayanan(@Param("tglAwal") String tglAwal,
 			@Param("tglAkhir") String tglAkhir);
 
-	@Query("select new Map (pg.id as id,pg.namaLengkap as namaLengkap,pg.tglMasuk as tglMasuk) "
+	@Query("select distinct new Map (pg.id as id,pg.namaLengkap as namaLengkap,pg.tglMasuk as tglMasuk) "
 			+ "from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg " + "inner join mj.jabatan jb "
 			+ "where mj.statusEnabled is true " + "and pg.statusEnabled is true " + "and jb.statusEnabled is true "
 			+ "and pg.kategoryPegawaiId in (:listKategoryPegawaiId) " + "and jb.kelompokJabatanId in (3,4)")