diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
index 1421faef..5d5a8121 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
@@ -160,8 +160,9 @@ public class Master {
 		public static final Integer LAB_KLINIK = 36; // laboratorium_klinik
 		public static final Integer OBAT_ALKES = 97; // barang_farmasi
 
-		public static final Integer[] NONTINDAKAN = { 97, 283 }; // barang_farmasi,vaksin
 		public static final Integer[] NONKONSULTASI = { 116, 277 }; // reagensia,barang_umum
+		public static final Integer[] NONLOGBOOK = { 97, 277, 283 }; // barang_farmasi,barang_umum,vaksin
+		public static final Integer[] NONTINDAKAN = { 97, 283 }; // barang_farmasi,vaksin
 	}
 
 	public static final class KategoryPegawai {
@@ -246,6 +247,7 @@ public class Master {
 		public static final Integer BIAYA_OBAT_ALKES = 16;
 		public static final Integer BIAYA_RAWAT_INAP = 17;
 		public static final Integer BIAYA_RAWAT_JALAN = 18;
+		public static final Integer POTONGAN_TOKO_KOPERASI = 19;
 	}
 
 	public static final class KomponenHarga {
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
index f4e8bca8..4997b660 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
@@ -196,9 +196,9 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "pasienDaftar.kelompokPasienId as kelompokPasienId," + "pasienDaftar.rekananId as rekananId,"
 			+ "pasienDaftar.diskonPegawai as statusDiskon, " + "antrian.pegawaiId as idDPJP, "
 			+ "kategoryPegawai.id as kategoryPegawaiId, " + "kelas.id as idKelas,"
-			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, "
-			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
-			+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+			+ "jenisPetugas.id as idJenisPetugas,jenisPetugas.jenisPetugasPe as jenisPetugas, "
+			+ "departemen.id as departemenId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
+			+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
 			+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PegawaiJadwalKerja jadwalKerja, "
 			+ "Kalender kalender, " + "ShiftKerja shift "
 			+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
@@ -227,8 +227,9 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "ruangan.namaRuangan as ruangan," + "pelayananPasien.noRec as noRecPelayananPasien,"
 			+ "detail.id as detailId, " + "produk.namaProduk as namaProduk," + "pasien.namaPasien as namapasien,"
 			+ "pasien.noCm as noCm," + "pasien.tglLahir as tglLahir," + "pasienDaftar.noRegistrasi as noRegistrasi,"
-			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pelayananPasien.hargaSatuan as harga,"
-			+ "coalesce(pelayananPasien.hargaDiscount,0) as diskon," + "pelayananPasien.jumlah as jumlah, "
+			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "antrian.pegawaiId as idDPJP,"
+			+ "pelayananPasien.hargaSatuan as harga," + "coalesce(pelayananPasien.hargaDiscount,0) as diskon,"
+			+ "pelayananPasien.jumlah as jumlah, "
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
 			+ "where harga.produkId = produk.id "
 			+ "and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov') "
@@ -239,9 +240,9 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
 			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.rekananId as rekananId,"
 			+ "kategoryPegawai.id as kategoryPegawaiId, " + "kelas.id as idKelas,"
-			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, "
-			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
-			+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+			+ "jenisPetugas.id as idJenisPetugas,jenisPetugas.jenisPetugasPe as jenisPetugas, "
+			+ "departemen.id as departemenId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
+			+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
 			+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PegawaiJadwalKerja jadwalKerja, "
 			+ "Kalender kalender, " + "ShiftKerja shift "
 			+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiDao.java
index c8cc266b..29a7ad4c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiDao.java
@@ -23,7 +23,8 @@ public interface SlipGajiDao extends JpaRepository<SlipGaji, String> {
 			+ "inner join sg.pegawai pg where sg.bulan between :start and :end")
 	List<Integer> findPegawaiKomponenByBulan(@Param("start") Date start, @Param("end") Date end);
 
-	@Query("select new Map(sg.id as id,pg.id as idPegawai,pg.namaLengkap as namaPegawai) " + "from SlipGaji sg "
-			+ "inner join sg.pegawai pg " + "where sg.bulan between :start and :end " + "order by pg.namaLengkap")
+	@Query("select new Map(sg.id as id,pg.id as idPegawai,pg.namaLengkap as namaPegawai,"
+			+ "coalesce(pg.nipPns,'-') as nip) " + "from SlipGaji sg " + "inner join sg.pegawai pg "
+			+ "where sg.bulan between :start and :end " + "order by pg.namaLengkap")
 	List<Map<String, Object>> findAllByBulan(@Param("start") Date start, @Param("end") Date end);
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SlipGajiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SlipGajiService.java
index 11d2551e..dd0a128e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SlipGajiService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SlipGajiService.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
+import com.jasamedika.medifirst2000.dto.KomponenGajiDto;
 import com.jasamedika.medifirst2000.dto.SlipGajiDto;
 
 /**
@@ -24,4 +25,6 @@ public interface SlipGajiService {
 	String writeExcel(Long bulan) throws IOException;
 
 	Map<String, Object> previewPdf(Integer pegawaiId, Long bulan);
+
+	List<KomponenGajiDto> listKomponen();
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java
index 679d9202..f3b23889 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java
@@ -3053,6 +3053,99 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								datePulang = datePulang.plusDays(1);
 							}
 
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							}
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+							rawResult.add(map);
+						}
+					} else if (drAnastesiList.contains(idPegawai)
+							&& (idsPenunjangBukanAnestesi.contains(Integer.parseInt(map.get("idProduk").toString()))
+									|| (Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA
+											.equals(Integer.parseInt(map.get("idJenisPelaksana").toString()))
+											&& Master.Departemen.RADIOLOGI
+													.equals(Integer.parseInt(map.get("departemenId").toString()))))) {
+						if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							rawResult.add(map);
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
 							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
@@ -3584,6 +3677,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 
 		List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM);
+		List<Integer> drKkPediatrikGDList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PEDIATRIK_GD);
+		List<Integer> drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI);
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
 
 		List<Integer> idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk");
@@ -3611,6 +3706,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 				Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode);
 
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
+		List<Integer> idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd");
+		List<Integer> idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
 		Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar"));
 		Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator"));
@@ -3619,16 +3716,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 		// LOGIC_RULES_REMUN
 		if (CommonUtil.isNotNullOrEmpty(listData)) {
 			for (Map<String, Object> map : listData) {
-				if (listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))) {
-					if (idsRegDJPPenunjangPA.contains(Integer.parseInt(map.get("detailId").toString()))
-							|| idsRegDJPPenunjangPK.contains(Integer.parseInt(map.get("detailId").toString()))) {
-						rawResult.add(map);
-					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.KEMENKES
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.JAMKESDA
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+				if (drKkPediatrikGDList.contains(map.get("idPegawai"))) {
+					if (idsDokterPediatrikGD.contains(map.get("idProduk"))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -3648,251 +3737,484 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 						LocalTime timePulang = LocalTime.parse(jamPulang);
 						LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
 
-						String jamPulangPSBB = "";
-						LocalTime timePulangPSBB = LocalTime.now();
-						LocalDateTime datePulangPSBB = LocalDateTime.now();
-						if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
-							jamPulangPSBB = "14:00:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
-							jamPulangPSBB = "14:30:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else {
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
-						}
-
 						if (map.get("namaShift").toString().contains("Malam")) {
 							datePulang = datePulang.plusDays(1);
 						}
 
-						if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulang))) {
-							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
-								&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
-								&& Arrays.stream(Master.KONSUL_VISIT)
-										.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))) {
-							rawResult.add(map);
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))
-								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
-								&& map.get("namaShift").toString().equals("Non Shift")
-								&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
-								&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
-								&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
-							if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-									&& dateTimePelayanan.isBefore(datePulangPSBB))) {
-								rawResult.add(map);
-							}
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+						if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
 								.contains(Integer.parseInt(map.get("departemenId").toString()))
 								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 										&& dateTimePelayanan.isBefore(datePulang))) {
 							rawResult.add(map);
 						}
-					} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
-							&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-							&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-									.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-						rawResult.add(map);
+					} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+							.contains(Integer.parseInt(map.get("departemenId").toString()))) {
+						if (map.get("namaProduk").toString().toLowerCase().contains(Master.VISIT)
+								&& map.get("idPegawai").toString().equals(map.get("idDPJP"))) {
+							rawResult.add(map);
+						}
 					}
-				} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
-						&& map.get("departemenId").equals(Master.Departemen.IGD) && drKsmUmumList.contains(idPegawai)
-						&& idsDokterUmumIGD.contains(Integer.parseInt(map.get("idProduk").toString()))) {
-					if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.KEMENKES
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.JAMKESDA
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
-						rawResult.add(map);
-					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
-						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
-						String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
-						String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
-						LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
-						LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
-						LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
-
-						String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
-								+ map.get("jamMasuk").toString().substring(3) + ":00";
-						LocalTime timeMasuk = LocalTime.parse(jamMasuk);
-						LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
-
-						String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
-								+ map.get("jamPulang").toString().substring(3) + ":00";
-						LocalTime timePulang = LocalTime.parse(jamPulang);
-						LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
-
-						String jamPulangPSBB = "";
-						LocalTime timePulangPSBB = LocalTime.now();
-						LocalDateTime datePulangPSBB = LocalDateTime.now();
-						if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
-							jamPulangPSBB = "14:00:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
-							jamPulangPSBB = "14:30:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else {
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
-						}
-
-						if (map.get("namaShift").toString().contains("Malam")) {
-							datePulang = datePulang.plusDays(1);
-						}
-
-						if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulang))) {
+				} else if (!drKkPediatrikGDList.contains(map.get("idPegawai"))) {
+					if (listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))) {
+						if (idsRegDJPPenunjangPA.contains(Integer.parseInt(map.get("detailId").toString()))
+								|| idsRegDJPPenunjangPK.contains(Integer.parseInt(map.get("detailId").toString()))) {
 							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
-								&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
-								&& Arrays.stream(Master.KONSUL_VISIT)
-										.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))) {
+						} else if (Master.KelompokPasien.BPJS
+								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
 							rawResult.add(map);
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							}
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
 								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
-								&& map.get("namaShift").toString().equals("Non Shift")
-								&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
-								&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
-								&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
-							if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-									&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+						}
+					} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
+							&& map.get("departemenId").equals(Master.Departemen.IGD)
+							&& drKsmUmumList.contains(idPegawai)
+							&& idsDokterUmumIGD.contains(Integer.parseInt(map.get("idProduk").toString()))) {
+						if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							rawResult.add(map);
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
 								rawResult.add(map);
 							}
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulang))) {
-							rawResult.add(map);
-						}
-					} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
-							&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-							&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-									.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-						rawResult.add(map);
-					}
-				} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
-						&& listDetailJenisProdukException.contains(Integer.parseInt(map.get("detailId").toString()))) {
-					if (idsRegDJPPenunjangPA.contains(Integer.parseInt(map.get("detailId").toString()))
-							|| idsRegDJPPenunjangPK.contains(Integer.parseInt(map.get("detailId").toString()))) {
-						rawResult.add(map);
-					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.KEMENKES
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.JAMKESDA
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
-						rawResult.add(map);
-					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
-						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
-						String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
-						String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
-						LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
-						LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
-						LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
-
-						String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
-								+ map.get("jamMasuk").toString().substring(3) + ":00";
-						LocalTime timeMasuk = LocalTime.parse(jamMasuk);
-						LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
-
-						String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
-								+ map.get("jamPulang").toString().substring(3) + ":00";
-						LocalTime timePulang = LocalTime.parse(jamPulang);
-						LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
-
-						String jamPulangPSBB = "";
-						LocalTime timePulangPSBB = LocalTime.now();
-						LocalDateTime datePulangPSBB = LocalDateTime.now();
-						if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
-							jamPulangPSBB = "14:00:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
-							jamPulangPSBB = "14:30:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else {
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
-						}
-
-						if (map.get("namaShift").toString().contains("Malam")) {
-							datePulang = datePulang.plusDays(1);
-						}
-
-						if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulang))) {
-							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
-								&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
-								&& Arrays.stream(Master.KONSUL_VISIT)
-										.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))) {
-							rawResult.add(map);
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
 								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
-								&& map.get("namaShift").toString().equals("Non Shift")
-								&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
-								&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
-								&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
-							if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-									&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+						}
+					} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
+							&& drKkPerinatologiList.contains(idPegawai)
+							&& idsDokterPerinatologi.contains(Integer.parseInt(map.get("idProduk").toString()))) {
+						if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							rawResult.add(map);
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
 								rawResult.add(map);
 							}
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulang))) {
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 							rawResult.add(map);
 						}
-					} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
-							&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+					} else if (drAnastesiList.contains(idPegawai)
+							&& (idsPenunjangBukanAnestesi.contains(Integer.parseInt(map.get("idProduk").toString()))
+									|| (Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA
+											.equals(Integer.parseInt(map.get("idJenisPelaksana").toString()))
+											&& Master.Departemen.RADIOLOGI
+													.equals(Integer.parseInt(map.get("departemenId").toString()))))) {
+						if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							rawResult.add(map);
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
-							&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-									.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-						rawResult.add(map);
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							}
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+							rawResult.add(map);
+						}
+					} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
+							&& listDetailJenisProdukException
+									.contains(Integer.parseInt(map.get("detailId").toString()))) {
+						if (idsRegDJPPenunjangPA.contains(Integer.parseInt(map.get("detailId").toString()))
+								|| idsRegDJPPenunjangPK.contains(Integer.parseInt(map.get("detailId").toString()))) {
+							rawResult.add(map);
+						} else if (Master.KelompokPasien.BPJS
+								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							rawResult.add(map);
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							}
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+							rawResult.add(map);
+						}
 					}
 				}
 			}
@@ -4409,6 +4731,99 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								datePulang = datePulang.plusDays(1);
 							}
 
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							}
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+							rawResult.add(map);
+						}
+					} else if (drAnastesiList.contains(idPegawai)
+							&& (idsPenunjangBukanAnestesi.contains(Integer.parseInt(map.get("idProduk").toString()))
+									|| (Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA
+											.equals(Integer.parseInt(map.get("idJenisPelaksana").toString()))
+											&& Master.Departemen.RADIOLOGI
+													.equals(Integer.parseInt(map.get("departemenId").toString()))))) {
+						if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							rawResult.add(map);
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
 							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
@@ -5318,12 +5733,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM);
 		List<Integer> drKkPediatrikGDList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PEDIATRIK_GD);
 		List<Integer> drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI);
+		List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI);
 
 		List<Integer> idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk");
 		List<Integer> idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama");
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
+		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
 
 		if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
@@ -6001,6 +6418,206 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									}
 								}
 							}
+						} else if (drAnastesiList.contains(idPegawai) && (idsPenunjangBukanAnestesi
+								.contains(Integer.parseInt(map.get("idProduk").toString()))
+								|| (Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA
+										.equals(Integer.parseInt(map.get("idJenisPetugas").toString()))
+										&& Master.Departemen.RADIOLOGI
+												.equals(Integer.parseInt(map.get("departemenId").toString()))))) {
+							if (Master.KelompokPasien.BPJS
+									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.KEMENKES
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.JAMKESDA
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
+									if (Double.valueOf(map.get("diskon").toString()) > 0
+											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
+										result.add(map);
+									}
+								} else {
+									if (Double.valueOf(map.get("diskon").toString()) == 0
+											|| (Double.valueOf(map.get("diskon").toString()) > 0
+													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer
+															.valueOf(map.get("statusDiskon").toString()).equals(0))) {
+										result.add(map);
+									}
+								}
+							} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+								Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+								String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+								String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+								LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+								LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+								LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+								String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+										+ map.get("jamMasuk").toString().substring(3) + ":00";
+								LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+								LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+								String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+										+ map.get("jamPulang").toString().substring(3) + ":00";
+								LocalTime timePulang = LocalTime.parse(jamPulang);
+								LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+								String jamPulangPSBB = "";
+								LocalTime timePulangPSBB = LocalTime.now();
+								LocalDateTime datePulangPSBB = LocalDateTime.now();
+								if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+									jamPulangPSBB = "14:00:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+									jamPulangPSBB = "14:30:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else {
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+								}
+
+								if (map.get("namaShift").toString().contains("Malam")) {
+									datePulang = datePulang.plusDays(1);
+								}
+
+								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
+										if (Double.valueOf(map.get("diskon").toString()) > 0
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
+											result.add(map);
+										}
+									} else {
+										if (Double.valueOf(map.get("diskon").toString()) == 0
+												|| (Double.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& !Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(0))) {
+											result.add(map);
+										}
+									}
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+										&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+										&& Arrays.stream(Master.KONSUL_VISIT)
+												.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
+										if (Double.valueOf(map.get("diskon").toString()) > 0
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
+											result.add(map);
+										}
+									} else {
+										if (Double.valueOf(map.get("diskon").toString()) == 0
+												|| (Double.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& !Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(0))) {
+											result.add(map);
+										}
+									}
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))
+										&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+												.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
+										if (Double.valueOf(map.get("diskon").toString()) > 0
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
+											result.add(map);
+										}
+									} else {
+										if (Double.valueOf(map.get("diskon").toString()) == 0
+												|| (Double.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& !Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(0))) {
+											result.add(map);
+										}
+									}
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+										&& map.get("namaShift").toString().equals("Non Shift")
+										&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+										&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+										&& (dateTimePelayanan.isBefore(PSBBEnd)
+												|| dateTimePelayanan.isEqual(PSBBEnd))) {
+									if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+										if (diskon > 0
+												&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
+											if (Double.valueOf(map.get("diskon").toString()) > 0
+													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+															.valueOf(map.get("statusDiskon").toString()).equals(0))) {
+												result.add(map);
+											}
+										} else {
+											if (Double.valueOf(map.get("diskon").toString()) == 0
+													|| (Double.valueOf(map.get("diskon").toString()) > 0
+															&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+															&& !Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(0))) {
+												result.add(map);
+											}
+										}
+									}
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
+										if (Double.valueOf(map.get("diskon").toString()) > 0
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
+											result.add(map);
+										}
+									} else {
+										if (Double.valueOf(map.get("diskon").toString()) == 0
+												|| (Double.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& !Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(0))) {
+											result.add(map);
+										}
+									}
+								}
+							} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+									&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+											.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
+									if (Double.valueOf(map.get("diskon").toString()) > 0
+											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
+										result.add(map);
+									}
+								} else {
+									if (Double.valueOf(map.get("diskon").toString()) == 0
+											|| (Double.valueOf(map.get("diskon").toString()) > 0
+													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer
+															.valueOf(map.get("statusDiskon").toString()).equals(0))) {
+										result.add(map);
+									}
+								}
+							}
 						} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
 								&& listDetailJenisProdukException
 										.contains(Integer.parseInt(map.get("detailId").toString()))) {
@@ -6829,7 +7446,10 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 		LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0);
 		LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf);
 
+		List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM);
+		List<Integer> drKkPediatrikGDList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PEDIATRIK_GD);
+		List<Integer> drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI);
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
 
 		List<Integer> idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk");
@@ -6857,19 +7477,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 				idPegawai, Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode);
 
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
+		List<Integer> idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd");
+		List<Integer> idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi");
+		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
 
 		if (CommonUtil.isNotNullOrEmpty(listData)) {
 			for (Map<String, Object> map : listData) {
-				if (listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))) {
-					if (idsRegDJPPenunjangPA.contains(Integer.parseInt(map.get("detailId").toString()))
-							|| idsRegDJPPenunjangPK.contains(Integer.parseInt(map.get("detailId").toString()))) {
-						rawResult.add(map);
-					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.KEMENKES
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.JAMKESDA
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+				if (drKkPediatrikGDList.contains(map.get("idPegawai"))) {
+					if (idsDokterPediatrikGD.contains(map.get("idProduk"))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -6889,251 +7504,484 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 						LocalTime timePulang = LocalTime.parse(jamPulang);
 						LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
 
-						String jamPulangPSBB = "";
-						LocalTime timePulangPSBB = LocalTime.now();
-						LocalDateTime datePulangPSBB = LocalDateTime.now();
-						if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
-							jamPulangPSBB = "14:00:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
-							jamPulangPSBB = "14:30:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else {
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
-						}
-
 						if (map.get("namaShift").toString().contains("Malam")) {
 							datePulang = datePulang.plusDays(1);
 						}
 
-						if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulang))) {
-							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
-								&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
-								&& Arrays.stream(Master.KONSUL_VISIT)
-										.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))) {
-							rawResult.add(map);
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))
-								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
-								&& map.get("namaShift").toString().equals("Non Shift")
-								&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
-								&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
-								&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
-							if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-									&& dateTimePelayanan.isBefore(datePulangPSBB))) {
-								rawResult.add(map);
-							}
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+						if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
 								.contains(Integer.parseInt(map.get("departemenId").toString()))
 								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 										&& (dateTimePelayanan.isBefore(datePulang)))) {
 							rawResult.add(map);
 						}
-					} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
-							&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-							&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-									.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-						rawResult.add(map);
+					} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+							.contains(Integer.parseInt(map.get("departemenId").toString()))) {
+						if (map.get("namaProduk").toString().toLowerCase().contains(Master.VISIT)
+								&& map.get("idPegawai").toString().equals(map.get("idDPJP"))) {
+							rawResult.add(map);
+						}
 					}
-				} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
-						&& map.get("departemenId").equals(Master.Departemen.IGD) && drKsmUmumList.contains(idPegawai)
-						&& idsDokterUmumIGD.contains(Integer.parseInt(map.get("idProduk").toString()))) {
-					if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.KEMENKES
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.JAMKESDA
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
-						rawResult.add(map);
-					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
-						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
-						String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
-						String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
-						LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
-						LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
-						LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
-
-						String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
-								+ map.get("jamMasuk").toString().substring(3) + ":00";
-						LocalTime timeMasuk = LocalTime.parse(jamMasuk);
-						LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
-
-						String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
-								+ map.get("jamPulang").toString().substring(3) + ":00";
-						LocalTime timePulang = LocalTime.parse(jamPulang);
-						LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
-
-						String jamPulangPSBB = "";
-						LocalTime timePulangPSBB = LocalTime.now();
-						LocalDateTime datePulangPSBB = LocalDateTime.now();
-						if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
-							jamPulangPSBB = "14:00:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
-							jamPulangPSBB = "14:30:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else {
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
-						}
-
-						if (map.get("namaShift").toString().contains("Malam")) {
-							datePulang = datePulang.plusDays(1);
-						}
-
-						if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulang))) {
+				} else if (!drKkPediatrikGDList.contains(map.get("idPegawai"))) {
+					if (listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))) {
+						if (idsRegDJPPenunjangPA.contains(Integer.parseInt(map.get("detailId").toString()))
+								|| idsRegDJPPenunjangPK.contains(Integer.parseInt(map.get("detailId").toString()))) {
 							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
-								&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
-								&& Arrays.stream(Master.KONSUL_VISIT)
-										.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))) {
+						} else if (Master.KelompokPasien.BPJS
+								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
 							rawResult.add(map);
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& (dateTimePelayanan.isBefore(datePulang)))) {
+								rawResult.add(map);
+							}
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
 								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
-								&& map.get("namaShift").toString().equals("Non Shift")
-								&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
-								&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
-								&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
-							if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-									&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+						}
+					} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
+							&& map.get("departemenId").equals(Master.Departemen.IGD)
+							&& drKsmUmumList.contains(idPegawai)
+							&& idsDokterUmumIGD.contains(Integer.parseInt(map.get("idProduk").toString()))) {
+						if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							rawResult.add(map);
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
 								rawResult.add(map);
 							}
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulang))) {
-							rawResult.add(map);
-						}
-					} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
-							&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-							&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-									.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-						rawResult.add(map);
-					}
-				} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
-						&& listDetailJenisProdukException.contains(Integer.parseInt(map.get("detailId").toString()))) {
-					if (idsRegDJPPenunjangPA.contains(Integer.parseInt(map.get("detailId").toString()))
-							|| idsRegDJPPenunjangPK.contains(Integer.parseInt(map.get("detailId").toString()))) {
-						rawResult.add(map);
-					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.KEMENKES
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-							|| Master.KelompokPasien.JAMKESDA
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
-						rawResult.add(map);
-					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
-						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
-						String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
-						String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
-						LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
-						LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
-						LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
-
-						String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
-								+ map.get("jamMasuk").toString().substring(3) + ":00";
-						LocalTime timeMasuk = LocalTime.parse(jamMasuk);
-						LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
-
-						String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
-								+ map.get("jamPulang").toString().substring(3) + ":00";
-						LocalTime timePulang = LocalTime.parse(jamPulang);
-						LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
-
-						String jamPulangPSBB = "";
-						LocalTime timePulangPSBB = LocalTime.now();
-						LocalDateTime datePulangPSBB = LocalDateTime.now();
-						if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
-								|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
-							jamPulangPSBB = "14:00:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
-							jamPulangPSBB = "14:30:00";
-							timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-						} else {
-							datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
-						}
-
-						if (map.get("namaShift").toString().contains("Malam")) {
-							datePulang = datePulang.plusDays(1);
-						}
-
-						if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulang))) {
-							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
-								&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
-								&& Arrays.stream(Master.KONSUL_VISIT)
-										.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))) {
-							rawResult.add(map);
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-										|| dateTimePelayanan.isAfter(datePulang))
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
 								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 							rawResult.add(map);
-						} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
-								&& map.get("namaShift").toString().equals("Non Shift")
-								&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
-								&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
-								&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
-							if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-									&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+						}
+					} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
+							&& drKkPerinatologiList.contains(idPegawai)
+							&& idsDokterPerinatologi.contains(Integer.parseInt(map.get("idProduk").toString()))) {
+						if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							rawResult.add(map);
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
 								rawResult.add(map);
 							}
-						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
-								.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulang))) {
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 							rawResult.add(map);
 						}
-					} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
-							&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+					} else if (drAnastesiList.contains(idPegawai)
+							&& (idsPenunjangBukanAnestesi.contains(Integer.parseInt(map.get("idProduk").toString()))
+									|| (Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA
+											.equals(Integer.parseInt(map.get("idJenisPelaksana").toString()))
+											&& Master.Departemen.RADIOLOGI
+													.equals(Integer.parseInt(map.get("departemenId").toString()))))) {
+						if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							rawResult.add(map);
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
-							&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-									.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-						rawResult.add(map);
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							}
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+							rawResult.add(map);
+						}
+					} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
+							&& listDetailJenisProdukException
+									.contains(Integer.parseInt(map.get("detailId").toString()))) {
+						if (idsRegDJPPenunjangPA.contains(Integer.parseInt(map.get("detailId").toString()))
+								|| idsRegDJPPenunjangPK.contains(Integer.parseInt(map.get("detailId").toString()))) {
+							rawResult.add(map);
+						} else if (Master.KelompokPasien.BPJS
+								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.KEMENKES
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+								|| Master.KelompokPasien.JAMKESDA
+										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							rawResult.add(map);
+						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+									+ map.get("jamMasuk").toString().substring(3) + ":00";
+							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+									+ map.get("jamPulang").toString().substring(3) + ":00";
+							LocalTime timePulang = LocalTime.parse(jamPulang);
+							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+							String jamPulangPSBB = "";
+							LocalTime timePulangPSBB = LocalTime.now();
+							LocalDateTime datePulangPSBB = LocalDateTime.now();
+							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+								jamPulangPSBB = "14:00:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+								jamPulangPSBB = "14:30:00";
+								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+							} else {
+								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+							}
+
+							if (map.get("namaShift").toString().contains("Malam")) {
+								datePulang = datePulang.plusDays(1);
+							}
+
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+									&& Arrays.stream(Master.KONSUL_VISIT)
+											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))) {
+								rawResult.add(map);
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
+											|| dateTimePelayanan.isAfter(datePulang))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								rawResult.add(map);
+							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+									&& map.get("namaShift").toString().equals("Non Shift")
+									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
+								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+									rawResult.add(map);
+								}
+							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+									.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulang))) {
+								rawResult.add(map);
+							}
+						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+							rawResult.add(map);
+						}
 					}
 				}
 			}
@@ -8292,8 +9140,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 															.contains(Integer.parseInt(map.get("detailId").toString()))
 															&& !idsRegDJPPenunjangPK.contains(
 																	Integer.parseInt(map.get("detailId").toString()))) {
-														if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL).contains(
-																Integer.parseInt(map.get("departemenId").toString()))) {
+														if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+																.contains(Integer.parseInt(
+																		map.get("departemenId").toString()))) {
 															if (map.get("ruanganId")
 																	.equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY)
 																	&& idsKonsultasiDokterJaga
@@ -8336,8 +9185,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 															.contains(Integer.parseInt(map.get("detailId").toString()))
 															&& !idsRegDJPPenunjangPK.contains(
 																	Integer.parseInt(map.get("detailId").toString()))) {
-														if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL).contains(
-																Integer.parseInt(map.get("departemenId").toString()))) {
+														if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+																.contains(Integer.parseInt(
+																		map.get("departemenId").toString()))) {
 															if (map.get("ruanganId")
 																	.equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY)
 																	&& idsKonsultasiDokterJaga
@@ -9111,8 +9961,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 															.contains(Integer.parseInt(map.get("detailId").toString()))
 															&& !idsRegDJPPenunjangPK.contains(
 																	Integer.parseInt(map.get("detailId").toString()))) {
-														if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL).contains(
-																Integer.parseInt(map.get("departemenId").toString()))) {
+														if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+																.contains(Integer.parseInt(
+																		map.get("departemenId").toString()))) {
 															if (map.get("ruanganId")
 																	.equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY)
 																	&& idsKonsultasiDokterJaga
@@ -9155,8 +10006,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 															.contains(Integer.parseInt(map.get("detailId").toString()))
 															&& !idsRegDJPPenunjangPK.contains(
 																	Integer.parseInt(map.get("detailId").toString()))) {
-														if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL).contains(
-																Integer.parseInt(map.get("departemenId").toString()))) {
+														if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+																.contains(Integer.parseInt(
+																		map.get("departemenId").toString()))) {
 															if (map.get("ruanganId")
 																	.equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY)
 																	&& idsKonsultasiDokterJaga
@@ -9342,7 +10194,10 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 		LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0);
 		LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf);
 
+		List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM);
+		List<Integer> drKkPediatrikGDList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PEDIATRIK_GD);
+		List<Integer> drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI);
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
 
 		List<Integer> idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk");
@@ -9375,20 +10230,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 		}
 
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
+		List<Integer> idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd");
+		List<Integer> idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi");
+		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
 
 		if (!ffs) {
 			if (CommonUtil.isNotNullOrEmpty(listData)) {
 				for (Map<String, Object> map : listData) {
-					if (listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))) {
-						if (idsRegDJPPenunjangPA.contains(Integer.parseInt(map.get("detailId").toString()))
-								|| idsRegDJPPenunjangPK.contains(Integer.parseInt(map.get("detailId").toString()))) {
-							result.add(map);
-						} else if (Master.KelompokPasien.BPJS
-								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-								|| Master.KelompokPasien.KEMENKES
-										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-								|| Master.KelompokPasien.JAMKESDA
-										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+					if (drKkPediatrikGDList.contains(map.get("idPegawai"))) {
+						if (idsDokterPediatrikGD.contains(map.get("idProduk"))) {
 							result.add(map);
 						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -9408,261 +10258,523 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 							LocalTime timePulang = LocalTime.parse(jamPulang);
 							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
 
-							String jamPulangPSBB = "";
-							LocalTime timePulangPSBB = LocalTime.now();
-							LocalDateTime datePulangPSBB = LocalDateTime.now();
-							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
-									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
-									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
-									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
-								jamPulangPSBB = "14:00:00";
-								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
-								jamPulangPSBB = "14:30:00";
-								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-							} else {
-								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
-							}
-
 							if (map.get("namaShift").toString().contains("Malam")) {
 								datePulang = datePulang.plusDays(1);
 							}
 
-							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 											&& dateTimePelayanan.isBefore(datePulang))) {
 								result.add(map);
-							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
-									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
-									&& Arrays.stream(Master.KONSUL_VISIT)
-											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
-									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-											|| dateTimePelayanan.isAfter(datePulang))) {
+							}
+						} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+								.contains(Integer.parseInt(map.get("departemenId").toString()))) {
+							if (map.get("namaProduk").toString().toLowerCase().contains(Master.VISIT)
+									&& map.get("idPegawai").toString().equals(map.get("idDPJP"))) {
 								result.add(map);
-							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-											|| dateTimePelayanan.isAfter(datePulang))
+							}
+						}
+					} else if (!drKkPediatrikGDList.contains(map.get("idPegawai"))) {
+						if (listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))) {
+							if (idsRegDJPPenunjangPA.contains(Integer.parseInt(map.get("detailId").toString()))
+									|| idsRegDJPPenunjangPK
+											.contains(Integer.parseInt(map.get("detailId").toString()))) {
+								result.add(map);
+							} else if (Master.KelompokPasien.BPJS
+									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.KEMENKES
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.JAMKESDA
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+								result.add(map);
+							} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+								Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+								String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+								String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+								LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+								LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+								LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+								String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+										+ map.get("jamMasuk").toString().substring(3) + ":00";
+								LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+								LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+								String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+										+ map.get("jamPulang").toString().substring(3) + ":00";
+								LocalTime timePulang = LocalTime.parse(jamPulang);
+								LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+								String jamPulangPSBB = "";
+								LocalTime timePulangPSBB = LocalTime.now();
+								LocalDateTime datePulangPSBB = LocalDateTime.now();
+								if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+									jamPulangPSBB = "14:00:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+									jamPulangPSBB = "14:30:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else {
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+								}
+
+								if (map.get("namaShift").toString().contains("Malam")) {
+									datePulang = datePulang.plusDays(1);
+								}
+
+								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
+									result.add(map);
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+										&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+										&& Arrays.stream(Master.KONSUL_VISIT)
+												.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))) {
+									result.add(map);
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))
+										&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+												.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+									result.add(map);
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+										&& map.get("namaShift").toString().equals("Non Shift")
+										&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+										&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+										&& (dateTimePelayanan.isBefore(PSBBEnd)
+												|| dateTimePelayanan.isEqual(PSBBEnd))) {
+									if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+										result.add(map);
+									}
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
+									result.add(map);
+								}
+							} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+									&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+											.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 								result.add(map);
-							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
-									&& map.get("namaShift").toString().equals("Non Shift")
-									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
-									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
-									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
-								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+							}
+						} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
+								&& map.get("departemenId").equals(Master.Departemen.IGD)
+								&& drKsmUmumList.contains(idPegawai)
+								&& idsDokterUmumIGD.contains(Integer.parseInt(map.get("idProduk").toString()))) {
+							if (Master.KelompokPasien.BPJS
+									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.KEMENKES
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.JAMKESDA
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+								result.add(map);
+							} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+								Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+								String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+								String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+								LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+								LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+								LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+								String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+										+ map.get("jamMasuk").toString().substring(3) + ":00";
+								LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+								LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+								String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+										+ map.get("jamPulang").toString().substring(3) + ":00";
+								LocalTime timePulang = LocalTime.parse(jamPulang);
+								LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+								String jamPulangPSBB = "";
+								LocalTime timePulangPSBB = LocalTime.now();
+								LocalDateTime datePulangPSBB = LocalDateTime.now();
+								if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+									jamPulangPSBB = "14:00:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+									jamPulangPSBB = "14:30:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else {
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+								}
+
+								if (map.get("namaShift").toString().contains("Malam")) {
+									datePulang = datePulang.plusDays(1);
+								}
+
+								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
+									result.add(map);
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+										&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+										&& Arrays.stream(Master.KONSUL_VISIT)
+												.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))) {
+									result.add(map);
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))
+										&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+												.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+									result.add(map);
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+										&& map.get("namaShift").toString().equals("Non Shift")
+										&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+										&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+										&& (dateTimePelayanan.isBefore(PSBBEnd)
+												|| dateTimePelayanan.isEqual(PSBBEnd))) {
+									if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+										result.add(map);
+									}
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
 									result.add(map);
 								}
-							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-											&& dateTimePelayanan.isBefore(datePulang))) {
-								result.add(map);
-							}
-						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
-								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-										.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-							result.add(map);
-						}
-					} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
-							&& map.get("departemenId").equals(Master.Departemen.IGD)
-							&& drKsmUmumList.contains(idPegawai)
-							&& idsDokterUmumIGD.contains(Integer.parseInt(map.get("idProduk").toString()))) {
-						if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-								|| Master.KelompokPasien.KEMENKES
-										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-								|| Master.KelompokPasien.JAMKESDA
-										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
-							result.add(map);
-						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
-							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
-							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
-							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
-							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
-							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
-							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
-
-							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
-									+ map.get("jamMasuk").toString().substring(3) + ":00";
-							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
-							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
-
-							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
-									+ map.get("jamPulang").toString().substring(3) + ":00";
-							LocalTime timePulang = LocalTime.parse(jamPulang);
-							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
-
-							String jamPulangPSBB = "";
-							LocalTime timePulangPSBB = LocalTime.now();
-							LocalDateTime datePulangPSBB = LocalDateTime.now();
-							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
-									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
-									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
-									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
-								jamPulangPSBB = "14:00:00";
-								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
-								jamPulangPSBB = "14:30:00";
-								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-							} else {
-								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
-							}
-
-							if (map.get("namaShift").toString().contains("Malam")) {
-								datePulang = datePulang.plusDays(1);
-							}
-
-							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-											&& dateTimePelayanan.isBefore(datePulang))) {
-								result.add(map);
-							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
-									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
-									&& Arrays.stream(Master.KONSUL_VISIT)
-											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
-									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-											|| dateTimePelayanan.isAfter(datePulang))) {
-								result.add(map);
-							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-											|| dateTimePelayanan.isAfter(datePulang))
+							} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+									&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+											.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 								result.add(map);
-							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
-									&& map.get("namaShift").toString().equals("Non Shift")
-									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
-									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
-									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
-								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+							}
+						} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
+								&& drKkPerinatologiList.contains(idPegawai)
+								&& idsDokterPerinatologi.contains(Integer.parseInt(map.get("idProduk").toString()))) {
+							if (Master.KelompokPasien.BPJS
+									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.KEMENKES
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.JAMKESDA
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+								result.add(map);
+							} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+								Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+								String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+								String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+								LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+								LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+								LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+								String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+										+ map.get("jamMasuk").toString().substring(3) + ":00";
+								LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+								LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+								String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+										+ map.get("jamPulang").toString().substring(3) + ":00";
+								LocalTime timePulang = LocalTime.parse(jamPulang);
+								LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+								String jamPulangPSBB = "";
+								LocalTime timePulangPSBB = LocalTime.now();
+								LocalDateTime datePulangPSBB = LocalDateTime.now();
+								if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+									jamPulangPSBB = "14:00:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+									jamPulangPSBB = "14:30:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else {
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+								}
+
+								if (map.get("namaShift").toString().contains("Malam")) {
+									datePulang = datePulang.plusDays(1);
+								}
+
+								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
+									result.add(map);
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+										&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+										&& Arrays.stream(Master.KONSUL_VISIT)
+												.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))) {
+									result.add(map);
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))
+										&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+												.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+									result.add(map);
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+										&& map.get("namaShift").toString().equals("Non Shift")
+										&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+										&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+										&& (dateTimePelayanan.isBefore(PSBBEnd)
+												|| dateTimePelayanan.isEqual(PSBBEnd))) {
+									if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+										result.add(map);
+									}
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
 									result.add(map);
 								}
-							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-											&& dateTimePelayanan.isBefore(datePulang))) {
+							} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+									&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+											.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 								result.add(map);
 							}
-						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
-								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+						} else if (drAnastesiList.contains(idPegawai) && (idsPenunjangBukanAnestesi
+								.contains(Integer.parseInt(map.get("idProduk").toString()))
+								|| (Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA
+										.equals(Integer.parseInt(map.get("idJenisPetugas").toString()))
+										&& Master.Departemen.RADIOLOGI
+												.equals(Integer.parseInt(map.get("departemenId").toString()))))) {
+							if (Master.KelompokPasien.BPJS
+									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.KEMENKES
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.JAMKESDA
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+								result.add(map);
+							} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+								Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+								String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+								String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+								LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+								LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+								LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+								String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+										+ map.get("jamMasuk").toString().substring(3) + ":00";
+								LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+								LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+								String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+										+ map.get("jamPulang").toString().substring(3) + ":00";
+								LocalTime timePulang = LocalTime.parse(jamPulang);
+								LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+								String jamPulangPSBB = "";
+								LocalTime timePulangPSBB = LocalTime.now();
+								LocalDateTime datePulangPSBB = LocalDateTime.now();
+								if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+									jamPulangPSBB = "14:00:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+									jamPulangPSBB = "14:30:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else {
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+								}
+
+								if (map.get("namaShift").toString().contains("Malam")) {
+									datePulang = datePulang.plusDays(1);
+								}
+
+								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-							result.add(map);
-						}
-					} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
-							&& listDetailJenisProdukException
-									.contains(Integer.parseInt(map.get("detailId").toString()))) {
-						if (Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
-								.contains(Integer.parseInt(map.get("detailId").toString()))
-								|| Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_KLINIK)
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
+									result.add(map);
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+										&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+										&& Arrays.stream(Master.KONSUL_VISIT)
+												.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))) {
+									result.add(map);
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))
+										&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+												.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+									result.add(map);
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+										&& map.get("namaShift").toString().equals("Non Shift")
+										&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+										&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+										&& (dateTimePelayanan.isBefore(PSBBEnd)
+												|| dateTimePelayanan.isEqual(PSBBEnd))) {
+									if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+										result.add(map);
+									}
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
+									result.add(map);
+								}
+							} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+									&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+											.contains(Integer.parseInt(map.get("departemenId").toString()))
+									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+								result.add(map);
+							}
+						} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
+								&& listDetailJenisProdukException
 										.contains(Integer.parseInt(map.get("detailId").toString()))) {
-							result.add(map);
-						} else if (Master.KelompokPasien.BPJS
-								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-								|| Master.KelompokPasien.KEMENKES
-										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-								|| Master.KelompokPasien.JAMKESDA
-										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
-							result.add(map);
-						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
-							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
-							String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
-							String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
-							LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
-							LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
-							LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
-
-							String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
-									+ map.get("jamMasuk").toString().substring(3) + ":00";
-							LocalTime timeMasuk = LocalTime.parse(jamMasuk);
-							LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
-
-							String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
-									+ map.get("jamPulang").toString().substring(3) + ":00";
-							LocalTime timePulang = LocalTime.parse(jamPulang);
-							LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
-
-							String jamPulangPSBB = "";
-							LocalTime timePulangPSBB = LocalTime.now();
-							LocalDateTime datePulangPSBB = LocalDateTime.now();
-							if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
-									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
-									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
-									|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
-								jamPulangPSBB = "14:00:00";
-								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-							} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
-								jamPulangPSBB = "14:30:00";
-								timePulangPSBB = LocalTime.parse(jamPulangPSBB);
-								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
-							} else {
-								datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
-							}
-
-							if (map.get("namaShift").toString().contains("Malam")) {
-								datePulang = datePulang.plusDays(1);
-							}
-
-							if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-											&& dateTimePelayanan.isBefore(datePulang))) {
+							if (Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
+									.contains(Integer.parseInt(map.get("detailId").toString()))
+									|| Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_KLINIK)
+											.contains(Integer.parseInt(map.get("detailId").toString()))) {
 								result.add(map);
-							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
-									&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
-									&& Arrays.stream(Master.KONSUL_VISIT)
-											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
-									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-											|| dateTimePelayanan.isAfter(datePulang))) {
+							} else if (Master.KelompokPasien.BPJS
+									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.KEMENKES
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									|| Master.KelompokPasien.JAMKESDA
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
 								result.add(map);
-							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
-											|| dateTimePelayanan.isAfter(datePulang))
+							} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
+								Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
+								String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan);
+								String waktuPelayanan = new SimpleDateFormat("HH:mm:ss").format(tanggalPelayanan);
+								LocalDate datePelayanan = LocalDate.parse(tglPelayanan);
+								LocalTime timePelayanan = LocalTime.parse(waktuPelayanan);
+								LocalDateTime dateTimePelayanan = LocalDateTime.of(datePelayanan, timePelayanan);
+
+								String jamMasuk = map.get("jamMasuk").toString().substring(0, 2) + ":"
+										+ map.get("jamMasuk").toString().substring(3) + ":00";
+								LocalTime timeMasuk = LocalTime.parse(jamMasuk);
+								LocalDateTime dateMasuk = LocalDateTime.of(datePelayanan, timeMasuk);
+
+								String jamPulang = map.get("jamPulang").toString().substring(0, 2) + ":"
+										+ map.get("jamPulang").toString().substring(3) + ":00";
+								LocalTime timePulang = LocalTime.parse(jamPulang);
+								LocalDateTime datePulang = LocalDateTime.of(datePelayanan, timePulang);
+
+								String jamPulangPSBB = "";
+								LocalTime timePulangPSBB = LocalTime.now();
+								LocalDateTime datePulangPSBB = LocalDateTime.now();
+								if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 1
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 2
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 3
+										|| getDayOfWeek((Date) map.get("tanggalPelayanan")) == 4) {
+									jamPulangPSBB = "14:00:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else if (getDayOfWeek((Date) map.get("tanggalPelayanan")) == 5) {
+									jamPulangPSBB = "14:30:00";
+									timePulangPSBB = LocalTime.parse(jamPulangPSBB);
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulangPSBB);
+								} else {
+									datePulangPSBB = LocalDateTime.of(datePelayanan, timePulang);
+								}
+
+								if (map.get("namaShift").toString().contains("Malam")) {
+									datePulang = datePulang.plusDays(1);
+								}
+
+								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
+									result.add(map);
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
+										&& !Arrays.asList(Master.Ruangan.NONRANAP).contains(map.get("ruanganId"))
+										&& Arrays.stream(Master.KONSUL_VISIT)
+												.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))) {
+									result.add(map);
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& (dateTimePelayanan.isBefore(dateMasuk)
+												|| dateTimePelayanan.isEqual(datePulang)
+												|| dateTimePelayanan.isAfter(datePulang))
+										&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
+												.contains(Integer.parseInt(map.get("idKelas").toString()))) {
+									result.add(map);
+								} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
+										&& map.get("namaShift").toString().equals("Non Shift")
+										&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
+										&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
+										&& (dateTimePelayanan.isBefore(PSBBEnd)
+												|| dateTimePelayanan.isEqual(PSBBEnd))) {
+									if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
+											&& dateTimePelayanan.isBefore(datePulangPSBB))) {
+										result.add(map);
+									}
+								} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
+										.contains(Integer.parseInt(map.get("departemenId").toString()))
+										&& ((dateTimePelayanan.isEqual(dateMasuk)
+												|| dateTimePelayanan.isAfter(dateMasuk))
+												&& dateTimePelayanan.isBefore(datePulang))) {
+									result.add(map);
+								}
+							} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
+									&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
+											.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 								result.add(map);
-							} else if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
-									&& map.get("namaShift").toString().equals("Non Shift")
-									&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
-									&& (dateTimePelayanan.isEqual(PSBBDate) || dateTimePelayanan.isAfter(PSBBDate))
-									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
-								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
-									result.add(map);
-								}
-							} else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL)
-									.contains(Integer.parseInt(map.get("departemenId").toString()))
-									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
-											&& dateTimePelayanan.isBefore(datePulang))) {
-								result.add(map);
 							}
-						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))
-								&& Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP)
-										.contains(Integer.parseInt(map.get("departemenId").toString()))
-								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
-										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-							result.add(map);
 						}
 					}
 				}
 			}
 		} else {
-			// FFS : sudah tidak dipakai
+			/**
+			 * @deprecated unused conditions
+			 */
 			if (CommonUtil.isNotNullOrEmpty(listData)) {
 				if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(Master.KategoryPegawai.DOKTER_LUAR))
 						.contains(idPegawai)) {
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
index 4b75af41..0d79e25b 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
@@ -1122,7 +1122,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					 * dokter-dokter tertentu yang hanya dapat pasien bpjs
 					 */
 					listPelayananFfs.add(next);
-				} else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN).contains(next.get("idJenisProduk"))) {
+				} else if (!Arrays.asList(Master.JenisProduk.NONLOGBOOK).contains(next.get("idJenisProduk"))) {
 					listPelayananFfs.add(next);
 				}
 		} else {
@@ -1144,7 +1144,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						} else if ((Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_UTAMA)
 								.contains(next.get("idDepartemen"))
 								|| Master.GolonganProduk.VISIT.equals(next.get("idGolonganProduk")))
-								&& !Arrays.asList(Master.JenisProduk.NONTINDAKAN).contains(next.get("idJenisProduk"))) {
+								&& !Arrays.asList(Master.JenisProduk.NONLOGBOOK).contains(next.get("idJenisProduk"))) {
 							/*
 							 * Dibatasi hanya di rawat jalan atau visite saja
 							 */
@@ -1167,7 +1167,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 								 */
 								listPelayananRemun.add(next);
 								capaianRemun += Double.valueOf(next.get("hargaJasa").toString());
-							} else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN)
+							} else if (!Arrays.asList(Master.JenisProduk.NONLOGBOOK)
 									.contains(next.get("idJenisProduk"))) {
 								listPelayananRemun.add(next);
 								capaianRemun += Double.valueOf(next.get("hargaJasa").toString());
@@ -1217,7 +1217,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 								 */
 								listPelayananRemun.add(next);
 								capaianRemun += Double.valueOf(next.get("hargaJasa").toString());
-							} else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN)
+							} else if (!Arrays.asList(Master.JenisProduk.NONLOGBOOK)
 									.contains(next.get("idJenisProduk"))) {
 								listPelayananRemun.add(next);
 								capaianRemun += Double.valueOf(next.get("hargaJasa").toString());
@@ -1242,7 +1242,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						} else if ((Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_UTAMA)
 								.contains(next.get("idDepartemen"))
 								|| Master.GolonganProduk.VISIT.equals(next.get("idGolonganProduk")))
-								&& !Arrays.asList(Master.JenisProduk.NONTINDAKAN).contains(next.get("idJenisProduk"))) {
+								&& !Arrays.asList(Master.JenisProduk.NONLOGBOOK).contains(next.get("idJenisProduk"))) {
 							/*
 							 * Dibatasi hanya di rawat jalan atau visite saja
 							 */
@@ -1265,7 +1265,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 								 */
 								listPelayananRemun.add(next);
 								capaianRemun += Double.valueOf(next.get("hargaJasa").toString());
-							} else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN)
+							} else if (!Arrays.asList(Master.JenisProduk.NONLOGBOOK)
 									.contains(next.get("idJenisProduk"))) {
 								listPelayananRemun.add(next);
 								capaianRemun += Double.valueOf(next.get("hargaJasa").toString());
@@ -1315,7 +1315,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 								 */
 								listPelayananRemun.add(next);
 								capaianRemun += Double.valueOf(next.get("hargaJasa").toString());
-							} else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN)
+							} else if (!Arrays.asList(Master.JenisProduk.NONLOGBOOK)
 									.contains(next.get("idJenisProduk"))) {
 								listPelayananRemun.add(next);
 								capaianRemun += Double.valueOf(next.get("hargaJasa").toString());
@@ -1338,7 +1338,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						} else if ((Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_UTAMA)
 								.contains(next.get("idDepartemen"))
 								|| Master.GolonganProduk.VISIT.equals(next.get("idGolonganProduk")))
-								&& !Arrays.asList(Master.JenisProduk.NONTINDAKAN).contains(next.get("idJenisProduk"))) {
+								&& !Arrays.asList(Master.JenisProduk.NONLOGBOOK).contains(next.get("idJenisProduk"))) {
 							/*
 							 * Dibatasi hanya di rawat jalan atau visite saja
 							 */
@@ -1359,7 +1359,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 								 * bebas klaim
 								 */
 								listPelayananFfs.add(next);
-							} else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN)
+							} else if (!Arrays.asList(Master.JenisProduk.NONLOGBOOK)
 									.contains(next.get("idJenisProduk"))) {
 								listPelayananFfs.add(next);
 							}
@@ -1405,7 +1405,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 								 * bebas klaim
 								 */
 								listPelayananFfs.add(next);
-							} else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN)
+							} else if (!Arrays.asList(Master.JenisProduk.NONLOGBOOK)
 									.contains(next.get("idJenisProduk"))) {
 								listPelayananFfs.add(next);
 							}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
index 1780a909..e72f7e32 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
@@ -3480,6 +3480,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		result.put("biayaObatAlkes", "-");
 		result.put("biayaRawatInap", "-");
 		result.put("biayaRawatJalan", "-");
+		result.put("potonganTokoKoperasi", "-");
 		BigDecimal jumlahPenerimaan = BigDecimal.ZERO;
 		BigDecimal jumlahPemotongan = BigDecimal.ZERO;
 		BigDecimal jumlahPenerimaanBersih = BigDecimal.ZERO;
@@ -3528,6 +3529,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 				result.put("biayaRawatInap", nf.format(k.getNominal()));
 			} else if (Master.KomponenGaji.BIAYA_RAWAT_JALAN == k.getIdKomponen()) {
 				result.put("biayaRawatJalan", nf.format(k.getNominal()));
+			} else if (Master.KomponenGaji.POTONGAN_TOKO_KOPERASI == k.getIdKomponen()) {
+				result.put("potonganTokoKoperasi", nf.format(k.getNominal()));
 			}
 		}
 		result.put("jumlahPenerimaan", nf.format(jumlahPenerimaan));
@@ -3624,6 +3627,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 					potonganDtoBuilder.biaya_ri(nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.BIAYA_RAWAT_JALAN == k.getIdKomponen()) {
 					potonganDtoBuilder.biaya_rj(nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_TOKO_KOPERASI == k.getIdKomponen()) {
+					potonganDtoBuilder.potongan_koperasi(nf.format(k.getNominal()));
 				}
 			}
 			jumlahDtoBuilder.jumlah_gross(nf.format(jumlahPenerimaan));
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
index 1915fdbd..93ac0ae0 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
@@ -34,6 +34,7 @@ import com.jasamedika.medifirst2000.dao.PegawaiDao;
 import com.jasamedika.medifirst2000.dao.SlipGajiDao;
 import com.jasamedika.medifirst2000.dao.SlipGajiDetailDao;
 import com.jasamedika.medifirst2000.dao.SlipGajiKomponenDao;
+import com.jasamedika.medifirst2000.dto.KomponenGajiDto;
 import com.jasamedika.medifirst2000.dto.SlipGajiDto;
 import com.jasamedika.medifirst2000.dto.SlipGajiKomponenDto;
 import com.jasamedika.medifirst2000.entities.Jabatan;
@@ -328,9 +329,11 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		row1.add("ID");
 		row1.add("");
 		row1.add(String.valueOf(month.getTime()));
+		row1.add("");
 		row2.add("");
 		row2.add("ID PEGAWAI");
-		row2.add("NAMA PEGAWAI / KOMPONEN");
+		row2.add("NAMA PEGAWAI");
+		row2.add("NIP / KOMPONEN");
 		allKomponen.forEach(k -> {
 			row1.add(k.get("id"));
 			row2.add(k.get("namaKomponen"));
@@ -345,10 +348,10 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		data.put(i++, arrkd);
 		for (Map<String, Object> d : listAllKomponen) {
 			data.put(i++,
-					new Object[] { d.get("id"), d.get("idPegawai"), d.get("namaPegawai"), d.get("1"), d.get("2"),
-							d.get("3"), d.get("4"), d.get("5"), d.get("6"), d.get("7"), d.get("8"), d.get("9"),
-							d.get("10"), d.get("11"), d.get("12"), d.get("13"), d.get("14"), d.get("15"), d.get("16"),
-							d.get("17"), d.get("18") });
+					new Object[] { d.get("id"), d.get("idPegawai"), d.get("namaPegawai"), d.get("nip"), d.get("1"),
+							d.get("2"), d.get("3"), d.get("4"), d.get("5"), d.get("6"), d.get("7"), d.get("8"),
+							d.get("9"), d.get("10"), d.get("11"), d.get("12"), d.get("13"), d.get("14"), d.get("15"),
+							d.get("16"), d.get("17"), d.get("18"), d.get("19") });
 		}
 		TreeMap<Integer, Object[]> sorted = new TreeMap<>();
 		sorted.putAll(data);
@@ -376,8 +379,9 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		sheet.setColumnHidden(0, true);
 		sheet.setColumnHidden(1, true);
 		sheet.autoSizeColumn(2);
+		sheet.autoSizeColumn(3);
 		sheet.setDefaultColumnWidth(25);
-		sheet.createFreezePane(3, 2);
+		sheet.createFreezePane(4, 2);
 		DateFormat df = new SimpleDateFormat("yyyyMMdd_HHmmss");
 		String timestampToString = df.format(new Date());
 		String filename = "Template_Slip_Gaji_" + timestampToString + ".xls";
@@ -427,4 +431,15 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		}
 		return result;
 	}
+
+	@Override
+	public List<KomponenGajiDto> listKomponen() {
+		List<KomponenGajiDto> result = new ArrayList<>();
+		Sort sort = new Sort(Sort.Direction.ASC, "id");
+		List<KomponenGaji> listKomponenGaji = komponenGajiDao.findAll(sort);
+		listKomponenGaji.forEach(k -> {
+			result.add(new KomponenGajiDto(k.getId(), k.getNamaKomponen(), k.getJenisKomponen()));
+		});
+		return result;
+	}
 }
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java
new file mode 100644
index 00000000..4a5b552f
--- /dev/null
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java
@@ -0,0 +1,51 @@
+package com.jasamedika.medifirst2000.dto;
+
+import com.jasamedika.medifirst2000.helper.Caption;
+
+/**
+ * @author Salman
+ *
+ */
+public class KomponenGajiDto {
+	@Caption(value = "ID")
+	protected Integer id;
+	
+	@Caption(value = "Nama Komponen")
+	private String namaKomponen;
+
+	@Caption(value = "Jenis Komponen")
+	private Integer jenisKomponen;
+
+	public KomponenGajiDto() {
+	}
+
+	public KomponenGajiDto(Integer id, String namaKomponen, Integer jenisKomponen) {
+		this.id = id;
+		this.namaKomponen = namaKomponen;
+		this.jenisKomponen = jenisKomponen;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getNamaKomponen() {
+		return namaKomponen;
+	}
+
+	public void setNamaKomponen(String namaKomponen) {
+		this.namaKomponen = namaKomponen;
+	}
+
+	public Integer getJenisKomponen() {
+		return jenisKomponen;
+	}
+
+	public void setJenisKomponen(Integer jenisKomponen) {
+		this.jenisKomponen = jenisKomponen;
+	}
+}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java
index 427f22cd..45f05f03 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java
@@ -43,12 +43,15 @@ public class SlipPotonganDto {
 	@Caption(value = "Biaya Rawat Jalan")
 	private String biaya_rj;
 
+	@Caption(value = "Potongan Toko Koperasi")
+	private String potongan_koperasi;
+
 	public SlipPotonganDto() {
 	}
 
 	public SlipPotonganDto(String pph_gaji, String pph_remun, String pph_ffs, String pph_ffo, String pph_um,
 			String pph_ul, String iuran_koperasi, String pinjam_koperasi, String biaya_obat, String biaya_ri,
-			String biaya_rj) {
+			String biaya_rj, String potongan_koperasi) {
 		super();
 		this.pph_gaji = pph_gaji;
 		this.pph_remun = pph_remun;
@@ -61,6 +64,7 @@ public class SlipPotonganDto {
 		this.biaya_obat = biaya_obat;
 		this.biaya_ri = biaya_ri;
 		this.biaya_rj = biaya_rj;
+		this.potongan_koperasi = potongan_koperasi;
 	}
 
 	public String getPph_gaji() {
@@ -150,7 +154,15 @@ public class SlipPotonganDto {
 	public void setBiaya_rj(String biaya_rj) {
 		this.biaya_rj = biaya_rj;
 	}
-	
+
+	public String getPotongan_koperasi() {
+		return potongan_koperasi;
+	}
+
+	public void setPotongan_koperasi(String potongan_koperasi) {
+		this.potongan_koperasi = potongan_koperasi;
+	}
+
 	public static SlipPotonganDtoBuilder builder() {
 		return new SlipPotonganDtoBuilder();
 	}
@@ -167,6 +179,7 @@ public class SlipPotonganDto {
 		private String biaya_obat = "-";
 		private String biaya_ri = "-";
 		private String biaya_rj = "-";
+		private String potongan_koperasi = "-";
 
 		public SlipPotonganDtoBuilder() {
 		}
@@ -226,10 +239,15 @@ public class SlipPotonganDto {
 			return this;
 		}
 
+		public SlipPotonganDtoBuilder potongan_koperasi(final String potongan_koperasi) {
+			this.potongan_koperasi = potongan_koperasi;
+			return this;
+		}
+
 		public SlipPotonganDto build() {
 			return new SlipPotonganDto(this.pph_gaji, this.pph_remun, this.pph_ffs, this.pph_ffo, this.pph_um,
 					this.pph_ul, this.iuran_koperasi, this.pinjam_koperasi, this.biaya_obat, this.biaya_ri,
-					this.biaya_rj);
+					this.biaya_rj, this.potongan_koperasi);
 		}
 	}
 }
diff --git a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java
index fab3f9c6..bb0e5b2b 100644
--- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java
+++ b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java
@@ -6561,8 +6561,6 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
 			@RequestParam(value = "idJabatanAtasan", required = true) Integer idJabatanAtasan,
 			@RequestParam(value = "ffs", required = true) Boolean ffs) {
 
-		// List<Map<String, Object>> result = new ArrayList<Map<String,
-		// Object>>();
 		List<Map<String, Object>> resultFFS = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> allDetailTindakan = new ArrayList<>();
 
@@ -6575,9 +6573,6 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
 			bulan = bulanArray[Integer.parseInt(splitData[1]) - 1];
 		}
 
-		// Pegawai pegawaiLoggedIn =
-		// indekKinerjaService.getPegawaiByUserLogin();
-		// Jabatan jabatan = jabatanDao.findOne(idJabatanAtasan);
 		Map<String, Object> mapJabatan = mapPegawaiJabatanToUnitKerjaService.findAtasanDanUnitKerja(idPegawai,
 				idJabatan);
 		Map<String, Object> atasan = mapPegawaiJabatanToUnitKerjaService.findAtasanDanUnitKerja(idAtasan,
@@ -6586,7 +6581,9 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
 		Map<String, Object> pegawai = pegawaiDao.findPegawaiById(idPegawai);
 
 		if (ffs) {
-			// FFS : sudah tidak dipakai
+			/**
+			 * @deprecated Unused services
+			 */
 			resultFFS = indekKinerjaService.getAllTindakanByDokterForfeeForServiceReview(periode, idPegawai);
 			allDetailTindakan = indekKinerjaService.findPatientDetailForEveryTindakanReview(idPegawai, periode, ffs);
 		} else {
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
index e8c4225a..a7548dd4 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
@@ -31,6 +31,7 @@
 	<field name="jumlahPemotongan" class="java.lang.String"/>
 	<field name="jumlahPenerimaanBersih" class="java.lang.String"/>
 	<field name="periode" class="java.lang.String"/>
+	<field name="potonganTokoKoperasi" class="java.lang.String"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -66,7 +67,7 @@
 		</band>
 	</title>
 	<summary>
-		<band height="373" splitType="Stretch">
+		<band height="380" splitType="Stretch">
 			<elementGroup>
 				<staticText>
 					<reportElement stretchType="ElementGroupHeight" x="0" y="0" width="100" height="20" uuid="057ed757-3d6b-4918-adbc-376c8110efde">
@@ -168,6 +169,20 @@
 					</textElement>
 					<textFieldExpression><![CDATA[": " + $F{jabatan}]]></textFieldExpression>
 				</textField>
+				<staticText>
+					<reportElement x="336" y="40" width="100" height="20" uuid="5137cbca-8972-499f-8876-cfe9489b879d"/>
+					<textElement verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
+					<text><![CDATA[Periode]]></text>
+				</staticText>
+				<textField>
+					<reportElement x="436" y="40" width="236" height="20" uuid="bcd9a255-8b8f-493f-9f1f-2d2263313f8a"/>
+					<textElement verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
+					<textFieldExpression><![CDATA[": " + $F{periode}]]></textFieldExpression>
+				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
@@ -213,7 +228,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="146" y="80" width="10" height="20" uuid="10534203-dc53-4612-90ca-718e7bfc3a15">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -238,7 +255,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="80" width="10" height="20" uuid="5fdf12d4-7392-4686-afdc-0faf7be17d41">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -266,7 +285,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="146" y="100" width="10" height="20" uuid="fab5c929-2076-493a-9b94-0093bbf75721">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -291,7 +312,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="100" width="10" height="20" uuid="66061d52-e6bc-434b-8a89-b68ccf7cb0cf">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -317,7 +340,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="146" y="120" width="10" height="20" uuid="099039f6-4171-4a23-8bb7-bbb92e740827">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -342,7 +367,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="120" width="10" height="20" uuid="6a909637-dcf9-4fc6-b751-208d5c472ac8">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -368,7 +395,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="146" y="140" width="10" height="20" uuid="e7388492-7c5d-4c48-bc18-60f5d9808efd">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -393,7 +422,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="140" width="10" height="20" uuid="ab9189af-5616-4355-b4ef-393b62763f33">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -420,7 +451,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="146" y="160" width="10" height="20" uuid="3261589e-da63-4cb9-b85b-f046c784d76f">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -445,7 +478,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="160" width="10" height="20" uuid="f375a9e3-d23c-4764-b193-7d1d79f2b52d">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -472,7 +507,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="146" y="180" width="10" height="20" uuid="2daf9a8e-8387-4dcc-8715-40f9c1076ae7">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -497,7 +534,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="180" width="10" height="20" uuid="c34752ca-6709-47b3-84f6-8322d3e10b5e">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -524,7 +563,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="146" y="200" width="10" height="20" uuid="8ac3ed78-1e40-4564-81e8-c1c51745324a">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -549,7 +590,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="200" width="10" height="20" uuid="966a55ab-6547-4203-a339-057fae1bf26b">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -576,7 +619,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="220" width="10" height="20" uuid="ee85b554-b1bd-4270-ba67-703c34399628">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -603,7 +648,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="240" width="10" height="20" uuid="839fa0c7-6bf5-4fc8-8406-b8bf3da1651b">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -630,7 +677,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="260" width="10" height="20" uuid="a6ee6c7e-8259-4563-9bf7-7ee14d56f756">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -657,7 +706,9 @@
 					<reportElement stretchType="ElementGroupHeight" x="482" y="280" width="10" height="20" uuid="2097aad6-98e4-4af0-ab64-96a524c27e52">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
@@ -671,7 +722,31 @@
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="300" width="146" height="20" uuid="4203d9f9-f018-4608-927f-107398ec2fd7">
+					<reportElement stretchType="ElementGroupHeight" x="336" y="300" width="146" height="20" uuid="399aa6f2-dbcd-4bf4-a490-db90468db0ad"/>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
+					<text><![CDATA[Potongan Toko Koperasi]]></text>
+				</staticText>
+				<staticText>
+					<reportElement stretchType="ElementGroupHeight" x="482" y="300" width="10" height="20" uuid="fa89aa2a-9f7c-45c5-b683-00753d6b6318"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
+					<text><![CDATA[:]]></text>
+				</staticText>
+				<textField>
+					<reportElement stretchType="RelativeToBandHeight" x="492" y="300" width="180" height="20" uuid="7888f031-3a55-45d0-984d-f5f3d52e4755"/>
+					<box rightPadding="10"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{potonganTokoKoperasi}]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="ElementGroupHeight" x="0" y="320" width="146" height="20" uuid="4203d9f9-f018-4608-927f-107398ec2fd7">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box>
@@ -686,7 +761,7 @@
 					<text><![CDATA[Jumlah Penerimaan]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="146" y="300" width="10" height="20" uuid="fd8a9f3f-9ea6-45ba-a950-169469a82d34">
+					<reportElement stretchType="ElementGroupHeight" x="146" y="320" width="10" height="20" uuid="fd8a9f3f-9ea6-45ba-a950-169469a82d34">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box>
@@ -695,11 +770,13 @@
 						<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
-					<reportElement stretchType="ElementGroupHeight" x="156" y="300" width="180" height="20" uuid="96abf5f4-aa4b-450c-b0c5-50fbb556d356">
+					<reportElement stretchType="ElementGroupHeight" x="156" y="320" width="180" height="20" uuid="96abf5f4-aa4b-450c-b0c5-50fbb556d356">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box rightPadding="10">
@@ -714,7 +791,7 @@
 					<textFieldExpression><![CDATA[$F{jumlahPenerimaan}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="336" y="300" width="146" height="20" uuid="8f603c16-343d-4a69-a1c4-d9a69db5e8a4">
+					<reportElement stretchType="ElementGroupHeight" x="336" y="320" width="146" height="20" uuid="8f603c16-343d-4a69-a1c4-d9a69db5e8a4">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box>
@@ -729,7 +806,7 @@
 					<text><![CDATA[Jumlah Pemotongan]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="482" y="300" width="10" height="20" uuid="4e913d2b-fde9-40f6-9321-bcb5b61018a1">
+					<reportElement stretchType="ElementGroupHeight" x="482" y="320" width="10" height="20" uuid="4e913d2b-fde9-40f6-9321-bcb5b61018a1">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box>
@@ -738,11 +815,13 @@
 						<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
-					<reportElement stretchType="ElementGroupHeight" x="492" y="300" width="180" height="20" uuid="35534177-432a-4aa4-a7e4-a3938b973afa"/>
+					<reportElement stretchType="ElementGroupHeight" x="492" y="320" width="180" height="20" uuid="35534177-432a-4aa4-a7e4-a3938b973afa"/>
 					<box rightPadding="10">
 						<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -757,7 +836,7 @@
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="336" y="320" width="146" height="20" uuid="7cffaf33-ca8d-4941-81ec-fb726963a9e8">
+					<reportElement stretchType="ElementGroupHeight" x="336" y="340" width="146" height="20" uuid="7cffaf33-ca8d-4941-81ec-fb726963a9e8">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box>
@@ -772,7 +851,7 @@
 					<text><![CDATA[Jumlah Penerimaan Bersih]]></text>
 				</staticText>
 				<staticText>
-					<reportElement stretchType="ElementGroupHeight" x="482" y="320" width="10" height="20" uuid="82ccfab6-a9f3-4123-82a5-092e62d04098">
+					<reportElement stretchType="ElementGroupHeight" x="482" y="340" width="10" height="20" uuid="82ccfab6-a9f3-4123-82a5-092e62d04098">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box>
@@ -781,11 +860,13 @@
 						<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle">
+						<font size="11"/>
+					</textElement>
 					<text><![CDATA[:]]></text>
 				</staticText>
 				<textField>
-					<reportElement stretchType="ElementGroupHeight" x="492" y="320" width="180" height="20" uuid="e43742bc-95ba-4c51-b4bd-8e4c5cf1085e">
+					<reportElement stretchType="ElementGroupHeight" x="492" y="340" width="180" height="20" uuid="e43742bc-95ba-4c51-b4bd-8e4c5cf1085e">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box rightPadding="10">
@@ -802,7 +883,7 @@
 			</elementGroup>
 			<elementGroup>
 				<textField>
-					<reportElement stretchType="ElementGroupHeight" x="0" y="340" width="672" height="20" uuid="55f384c5-07ec-45cc-9ff0-77df6c0b0368">
+					<reportElement stretchType="ElementGroupHeight" x="0" y="360" width="672" height="20" uuid="55f384c5-07ec-45cc-9ff0-77df6c0b0368">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Right" verticalAlignment="Bottom">
@@ -811,20 +892,6 @@
 					<textFieldExpression><![CDATA["dicetak melalui aplikasi SMART pada " + new SimpleDateFormat("dd MMMM yyyy", new java.util.Locale("id")).format(new Date())]]></textFieldExpression>
 				</textField>
 			</elementGroup>
-			<textField>
-				<reportElement x="436" y="40" width="236" height="20" uuid="bcd9a255-8b8f-493f-9f1f-2d2263313f8a"/>
-				<textElement verticalAlignment="Middle">
-					<font size="11"/>
-				</textElement>
-				<textFieldExpression><![CDATA[": " + $F{periode}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement x="336" y="40" width="100" height="20" uuid="5137cbca-8972-499f-8876-cfe9489b879d"/>
-				<textElement verticalAlignment="Middle">
-					<font size="11"/>
-				</textElement>
-				<text><![CDATA[Periode]]></text>
-			</staticText>
 		</band>
 	</summary>
 </jasperReport>
diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java
index 800b1a1d..1c6baf21 100644
--- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java
+++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SlipGajiController.java
@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
+import com.jasamedika.medifirst2000.dto.KomponenGajiDto;
 import com.jasamedika.medifirst2000.dto.SlipGajiDto;
 import com.jasamedika.medifirst2000.service.SlipGajiService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
@@ -128,4 +129,10 @@ public class SlipGajiController {
 			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}
 	}
+
+	@RequestMapping(value = "/komponen/list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<Object> get() {
+		List<KomponenGajiDto> entity = slipGajiService.listKomponen();
+		return new ResponseEntity<>(entity, HttpStatus.OK);
+	}
 }