From 7b60c351883c0272a9c65610a39b94fbaf35bdcf Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Fri, 3 Sep 2021 20:14:42 +0700
Subject: [PATCH] - pembuatan entity logginguser_t yang sudah dibuat pertama di
 laravel - penerapan aturan jaminan kemenkes sebagai mana bpjs di service
 logbook skor - pembuatan service rekapitulasi diskon tata rekening -
 pembuatan service log sebagai detail rekapitulasi diskon tata rekening -
 penyesuaian aturan dibebaskan biaya pelayanan di klinik karyawan - penerapan
 aturan jaminan kemenkes sebagai mana bpjs di service logbook poin - penerapan
 aturan jaminan kemenkes sebagai mana bpjs di service detail logbook poin -
 penerapan aturan jaminan kemenkes sebagai mana bpjs di service cetakan
 logbook poin - penerapan aturan jaminan kemenkes sebagai mana bpjs di service
 cetakan detail pasien logbook poin - penerapan aturan jaminan kemenkes
 sebagai mana bpjs di service cetakan rekapitulasi logbook poin - persiapan
 service simpan monitoring absensi sebagai service simpan verifikasi indikator
 kehadiran - penerapan aturan jaminan kemenkes sebagai mana bpjs di service
 logbook ffs - penerapan aturan jaminan kemenkes sebagai mana bpjs di service
 detail logbook ffs - penerapan aturan jaminan kemenkes sebagai mana bpjs di
 service cetakan logbook ffs - penerapan aturan jaminan kemenkes sebagai mana
 bpjs di service cetakan detail pasien logbook ffs - penerapan aturan jaminan
 kemenkes sebagai mana bpjs di service cetakan rekapitulasi logbook ffs -
 penyesuaian tipe data kolom no struk terakhir di pasien daftar - pendaftaran
 loggginguser_t dalam konfigurasi hibernate

---
 .../medifirst2000/constants/Master.java       |    1 +
 .../dao/IkiDanRemunerasiDao.java              |  108 +-
 .../medifirst2000/dao/PasienDaftarDao.java    |   69 +-
 .../medifirst2000/dao/PelayananPasienDao.java |   14 +-
 .../service/PasienDaftarService.java          |    4 +
 .../service/PelayananPasienService.java       |    1 -
 .../service/impl/IndekKinerjaServiceImpl.java |  724 +++++---
 .../impl/MonitoringAbsenServiceImpl.java      |    2 +
 .../service/impl/PasienDaftarServiceImpl.java |   24 +-
 .../impl/PelayananPasienServiceImpl.java      |    3 +-
 .../service/impl/PendapatanServiceImpl.java   | 1452 +++++++++++------
 .../medifirst2000/entities/PasienDaftar.java  |    6 +-
 .../medifirst2000/entities/UserLogging.java   |  125 ++
 .../src/main/resources/hibernate.cfg.xml      |    1 +
 .../controller/ReportingController.java       |   42 +
 .../controller/PelayananController.java       |    1 -
 16 files changed, 1778 insertions(+), 799 deletions(-)
 create mode 100644 jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UserLogging.java

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 48ae7a9d..a6e0562e 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
@@ -308,6 +308,7 @@ public class Master {
 		public static final Integer[] PERISTI = { 45, 75, 76, 463, 464 };
 		public static final Integer[] TANJUNG = { 72, 551 };
 
+		public static final int KLINIK_KARYAWAN = 70;
 		public static final int LABORATORIUM_PATOLOGI_ANATOMI = 39;
 		public static final int LABORATORIUM_PATOLOGI_KLINIK = 276;
 		public static final int OK = 44;
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
index 20271352..046e8923 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
@@ -99,10 +99,10 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 	public Double findRemunerasi(@Param("periode") String periode, @Param("idPegawai") Integer idPegawai);
 
 	// Target_pelayanan_jam_kerja
-	@Query("select distinct new Map(ppp.ObjectJenisPetugasPeId as jenisPetugasId,pg.id as pegawaiId,"
+	@Query("select distinct new Map(ppp.ObjectJenisPetugasPeId as jenisPetugasId," + "pg.id as pegawaiId,"
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,pp.hargaDiscount as hargaDiskon,pp.jumlah as jumlahTindakan,"
 			+ "su.id as idKelompokKerja,su.name as kelompokKerja,"
-			+ "pr.id as idTindakan,pr.namaProduk as namaTindakan,djp.id as djpId,"
+			+ "pr.id as idTindakan,pr.namaProduk as namaTindakan," + "djp.id as djpId,"
 			+ "ru.departemenId as idDepartemen,ru.id as idRuangan," + "pd.diskonPegawai as statusDiskon) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, MapPegawaiJabatanToUnitKerja mpju, PegawaiJadwalKerja pjk "
 			+ "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg " + "left join pp.produk pr "
@@ -116,14 +116,14 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "and pg.statusEnabled is true " + "and su.statusEnabled is true " + "and pd.statusEnabled is true "
 			+ "and sk.statusEnabled is true " + "and pp.tglPelayanan between :tglAwal and :tglAkhir "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
-			+ "and (((((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
-			+ "and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:00' else '15:30:00' end)) "
-			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') "
-			+ "and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:00' else '16:00:00' end))) "
-			+ "and sk.id not in (:listNonjadwalId)) and (pd.kelompokPasienId not in (:listBpjsId) and ((pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId <> :asuransiLainId and pd.rekananId <> :jaminanKemenkesId)))) "
-			+ "or (pd.kelompokPasienId in (:listBpjsId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId = :jaminanKemenkesId))) "
-			+ "and pg.jenisPegawaiId = :jenisPegawaiId " + "and djp.jenisProdukId not in (:listNontindakanId) "
-			+ "and pr.id <> :karcisId " + "order by su.name, pr.id")
+			+ "and ((pd.kelompokPasienId in (:listBpjsId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId = :jaminanKemenkesId)) "
+			+ "or (((pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) "
+			+ "or (pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null)) "
+			+ "and ((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:00' else '15:30:00' end)) "
+			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:00' else '16:00:00' end))) "
+			+ "and sk.id not in (:listNonjadwalId))) " + "and pg.jenisPegawaiId = :jenisPegawaiId "
+			+ "and djp.jenisProdukId not in (:listNontindakanId) " + "and pr.id <> :karcisId "
+			+ "order by su.name, pr.id")
 	public List<Map<String, Object>> getDataLayananJamKerja(@Param("tglAwal") Date tglAwal,
 			@Param("psbbAwal") Date psbbAwal, @Param("psbbAkhir") Date psbbAkhir, @Param("tglAkhir") Date tglAkhir,
 			@Param("listNonjadwalId") List<Integer> listIdNonjadwal, @Param("jenisPegawaiId") Integer idJenisPegawai,
@@ -136,7 +136,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 	@Query("select distinct new Map(ppp.ObjectJenisPetugasPeId as jenisPetugasId,"
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,pp.hargaDiscount as hargaDiskon,pp.jumlah as jumlahTindakan,"
 			+ "pg.id as pegawaiId,pg.namaLengkap as namaLengkap," + "jb.id as jabatanId,jb.namaJabatan as namaJabatan,"
-			+ "pr.id as idTindakan,pr.namaProduk as namaTindakan,djp.id as djpId,"
+			+ "pr.id as idTindakan,pr.namaProduk as namaTindakan," + "djp.id as djpId,"
 			+ "ru.departemenId as idDepartemen,ru.id as idRuangan," + "pd.diskonPegawai as statusDiskon) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, MapPegawaiJabatanToUnitKerja mpju, PegawaiJadwalKerja pjk "
 			+ "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg " + "left join mpju.jabatan jb "
@@ -149,14 +149,10 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "and pg.statusEnabled is true " + "and jb.statusEnabled is true " + "and pd.statusEnabled is true "
 			+ "and sk.statusEnabled is true " + "and pp.tglPelayanan between :tglAwal and :tglAkhir "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
-			+ "and (((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
-			+ "and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:01' else '15:30:01' end) and '23:59:59' "
-			+ "or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
-			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') "
-			+ "and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:01' else '16:00:01'end) and '23:59:59' "
-			+ "or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
-			+ "or to_char(pp.tglPelayanan,'dy') in ('sat','sun') " + "or sk.id in (:listNonjadwalId)) "
-			+ "and (pd.kelompokPasienId not in (:listBpjsId) and ((pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId <> :asuransiLainId and pd.rekananId <> :jaminanKemenkesId)))) "
+			+ "and (((pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) or (pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null)) "
+			+ "and ((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:01' else '15:30:01' end) and '23:59:59' or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
+			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:01' else '16:00:01'end) and '23:59:59' or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
+			+ "or to_char(pp.tglPelayanan,'dy') in ('sat','sun') " + "or sk.id in (:listNonjadwalId))) "
 			+ "and pg.jenisPegawaiId = :jenisPegawaiId " + "and jb.kelompokJabatanId in (3,4) "
 			+ "and djp.jenisProdukId not in (:listNontindakanId) " + "and pr.id <> :karcisId "
 			+ "order by pg.namaLengkap, pr.id")
@@ -170,7 +166,8 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 
 	// Kinerja_jam_kerja_dokter
 	String kinerjaJamKerjaDokter = "select distinct new Map(ppp.ObjectJenisPetugasPeId as jenisPetugasId,"
-			+ "pg.id as pegawaiId," + "pr.id as produkId,pr.namaProduk as namaProduk, djp.id as detailJenisProdukId,"
+			+ "pg.id as pegawaiId," + "pr.id as produkId,pr.namaProduk as namaProduk,"
+			+ "djp.id as detailJenisProdukId,"
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,pp.jumlah as jumlah,pp.hargaDiscount as hargaDiskon,"
 			+ "ru.departemenId as departemenId,ru.id as ruanganId," + "pd.diskonPegawai as statusDiskon) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, PegawaiJadwalKerja pjk "
@@ -182,14 +179,12 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "and pg.statusEnabled is true " + "and pd.statusEnabled is true " + "and sk.statusEnabled is true "
 			+ "and to_char(pp.tglPelayanan,'yyyy-MM') = :bulan "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
-			+ "and (((((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
-			+ "and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:00' else '15:30:00' end)) "
-			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') "
-			+ "and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:00' else '16:00:00' end))) "
-			+ "and sk.id not in (:listNonjadwalId)) and (pd.kelompokPasienId not in (:listBpjsId) and ((pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId <> :asuransiLainId and pd.rekananId <> :jaminanKemenkesId)))) "
-			+ "or (pd.kelompokPasienId in (:listBpjsId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId = :jaminanKemenkesId))) "
-			+ "and pg.jenisPegawaiId = :jenisPegawaiId " + "and djp.jenisProdukId not in (:listNontindakanId) "
-			+ "and pr.id <> :karcisId " + "and pg.id in (:listPegawaiId) ";
+			+ "and ((pd.kelompokPasienId in (:listBpjsId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId = :jaminanKemenkesId)) or (((pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) or (pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null)) "
+			+ "and ((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:00' else '15:30:00' end)) "
+			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:00' else '16:00:00' end))) "
+			+ "and sk.id not in (:listNonjadwalId))) " + "and pg.jenisPegawaiId = :jenisPegawaiId "
+			+ "and djp.jenisProdukId not in (:listNontindakanId) " + "and pr.id <> :karcisId "
+			+ "and pg.id in (:listPegawaiId) ";
 
 	String paramListDetailJenisProdukId = "and (djp.id in (:listDetailJenisProdukId) "
 			+ "or (djp.id not in (:listDetailJenisProdukId) " + "and pr.id in (:listProdukIgdId) "
@@ -234,17 +229,12 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "and pg.statusEnabled is true " + "and pd.statusEnabled is true " + "and sk.statusEnabled is true "
 			+ "and to_char(pp.tglPelayanan,'yyyy-MM') = :bulan "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
-			+ "and (((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
-			+ "and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:01' else '15:30:01' end) and '23:59:59' "
-			+ "or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
-			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') "
-			+ "and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:01' else '16:00:01'end) and '23:59:59' "
-			+ "or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
-			+ "or to_char(pp.tglPelayanan,'dy') in ('sat','sun') or sk.id in (:listNonjadwalId)) "
-			+ "and (pd.kelompokPasienId not in (:listBpjsId) and ((pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId <> :asuransiLainId and pd.rekananId <> :jaminanKemenkesId)))) "
+			+ "and (((pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) or (pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null)) "
+			+ "and ((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:01' else '15:30:01' end) and '23:59:59' or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
+			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:01' else '16:00:01'end) and '23:59:59' or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
+			+ "or to_char(pp.tglPelayanan,'dy') in ('sat','sun') " + "or sk.id in (:listNonjadwalId))) "
 			+ "and pg.jenisPegawaiId = :jenisPegawaiId " + "and (djp.id in (:listDetailJenisProdukId) "
-			+ "or (djp.id not in (:listDetailJenisProdukId) " + "and pr.id in (:listProdukIgdId) "
-			+ "and pg.id in (:listDokterUmumId) " + "and ru.departemenId = :IgdId)) "
+			+ "or (djp.id not in (:listDetailJenisProdukId) and pr.id in (:listProdukIgdId) and pg.id in (:listDokterUmumId) and ru.departemenId = :IgdId)) "
 			+ "and djp.jenisProdukId not in (:listNontindakanId) " + "and pr.id <> :karcisId "
 			+ "and pg.id = :pegawaiId " + "order by pr.namaProduk, pp.tglPelayanan")
 	public List<Map<String, Object>> getDataLogbookLuarJamKerjaDokter(@Param("bulan") String bulan,
@@ -259,12 +249,12 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			@Param("karcisId") Integer idKarcis);
 
 	// Detail_logbook_kinerja_jam_kerja_dokter
-	@Query("select distinct new Map(jpp.id as jenisPetugasId, jpp.jenisPetugasPe as jenisPetugas,"
+	@Query("select distinct new Map(jpp.id as jenisPetugasId,jpp.jenisPetugasPe as jenisPetugas,"
 			+ "pr.id as produkId,pr.namaProduk as namaProduk,"
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,to_char(pp.tglPelayanan,'dd-MM-yyyy HH24:MI:ss') as tglPelayananFormatted,pp.jumlah as jumlah,pp.hargaDiscount as hargaDiskon,"
 			+ "ru.departemenId as departemenId,ru.id as ruanganId,ru.namaRuangan as namaRuangan,"
 			+ "pd.noRegistrasi as noRegistrasi,pd.diskonPegawai as statusDiskon,"
-			+ "ps.namaPasien as namaPasien, ps.noCm as noCm, " + "kp.kelompokPasien as kelompokPasien) "
+			+ "ps.namaPasien as namaPasien,ps.noCm as noCm," + "kp.kelompokPasien as kelompokPasien) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, PegawaiJadwalKerja pjk "
 			+ "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg "
 			+ "left join ppp.kdjenispetugaspe jpp " + "left join pp.produk pr " + "left join pp.pasienDaftar apd "
@@ -275,17 +265,16 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "and pg.statusEnabled is true " + "and pd.statusEnabled is true " + "and pr.id = :produkId "
 			+ "and to_char(pp.tglPelayanan,'yyyy-MM-dd') = :tglPelayanan "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
-			+ "and (((((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
-			+ "and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:00' else '15:30:00' end)) "
-			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') "
-			+ "and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:00' else '16:00:00' end))) "
-			+ "and sk.id not in (:listNonjadwalId)) and (pd.kelompokPasienId not in (:listBpjsId) and ((pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId <> :asuransiLainId and pd.rekananId <> :jaminanKemenkesId)))) "
-			+ "or (pd.kelompokPasienId in (:listBpjsId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId = :jaminanKemenkesId))) "
-			+ "and pg.jenisPegawaiId = :jenisPegawaiId " + "and (djp.id in (:listDetailJenisProdukId) "
-			+ "or (djp.id not in (:listDetailJenisProdukId) " + "and pr.id in (:listProdukIgdId) "
-			+ "and pg.id in (:listDokterUmumId) " + "and ru.departemenId = :IgdId)) "
+			+ "and ((pd.kelompokPasienId in (:listBpjsId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId = :jaminanKemenkesId)) "
+			+ "or (((pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) "
+			+ "or (pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null)) "
+			+ "and ((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:00' else '15:30:00' end)) "
+			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') and to_char(pp.tglPelayanan,'HH24:MI:ss') between '07:00:00' and (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:00' else '16:00:00' end))) "
+			+ "and sk.id not in (:listNonjadwalId))) " + "and pg.jenisPegawaiId = :jenisPegawaiId "
+			+ "and (djp.id in (:listDetailJenisProdukId) "
+			+ "or (djp.id not in (:listDetailJenisProdukId) and pr.id in (:listProdukIgdId) and pg.id in (:listDokterUmumId) and ru.departemenId = :IgdId)) "
 			+ "and djp.jenisProdukId not in (:listNontindakanId) " + "and pr.id <> :karcisId "
-			+ "and pg.id = :pegawaiId" + " order by pr.namaProduk, pp.tglPelayanan")
+			+ "and pg.id = :pegawaiId " + "order by pr.namaProduk, pp.tglPelayanan")
 	public List<Map<String, Object>> findDetailPasienLogbookJamKerjaDokter(@Param("produkId") Integer idProduk,
 			@Param("tglPelayanan") String tglPelayanan, @Param("psbbAwal") Date psbbAwal,
 			@Param("psbbAkhir") Date psbbAkhir, @Param("listNonjadwalId") List<Integer> listIdNonjadwal,
@@ -299,12 +288,12 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			@Param("karcisId") Integer idKarcis);
 
 	// Detail_logbook_kinerja_luar_jam_kerja_dokter
-	@Query("select distinct new Map(jpp.id as jenisPetugasId, jpp.jenisPetugasPe as jenisPetugas,"
+	@Query("select distinct new Map(jpp.id as jenisPetugasId,jpp.jenisPetugasPe as jenisPetugas,"
 			+ "pr.id as produkId,pr.namaProduk as namaProduk,"
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,to_char(pp.tglPelayanan,'dd-MM-yyyy HH24:MI:ss') as tglPelayananFormatted,pp.jumlah as jumlah,pp.hargaDiscount as hargaDiskon,"
 			+ "ru.departemenId as departemenId,ru.id as ruanganId,ru.namaRuangan as namaRuangan,"
 			+ "pd.noRegistrasi as noRegistrasi,pd.diskonPegawai as statusDiskon,"
-			+ "ps.namaPasien as namaPasien, ps.noCm as noCm, kp.kelompokPasien as kelompokPasien) "
+			+ "ps.namaPasien as namaPasien,ps.noCm as noCm," + "kp.kelompokPasien as kelompokPasien) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, PegawaiJadwalKerja pjk "
 			+ "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg "
 			+ "left join ppp.kdjenispetugaspe jpp " + "left join pp.produk pr " + "left join pp.pasienDaftar apd "
@@ -315,17 +304,12 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "and pg.statusEnabled is true " + "and pd.statusEnabled is true " + "and pr.id = :produkId "
 			+ "and to_char(pp.tglPelayanan,'yyyy-MM-dd') = :tglPelayanan "
 			+ "and cast(pp.tglPelayanan as date) = cast(kl.tanggal as date) "
-			+ "and (((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') "
-			+ "and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:01' else '15:30:01' end) and '23:59:59' "
-			+ "or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
-			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') "
-			+ "and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:01' else '16:00:01'end) and '23:59:59' "
-			+ "or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
-			+ "or to_char(pp.tglPelayanan,'dy') in ('sat','sun') or sk.id in (:listNonjadwalId)) "
-			+ "and (pd.kelompokPasienId not in (:listBpjsId) and ((pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId <> :asuransiLainId and pd.rekananId <> :jaminanKemenkesId)))) "
+			+ "and (((pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) or (pd.kelompokPasienId not in (:listBpjsId) and pd.kelompokPasienId <> :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is not null and pd.rekananId <> :jaminanKemenkesId) or (pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null)) "
+			+ "and ((to_char(pp.tglPelayanan,'dy') in ('mon','tue','wed','thu') and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '14:00:01' else '15:30:01' end) and '23:59:59' or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
+			+ "or (to_char(pp.tglPelayanan,'dy') in ('fri') and (to_char(pp.tglPelayanan,'HH24:MI:ss') between (case when pp.tglPelayanan between cast(:psbbAwal as timestamp) and cast(:psbbAkhir as timestamp) and ru.departemenId in (:listDepartemenId) then '15:30:01' else '16:00:01'end) and '23:59:59' or to_char(pp.tglPelayanan,'HH24:MI:ss') between '00:00:00' and '07:00:00') and sk.id not in (:listNonjadwalId)) "
+			+ "or to_char(pp.tglPelayanan,'dy') in ('sat','sun') " + "or sk.id in (:listNonjadwalId))) "
 			+ "and pg.jenisPegawaiId = :jenisPegawaiId " + "and (djp.id in (:listDetailJenisProdukId) "
-			+ "or (djp.id not in (:listDetailJenisProdukId) " + "and pr.id in (:listProdukIgdId) "
-			+ "and pg.id in (:listDokterUmumId) " + "and ru.departemenId = :IgdId)) "
+			+ "or (djp.id not in (:listDetailJenisProdukId) and pr.id in (:listProdukIgdId) and pg.id in (:listDokterUmumId) and ru.departemenId = :IgdId)) "
 			+ "and djp.jenisProdukId not in (:listNontindakanId) " + "and pr.id <> :karcisId "
 			+ "and pg.id = :pegawaiId " + "order by pr.namaProduk, pp.tglPelayanan")
 	public List<Map<String, Object>> findDetailPasienLogbookLuarJamKerjaDokter(@Param("produkId") Integer idProduk,
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDaftarDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDaftarDao.java
index 272baa0e..687f0b70 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDaftarDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDaftarDao.java
@@ -26,9 +26,6 @@ public interface PasienDaftarDao extends PagingAndSortingRepository<PasienDaftar
 	List<PasienDaftar> findByPasienNoCm(@Param("noCm") String noCm);
 
 	@Query("select count(p.noRec) from PasienDaftar p where month(p.tglRegistrasi)=:monthNow and year(p.tglRegistrasi)=:yearNow ")
-	// @Query("select count(p.noRec) from PasienDaftar p where
-	// int(mid(p.noregistrasi,2,2))=:monthNow and
-	// int(left(p.noregistrasi,2))=:yearNow ")
 	Integer getCountByMonthAndYear(@Param("monthNow") Integer monthNow, @Param("yearNow") Integer yearNow);
 
 	@Query("select max(p.noRegistrasi) from PasienDaftar p where cast(substring(p.noRegistrasi, 1,2)as int)=:yearNow and cast(substring(p.noRegistrasi, 3,2)as int)=:monthNow ")
@@ -38,8 +35,6 @@ public interface PasienDaftarDao extends PagingAndSortingRepository<PasienDaftar
 	PasienDaftar finByNoCm(@Param("kdProfile") short kdProfile, @Param("noCm") String noCm,
 			@Param("tglRegistrasi") Date tglRegistrasi);
 
-	// @Query("select p from PasienDaftar p where p.pasien.id=:id and
-	// p.kdProfile=:kdProfile and date(p.tglRegistrasi)=date(:tglRegistrasi) ")
 	@Query("select p from PasienDaftar p where p.pasien.id=:id and p.kdProfile=:kdProfile and  (p.tglRegistrasi)=(:tglRegistrasi)  ")
 	PasienDaftar finByNoIdAndTglRegistrasi(@Param("kdProfile") short kdProfile, @Param("id") Integer id,
 			@Param("tglRegistrasi") Date tglRegistrasi);
@@ -107,8 +102,6 @@ public interface PasienDaftarDao extends PagingAndSortingRepository<PasienDaftar
 			+ "left join a.nosbmlast d " + "where c.noRec=:noRec")
 	StrukPelayananDto getPasienBayar(@Param("noRec") String noRec);
 
-	// -----------------------------------------------------------------------------------------------------------------------
-
 	@Query("select NEW Map (" + "a.id as id, " + "a.kelompokPasien as kelompokPasien, "
 			+ "a.statusIsiSJP as statusSJP) " + "from KelompokPasien a ")
 	List<Map<String, Object>> getKelompokPasien();
@@ -260,35 +253,59 @@ public interface PasienDaftarDao extends PagingAndSortingRepository<PasienDaftar
 			+ "case when pd.tglPulang is null "
 			+ "then substring(:tglAkhir,1,10) else to_char(pd.tglPulang, 'yyyy-MM-dd') end as tglPulangPeriode, "
 			+ "to_char(pd.tanggalMeninggal, 'yyyy-MM-dd') as tglMeninggal) " + "from PasienDaftar pd "
-			+ "inner join pd.ruangan ru " + "where ru.departemenId = 16 " + "and ru.id = :idRuangan " + "and pd.tglPulang is not null "
+			+ "inner join pd.ruangan ru " + "where ru.departemenId = 16 " + "and ru.id = :idRuangan "
+			+ "and pd.tglPulang is not null "
 			+ "and to_char(pd.tglRegistrasi, 'yyyy-MM-dd HH24:MM:SS') between '2020-01-01 00:00:00' and :tglAkhir "
 			+ "and to_char(pd.tglPulang, 'yyyy-MM-dd HH24:MM:SS') between :tglAwal and :tglAkhir "
 			+ "order by to_char(pd.tglRegistrasi, 'yyyy-MM-dd HH24:MM:SS'), "
 			+ "to_char(pd.tglPulang, 'yyyy-MM-dd HH24:MM:SS')")
-	List<Map<String, Object>> getPasienRanapPulangRuangan(@Param("tglAwal") String tglAwal, @Param("tglAkhir") String tglAkhir,
-			@Param("idRuangan") Integer idRuangan);
-	
+	List<Map<String, Object>> getPasienRanapPulangRuangan(@Param("tglAwal") String tglAwal,
+			@Param("tglAkhir") String tglAkhir, @Param("idRuangan") Integer idRuangan);
+
 	String queryKunjunganPasien = "select new Map(to_char(pd.tglRegistrasi,'yyyy-MM-dd') as tglRegistrasi,pd.statusPasien as statusPasien,count(pd.statusPasien) as jumlahKunjungan) "
-			+ "from PasienDaftar pd "
-			+ "inner join pd.ruangan ru "
-			+ "left join pd.batalRegistrasiSet br "
+			+ "from PasienDaftar pd " + "inner join pd.ruangan ru " + "left join pd.batalRegistrasiSet br "
 			+ "where pd.tglRegistrasi between :tglAwal and :tglAkhir ";
-	
+
 	String groupOrderKunjunganPasien = "group by to_char(pd.tglRegistrasi,'yyyy-MM-dd'), pd.statusPasien "
 			+ "order by to_char(pd.tglRegistrasi,'yyyy-MM-dd'), pd.statusPasien";
-	
+
 	String departemenKunjunganPasien = "and ru.departemenId = :idDepartemen ";
-	
+
 	String ruanganKunjunganPasien = "and ru.id = :idRuangan ";
-	
+
 	@Query(queryKunjunganPasien + groupOrderKunjunganPasien)
-	List<Map<String, Object>> getKunjunganHarianPasien(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir);
-	
+	List<Map<String, Object>> getKunjunganHarianPasien(@Param("tglAwal") Date tglAwal,
+			@Param("tglAkhir") Date tglAkhir);
+
 	@Query(queryKunjunganPasien + departemenKunjunganPasien + groupOrderKunjunganPasien)
-	List<Map<String, Object>> getKunjunganHarianPasienDepartemen(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir,
-			@Param("idDepartemen") Integer idDepartemen);
-	
-	@Query(queryKunjunganPasien + departemenKunjunganPasien + ruanganKunjunganPasien +groupOrderKunjunganPasien)
-	List<Map<String, Object>> getKunjunganHarianPasienRuangan(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir,
-			@Param("idDepartemen") Integer idDepartemen, @Param("idRuangan") Integer idRuangan);
+	List<Map<String, Object>> getKunjunganHarianPasienDepartemen(@Param("tglAwal") Date tglAwal,
+			@Param("tglAkhir") Date tglAkhir, @Param("idDepartemen") Integer idDepartemen);
+
+	@Query(queryKunjunganPasien + departemenKunjunganPasien + ruanganKunjunganPasien + groupOrderKunjunganPasien)
+	List<Map<String, Object>> getKunjunganHarianPasienRuangan(@Param("tglAwal") Date tglAwal,
+			@Param("tglAkhir") Date tglAkhir, @Param("idDepartemen") Integer idDepartemen,
+			@Param("idRuangan") Integer idRuangan);
+
+	@Query("select distinct new Map(pd.noRec as norecPd," + "pd.strukPelayananId as norecSp,"
+			+ "ps.namaPasien as namaPasien," + "pd.noRegistrasi as noRegistrasi,"
+			+ "(case when pd.diskonPegawai = 1 then 'Pegawai RSAB' "
+			+ "when pd.diskonPegawai = 2 then 'Keluarga Inti Pegawai RSAB' "
+			+ "when pd.diskonPegawai = 3 then 'Penunggu Pasien Tidak Mampu Disetujui MPP' "
+			+ "when pd.diskonPegawai = 4 then 'Pasien Indikasi Tertentu Disetujui MPP' end) as jenisDiskon,"
+			+ "sum(pp.hargaJual * pp.jumlah) as totalTagihan," + "sum(pp.hargaDiscount * pp.jumlah) as totalDiskon,"
+			+ "sum(pp.jasa) as biayaJasaFarmasi) " + "from PelayananPasien pp " + "inner join pp.pasienDaftar apd "
+			+ "inner join apd.pasienDaftar pd " + "inner join pd.pasien ps " + "where pd.diskonPegawai in (1,2,3,4) "
+			+ "and to_char(pd.tglRegistrasi,'yyyy-MM') = :periode "
+			+ "group by pd.noRec, pd.strukPelayananId, ps.namaPasien, pd.noRegistrasi, pd.diskonPegawai "
+			+ "order by ps.namaPasien")
+	List<Map<String, Object>> findRekapDiskon(@Param("periode") String periode);
+
+	@Query("select new Map(ul.tanggal as tanggal," + "pg.id as pegawaiId," + "pg.namaLengkap as namaLengkap,"
+			+ "ul.jenisLog as jenisLog," + "ul.keterangan as keterangan) " + "from UserLogging ul "
+			+ "inner join ul.loginUser lu " + "inner join lu.pegawai pg "
+			+ "where (ul.noReff = :norecPd and ul.jenisLog = :jenisLogPd) "
+			+ "or (ul.noReff = :norecSp and ul.jenisLog = :jenisLogSp)")
+	List<Map<String, Object>> findLogRekapDiskon(@Param("norecPd") String norecPd,
+			@Param("jenisLogPd") String jenisLogPd, @Param("norecSp") String norecSp,
+			@Param("jenisLogSp") String jenisLogSp);
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
index edeb9cf7..dfc8f0f9 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
@@ -26,14 +26,12 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
 	PelayananPasien finByNoCmAndTglRegistrasi(@Param("noCm") String noCm, @Param("kdProfile") short kdProfile,
 			@Param("tglRegistrasi") Date tglRegistrasi);
 
-	@Query("select p from StrukResep s , PelayananPasien p where p.pasienDaftar.pasienDaftar.noRegistrasi=:noOrder")
+	@Query("select p from StrukResep s, PelayananPasien p where p.pasienDaftar.pasienDaftar.noRegistrasi=:noOrder")
 	List<PelayananPasienDetail> findByNoResep(@Param("noOrder") String noOrder);
 
-	@Query("select  s from StrukResep s  ") // and s.pasien.noCm like :noCm
+	@Query("select s from StrukResep s")
 	List<StrukResep> findByNoResep();
 
-	// @Param("ruanganId")Integer ruanganId, @Param("dateStart")Date dateStart,
-	// @Param("dateEnd")Date dateEnd, @Param("noCm")String noCm)
 	@Query("select p from PelayananPasien p where p.noRec=:noRec ")
 	PelayananPasien findByNoRec(@Param("noRec") String noRec);
 
@@ -159,14 +157,16 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
 			@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir);
 
 	@Query("select new Map(pp.noRec as noRec,"
-			+ "(case when :jenisDiskon in (1,3,4) and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
-			+ "when :jenisDiskon in (1,3,4) and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
+			+ "(case when :jenisDiskon = 1 and ru.id = :ruanganId and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
+			+ "when :jenisDiskon = 1 and ru.id = :ruanganId and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
 			+ "when :jenisDiskon = 1 and lower(pr.namaProduk) like '%konsul%' and ru.departemenId in (:listDepartemenId) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
 			+ "when :jenisDiskon = 1 and lower(pr.namaProduk) like '%konsul%' and ru.departemenId in (:listDepartemenId) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
 			+ "when :jenisDiskon = 2 and lower(pr.namaProduk) like '%konsul%' and ru.departemenId in (:listDepartemenId) and coalesce(pp.hargaDiscount,0) >= (pp.hargaJual/2) then coalesce(pp.hargaDiscount,0) "
 			+ "when :jenisDiskon = 2 and lower(pr.namaProduk) like '%konsul%' and ru.departemenId in (:listDepartemenId) and coalesce(pp.hargaDiscount,0) < (pp.hargaJual/2) then (pp.hargaJual/2) "
 			+ "when :jenisDiskon in (1,2) and pp.strukResepId is not null and coalesce(pp.hargaDiscount,0) >= (pp.hargaJual/10) then coalesce(pp.hargaDiscount,0) "
 			+ "when :jenisDiskon in (1,2) and pp.strukResepId is not null and coalesce(pp.hargaDiscount,0) < (pp.hargaJual/10) then (pp.hargaJual/10) "
+			+ "when :jenisDiskon in (1,3,4) and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) "
+			+ "when :jenisDiskon in (1,3,4) and pr.id in (:listProdukId) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
 			+ "when :jenisDiskon in (1,2) and coalesce(pp.hargaDiscount,0) >= (pp.hargaJual/2) then coalesce(pp.hargaDiscount,0) "
 			+ "when :jenisDiskon in (1,2) and coalesce(pp.hargaDiscount,0) < (pp.hargaJual/2) then (pp.hargaJual/2) "
 			+ "else coalesce(pp.hargaDiscount,0) end) as hargaDiskon) " + "from PelayananPasien pp "
@@ -175,6 +175,6 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
 			+ "order by pp.produkId")
 	List<Map<String, Object>> findLayananTagihan(@Param("noRegistrasi") String noRegistrasi,
 			@Param("jenisDiskon") Integer jenisDiskon, @Param("listDepartemenId") List<Integer> listIdDepartemen,
-			@Param("listProdukId") List<Integer> listIdProduk);
+			@Param("ruanganId") Integer idRuangan, @Param("listProdukId") List<Integer> listIdProduk);
 
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienDaftarService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienDaftarService.java
index 9f738fc3..44330c9f 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienDaftarService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienDaftarService.java
@@ -46,4 +46,8 @@ public interface PasienDaftarService extends BaseVoService<PasienDaftar, PasienD
 	List<Map<String, Object>> findKunjunganHarianPasienRuangan(String tglAwal, String tglAkhir, Integer idDepartemen,
 			Integer idRuangan) throws ParseException;
 
+	List<Map<String, Object>> findRekapDiskon(Long periode);
+
+	List<Map<String, Object>> findLogRekapDiskon(String norecPd, String norecSp);
+
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PelayananPasienService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PelayananPasienService.java
index cfd5b9a4..eef1f851 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PelayananPasienService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PelayananPasienService.java
@@ -1,6 +1,5 @@
 package com.jasamedika.medifirst2000.service;
 
-import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
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 de35300a..17c09da4 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
@@ -5440,6 +5440,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 				}
 			}
 		} else {
+			// FFS : bagian ini sudah tidak dipakai
 			if (CommonUtil.isNotNullOrEmpty(listData)) {
 				if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(Master.KategoryPegawai.DOKTER_LUAR))
 						.contains(idPegawai)) {
@@ -6612,16 +6613,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											rawResult.add(map);
@@ -6633,16 +6644,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -6660,16 +6681,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -6702,16 +6733,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									rawResult.add(map);
@@ -6828,16 +6869,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											rawResult.add(map);
@@ -6849,16 +6900,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -6876,16 +6937,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -6918,16 +6989,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									rawResult.add(map);
@@ -7043,16 +7124,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											rawResult.add(map);
@@ -7064,16 +7155,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -7091,16 +7192,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -7133,16 +7244,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									rawResult.add(map);
@@ -7441,17 +7562,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 														+ (new Double(Double.parseDouble(map.get("count").toString())))
 																.longValue();
 												dataCountRemun = dataCountRemun + 1;
-											} else if (!Master.KelompokPasien.BPJS
+											} else if ((!Master.KelompokPasien.BPJS
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-															&& Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
-																	.parseInt(map.get("kelompokPasienId").toString())))
-															|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+													|| (!Master.KelompokPasien.BPJS.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+															&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
 																	.parseInt(map.get("kelompokPasienId").toString()))
-																	&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-																	&& !Master.Rekanan.JAMINAN_KEMENKES
-																			.equals(Integer.parseInt(map
-																					.get("rekananId").toString()))))) {
+															&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+													|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																	Integer.parseInt(map.get("rekananId").toString())))
+													|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 												if (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 														.contains(Integer.parseInt(map.get("detailId").toString()))
 														&& !Arrays
@@ -7488,20 +7618,27 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										} else if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 												|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 											if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-												if (!Master.KelompokPasien.BPJS.equals(
+												if ((!Master.KelompokPasien.BPJS.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-																&& Master.KelompokPasien.ASURANSI_LAIN
-																		.equals(Integer.parseInt(map
-																				.get("kelompokPasienId").toString())))
-																|| (!Master.KelompokPasien.ASURANSI_LAIN
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+														|| (!Master.KelompokPasien.BPJS.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& !Master.KelompokPasien.ASURANSI_LAIN
 																		.equals(Integer.parseInt(
 																				map.get("kelompokPasienId").toString()))
-																		&& CommonUtil
-																				.isNotNullOrEmpty(map.get("rekananId"))
-																		&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																				Integer.parseInt(map.get("rekananId")
-																						.toString()))))) {
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
+																		.parseInt(map.get("rekananId").toString())))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 													if (!Arrays
 															.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 															.contains(Integer.parseInt(map.get("detailId").toString()))
@@ -7529,20 +7666,27 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 													}
 												}
 											} else {
-												if (!Master.KelompokPasien.BPJS.equals(
+												if (((!Master.KelompokPasien.BPJS.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-																&& Master.KelompokPasien.ASURANSI_LAIN
-																		.equals(Integer.parseInt(map
-																				.get("kelompokPasienId").toString())))
-																|| (!Master.KelompokPasien.ASURANSI_LAIN
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+														|| (!Master.KelompokPasien.BPJS.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& !Master.KelompokPasien.ASURANSI_LAIN
 																		.equals(Integer.parseInt(
 																				map.get("kelompokPasienId").toString()))
-																		&& CommonUtil
-																				.isNotNullOrEmpty(map.get("rekananId"))
-																		&& !Master.Rekanan.JAMINAN_KEMENKES
-																				.equals(Integer.parseInt(map
-																						.get("rekananId").toString()))))
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
+																		.parseInt(map.get("rekananId").toString())))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 														&& (dateTimePelayanan.isBefore(dateMasukFfs)
 																|| dateTimePelayanan.isEqual(datePulangFfs)
 																|| dateTimePelayanan.isAfter(datePulangFfs))) {
@@ -7575,16 +7719,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 													}
 												}
 											}
-										} else if (!Master.KelompokPasien.BPJS
+										} else if ((!Master.KelompokPasien.BPJS
 												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-												&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-														&& Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
-																.parseInt(map.get("kelompokPasienId").toString())))
-														|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+												|| (!Master.KelompokPasien.BPJS.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
 																.parseInt(map.get("kelompokPasienId").toString()))
-																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																		.parseInt(map.get("rekananId").toString()))))) {
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 											if (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 													.contains(Integer.parseInt(map.get("detailId").toString()))
 													&& !Arrays
@@ -7626,16 +7780,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												.longValue();
 										dataCountRemun = dataCountRemun + 1;
 									} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-										if (!Master.KelompokPasien.BPJS
+										if ((!Master.KelompokPasien.BPJS
 												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-												&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-														&& Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
-																.parseInt(map.get("kelompokPasienId").toString())))
-														|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+												|| (!Master.KelompokPasien.BPJS.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
 																.parseInt(map.get("kelompokPasienId").toString()))
-																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																		.parseInt(map.get("rekananId").toString()))))) {
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 											if (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 													.contains(Integer.parseInt(map.get("detailId").toString()))
 													&& !Arrays
@@ -7855,17 +8019,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 														+ (new Double(Double.parseDouble(map.get("count").toString())))
 																.longValue();
 												dataCountRemun = dataCountRemun + 1;
-											} else if (!Master.KelompokPasien.BPJS
+											} else if ((!Master.KelompokPasien.BPJS
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-															&& Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
-																	.parseInt(map.get("kelompokPasienId").toString())))
-															|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+													|| (!Master.KelompokPasien.BPJS.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+															&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
 																	.parseInt(map.get("kelompokPasienId").toString()))
-																	&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-																	&& !Master.Rekanan.JAMINAN_KEMENKES
-																			.equals(Integer.parseInt(map
-																					.get("rekananId").toString()))))) {
+															&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+													|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																	Integer.parseInt(map.get("rekananId").toString())))
+													|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 												if (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 														.contains(Integer.parseInt(map.get("detailId").toString()))
 														&& !Arrays
@@ -7903,20 +8076,27 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										} else if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 												|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 											if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-												if (!Master.KelompokPasien.BPJS.equals(
+												if ((!Master.KelompokPasien.BPJS.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-																&& Master.KelompokPasien.ASURANSI_LAIN
-																		.equals(Integer.parseInt(map
-																				.get("kelompokPasienId").toString())))
-																|| (!Master.KelompokPasien.ASURANSI_LAIN
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+														|| (!Master.KelompokPasien.BPJS.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& !Master.KelompokPasien.ASURANSI_LAIN
 																		.equals(Integer.parseInt(
 																				map.get("kelompokPasienId").toString()))
-																		&& CommonUtil
-																				.isNotNullOrEmpty(map.get("rekananId"))
-																		&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																				Integer.parseInt(map.get("rekananId")
-																						.toString()))))) {
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
+																		.parseInt(map.get("rekananId").toString())))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 													if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN).contains(
 															Integer.parseInt(map.get("departemenId").toString()))) {
 														ffs = ffs + (new Double(
@@ -7935,20 +8115,27 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 													}
 												}
 											} else {
-												if (!Master.KelompokPasien.BPJS.equals(
+												if (((!Master.KelompokPasien.BPJS.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-																&& Master.KelompokPasien.ASURANSI_LAIN
-																		.equals(Integer.parseInt(map
-																				.get("kelompokPasienId").toString())))
-																|| (!Master.KelompokPasien.ASURANSI_LAIN
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+														|| (!Master.KelompokPasien.BPJS.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& !Master.KelompokPasien.ASURANSI_LAIN
 																		.equals(Integer.parseInt(
 																				map.get("kelompokPasienId").toString()))
-																		&& CommonUtil
-																				.isNotNullOrEmpty(map.get("rekananId"))
-																		&& !Master.Rekanan.JAMINAN_KEMENKES
-																				.equals(Integer.parseInt(map
-																						.get("rekananId").toString()))))
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
+																		.parseInt(map.get("rekananId").toString())))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 														&& (dateTimePelayanan.isBefore(dateMasukFfs)
 																|| dateTimePelayanan.isEqual(datePulangFfs)
 																|| dateTimePelayanan.isAfter(datePulangFfs))) {
@@ -7973,16 +8160,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 													}
 												}
 											}
-										} else if (!Master.KelompokPasien.BPJS
+										} else if ((!Master.KelompokPasien.BPJS
 												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-												&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-														&& Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
-																.parseInt(map.get("kelompokPasienId").toString())))
-														|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+												|| (!Master.KelompokPasien.BPJS.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
 																.parseInt(map.get("kelompokPasienId").toString()))
-																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																		.parseInt(map.get("rekananId").toString()))))) {
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 											if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 													.contains(Integer.parseInt(map.get("departemenId").toString()))
 													&& (dateTimePelayanan.isBefore(dateMasukFfs)
@@ -8016,16 +8213,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												.longValue();
 										dataCountRemun = dataCountRemun + 1;
 									} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-										if (!Master.KelompokPasien.BPJS
+										if ((!Master.KelompokPasien.BPJS
 												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-												&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-														&& Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
-																.parseInt(map.get("kelompokPasienId").toString())))
-														|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+												|| (!Master.KelompokPasien.BPJS.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
 																.parseInt(map.get("kelompokPasienId").toString()))
-																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																		.parseInt(map.get("rekananId").toString()))))) {
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 											if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 													.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 												ffs = ffs
@@ -8243,17 +8450,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 														+ (new Double(Double.parseDouble(map.get("count").toString())))
 																.longValue();
 												dataCountRemun = dataCountRemun + 1;
-											} else if (!Master.KelompokPasien.BPJS
+											} else if ((!Master.KelompokPasien.BPJS
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-															&& Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
-																	.parseInt(map.get("kelompokPasienId").toString())))
-															|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+													|| (!Master.KelompokPasien.BPJS.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+															&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
 																	.parseInt(map.get("kelompokPasienId").toString()))
-																	&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-																	&& !Master.Rekanan.JAMINAN_KEMENKES
-																			.equals(Integer.parseInt(map
-																					.get("rekananId").toString()))))) {
+															&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+													|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																	Integer.parseInt(map.get("rekananId").toString())))
+													|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+															Integer.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 												if (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 														.contains(Integer.parseInt(map.get("detailId").toString()))
 														&& !Arrays
@@ -8290,20 +8506,27 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										} else if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 												|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 											if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-												if (!Master.KelompokPasien.BPJS.equals(
+												if ((!Master.KelompokPasien.BPJS.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-																&& Master.KelompokPasien.ASURANSI_LAIN
-																		.equals(Integer.parseInt(map
-																				.get("kelompokPasienId").toString())))
-																|| (!Master.KelompokPasien.ASURANSI_LAIN
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+														|| (!Master.KelompokPasien.BPJS.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& !Master.KelompokPasien.ASURANSI_LAIN
 																		.equals(Integer.parseInt(
 																				map.get("kelompokPasienId").toString()))
-																		&& CommonUtil
-																				.isNotNullOrEmpty(map.get("rekananId"))
-																		&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																				Integer.parseInt(map.get("rekananId")
-																						.toString()))))) {
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
+																		.parseInt(map.get("rekananId").toString())))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 													if (!Arrays
 															.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 															.contains(Integer.parseInt(map.get("detailId").toString()))
@@ -8331,20 +8554,27 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 													}
 												}
 											} else {
-												if (!Master.KelompokPasien.BPJS.equals(
+												if (((!Master.KelompokPasien.BPJS.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-																&& Master.KelompokPasien.ASURANSI_LAIN
-																		.equals(Integer.parseInt(map
-																				.get("kelompokPasienId").toString())))
-																|| (!Master.KelompokPasien.ASURANSI_LAIN
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+														|| (!Master.KelompokPasien.BPJS.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& !Master.KelompokPasien.ASURANSI_LAIN
 																		.equals(Integer.parseInt(
 																				map.get("kelompokPasienId").toString()))
-																		&& CommonUtil
-																				.isNotNullOrEmpty(map.get("rekananId"))
-																		&& !Master.Rekanan.JAMINAN_KEMENKES
-																				.equals(Integer.parseInt(map
-																						.get("rekananId").toString()))))
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
+																		.parseInt(map.get("rekananId").toString())))
+														|| (Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+																.parseInt(map.get("kelompokPasienId").toString()))
+																&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 														&& (dateTimePelayanan.isBefore(dateMasukFfs)
 																|| dateTimePelayanan.isEqual(datePulangFfs)
 																|| dateTimePelayanan.isAfter(datePulangFfs))) {
@@ -8377,16 +8607,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 													}
 												}
 											}
-										} else if (!Master.KelompokPasien.BPJS
+										} else if ((!Master.KelompokPasien.BPJS
 												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-												&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-														&& Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
-																.parseInt(map.get("kelompokPasienId").toString())))
-														|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+												|| (!Master.KelompokPasien.BPJS.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
 																.parseInt(map.get("kelompokPasienId").toString()))
-																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																		.parseInt(map.get("rekananId").toString()))))) {
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 											if (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 													.contains(Integer.parseInt(map.get("detailId").toString()))
 													&& !Arrays
@@ -8428,16 +8668,26 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												.longValue();
 										dataCountRemun = dataCountRemun + 1;
 									} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-										if (!Master.KelompokPasien.BPJS
+										if ((!Master.KelompokPasien.BPJS
 												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-												&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-														&& Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
-																.parseInt(map.get("kelompokPasienId").toString())))
-														|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+												|| (!Master.KelompokPasien.BPJS.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& !Master.KelompokPasien.ASURANSI_LAIN.equals(Integer
 																.parseInt(map.get("kelompokPasienId").toString()))
-																&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-																&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																		.parseInt(map.get("rekananId").toString()))))) {
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString())))
+												|| (Master.KelompokPasien.ASURANSI_LAIN.equals(
+														Integer.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 											if (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 													.contains(Integer.parseInt(map.get("detailId").toString()))
 													&& !Arrays
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java
index eb9401a8..0ba4c8a5 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java
@@ -720,6 +720,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 				monitoringAbsen.setPegawai(pegawai);
 				monitoringAbsen.setShiftKerja(shiftKerja);
 
+				monitoringAbsen.setKdProfile((short) 0);
+				monitoringAbsen.setStatusEnabled(Master.STATUS_ENABLE_TRUE);
 				if (CommonUtil.isNotNullOrEmpty(monitoringAbsen)) {
 					MonitoringAbsen model = monitoringAbsenDao.save(monitoringAbsen);
 					result.put(model.getNoRec() + "", model.noRec);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienDaftarServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienDaftarServiceImpl.java
index c316362f..da30d3aa 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienDaftarServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienDaftarServiceImpl.java
@@ -32,7 +32,6 @@ import com.jasamedika.medifirst2000.dao.RuanganDao;
 import com.jasamedika.medifirst2000.dao.SettingDataFixedDao;
 import com.jasamedika.medifirst2000.dao.SkalaNyeriDao;
 import com.jasamedika.medifirst2000.dao.SuratPermintaanMasukDao;
-import com.jasamedika.medifirst2000.dao.TempatTidurDao;
 import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
 import com.jasamedika.medifirst2000.entities.AsalRujukan;
 import com.jasamedika.medifirst2000.entities.Diputuskan;
@@ -100,9 +99,6 @@ public class PasienDaftarServiceImpl implements PasienDaftarService {
 	@Autowired
 	private KamarDao kamarDao;
 
-	@Autowired
-	private TempatTidurDao tempatTidurDao;
-
 	@Autowired
 	private SettingDataFixedDao settingDataFixedDao;
 
@@ -581,7 +577,8 @@ public class PasienDaftarServiceImpl implements PasienDaftarService {
 		Long lengthPeriod = ChronoUnit.DAYS.between(LocalDate.parse(tglAwal.substring(0, 10)),
 				LocalDate.parse(tglAkhir.substring(0, 10))) + 1;
 
-		// Integer jumlahTempatTidur = tempatTidurDao.countTempatTidurAktif(Arrays.asList(Master.Ruangan.TANJUNG));
+		// Integer jumlahTempatTidur =
+		// tempatTidurDao.countTempatTidurAktif(Arrays.asList(Master.Ruangan.TANJUNG));
 		Integer jumlahTempatTidur = Integer.valueOf(settingDataFixedDao.getSettingDataFixed("totalkamarranapaktif"));
 
 		List<Map<String, Object>> borData = pasienDaftarDao.getPasienRanap(tglAwal, tglAkhir);
@@ -777,4 +774,21 @@ public class PasienDaftarServiceImpl implements PasienDaftarService {
 		return result;
 	}
 
+	@Override
+	public List<Map<String, Object>> findRekapDiskon(Long periode) {
+		DateFormat mf = new SimpleDateFormat("yyyy-MM");
+
+		List<Map<String, Object>> result = pasienDaftarDao.findRekapDiskon(mf.format(new Date(periode)));
+
+		return result;
+	}
+
+	@Override
+	public List<Map<String, Object>> findLogRekapDiskon(String norecPd, String norecSp) {
+		List<Map<String, Object>> result = pasienDaftarDao.findLogRekapDiskon(norecPd, "Verifikasi Order Laboratorium",
+				norecSp, "Verifikasi TataRekening");
+
+		return result;
+	}
+
 }
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 a0107eaa..02c665ad 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
@@ -261,7 +261,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		List<Integer> listIdProdukDiskonPegawai = splitDataSettingDatafixed("listProdukDiskonPegawai");
 
 		List<Map<String, Object>> data = pelayananPasienDao.findLayananTagihan(noRegistrasi, jenisDiskon,
-				Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN), listIdProdukDiskonPegawai);
+				Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN), Master.Ruangan.KLINIK_KARYAWAN,
+				listIdProdukDiskonPegawai);
 
 		List<PelayananPasien> models = new ArrayList<>();
 		for (Map<String, Object> map : data) {
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java
index e2ffe383..8be1eee7 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java
@@ -338,12 +338,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 				if (drAnastesiList.contains(idPegawai)) {
 					if (Arrays.asList(Master.Produk.PENUNJANG_BUKAN_ANASTESI).contains(map.get("idProduk"))) {
 						if (map.get("idJasa").equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -377,12 +383,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else if (map.get("idJenisPelaksana").equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
 						if (map.get("idJasa").equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -416,12 +428,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else {
 						if (map.get("idJasa").equals(Master.KomponenHarga.JASA_DOKTER_ANASTESI)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -457,12 +475,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 				} else {
 					if (map.get("idJenisPelaksana").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 						if (map.get("idJasa").equals(Master.KomponenHarga.JASA_ASISTEN_SPESIALIS)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -496,12 +520,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else {
 						if (map.get("idJasa").equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -659,16 +689,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								datePulang = datePulang.plusDays(1);
 							}
 
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 										|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 									if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
@@ -733,16 +773,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									rawResult.add(map);
@@ -856,16 +906,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								datePulang = datePulang.plusDays(1);
 							}
 
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 										|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 									if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
@@ -930,16 +990,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									rawResult.add(map);
@@ -1052,16 +1122,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								datePulang = datePulang.plusDays(1);
 							}
 
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 										|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 									if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
@@ -1126,16 +1206,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									rawResult.add(map);
@@ -1422,12 +1512,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 				if (drAnastesiList.contains(idPegawai)) {
 					if (Arrays.asList(Master.Produk.PENUNJANG_BUKAN_ANASTESI).contains(map.get("idProduk"))) {
 						if (idKomponenHarga.equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -1461,12 +1557,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else if (map.get("idJenisPelaksana").equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
 						if (idKomponenHarga.equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -1500,12 +1602,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else {
 						if (idKomponenHarga.equals(Master.KomponenHarga.JASA_DOKTER_ANASTESI)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -1541,12 +1649,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 				} else {
 					if (map.get("idJenisPelaksana").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 						if (idKomponenHarga.equals(Master.KomponenHarga.JASA_ASISTEN_SPESIALIS)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -1580,12 +1694,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else {
 						if (idKomponenHarga.equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -1802,16 +1922,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
@@ -1859,16 +1989,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -1922,16 +2062,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -2014,16 +2164,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									if (diskon > 0
@@ -2174,16 +2334,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
@@ -2231,16 +2401,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -2294,16 +2474,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -2386,16 +2576,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									if (diskon > 0
@@ -2545,16 +2745,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
@@ -2602,16 +2812,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -2665,16 +2885,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -2757,16 +2987,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									if (diskon > 0
@@ -2924,12 +3164,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 				if (drAnastesiList.contains(idPegawai)) {
 					if (Arrays.asList(Master.Produk.PENUNJANG_BUKAN_ANASTESI).contains(map.get("idProduk"))) {
 						if (map.get("idJasa").equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -2963,12 +3209,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else if (map.get("idJenisPelaksana").equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
 						if (map.get("idJasa").equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -3002,12 +3254,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else {
 						if (map.get("idJasa").equals(Master.KomponenHarga.JASA_DOKTER_ANASTESI)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -3043,12 +3301,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 				} else {
 					if (map.get("idJenisPelaksana").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 						if (map.get("idJasa").equals(Master.KomponenHarga.JASA_ASISTEN_SPESIALIS)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -3082,12 +3346,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else {
 						if (map.get("idJasa").equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -3248,16 +3518,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											rawResult.add(map);
@@ -3269,16 +3549,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -3296,16 +3586,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -3338,16 +3638,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									rawResult.add(map);
@@ -3464,16 +3774,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											rawResult.add(map);
@@ -3485,16 +3805,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -3512,16 +3842,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -3556,16 +3896,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									rawResult.add(map);
@@ -3681,16 +4031,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											rawResult.add(map);
@@ -3702,16 +4062,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -3729,16 +4099,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -3771,16 +4151,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									rawResult.add(map);
@@ -4008,12 +4398,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 				if (drAnastesiList.contains(idPegawai)) {
 					if (Arrays.asList(Master.Produk.PENUNJANG_BUKAN_ANASTESI).contains(map.get("idProduk"))) {
 						if (map.get("idKomponenHarga").equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -4051,12 +4447,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else if (map.get("idJenisPelaksana").equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
 						if (map.get("idKomponenHarga").equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -4094,12 +4496,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else {
 						if (map.get("idKomponenHarga").equals(Master.KomponenHarga.JASA_DOKTER_ANASTESI)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -4139,12 +4547,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 				} else {
 					if (map.get("idJenisPelaksana").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 						if (map.get("idKomponenHarga").equals(Master.KomponenHarga.JASA_ASISTEN_SPESIALIS)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -4182,12 +4596,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 						}
 					} else {
 						if (map.get("idKomponenHarga").equals(Master.KomponenHarga.JASA_DOKTER)) {
-							if (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN))
-											|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES)))
+							if (((!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+									&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (!map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)
+											&& !map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !map.get("rekananId").equals(Master.Rekanan.JAMINAN_KEMENKES))
+									|| (map.get("kelompokPasienId").equals(Master.KelompokPasien.ASURANSI_LAIN)
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -4349,16 +4769,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											result.add(map);
@@ -4370,16 +4800,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -4397,16 +4837,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -4439,16 +4889,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									result.add(map);
@@ -4565,16 +5025,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											result.add(map);
@@ -4586,16 +5056,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -4613,16 +5093,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -4655,16 +5145,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									result.add(map);
@@ -4780,16 +5280,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
-									if (!Master.KelompokPasien.BPJS
+									if ((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
-																	.parseInt(map.get("rekananId").toString()))))) {
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											result.add(map);
@@ -4801,16 +5311,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										}
 									}
 								} else {
-									if (!Master.KelompokPasien.BPJS
+									if (((!Master.KelompokPasien.BPJS
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-											&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-													&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-															Integer.parseInt(map.get("kelompokPasienId").toString())))
-													|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+											&& !Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (!Master.KelompokPasien.BPJS
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 															Integer.parseInt(map.get("kelompokPasienId").toString()))
-															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																	Integer.parseInt(map.get("rekananId").toString()))))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES
+															.equals(Integer.parseInt(map.get("rekananId").toString())))
+											|| (Master.KelompokPasien.ASURANSI_LAIN
+													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNullOrEmpty(map.get("rekananId"))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -4828,16 +5348,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									}
 								}
 							} else {
-								if (!Master.KelompokPasien.BPJS
+								if ((!Master.KelompokPasien.BPJS
 										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-										&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-												&& Master.KelompokPasien.ASURANSI_LAIN.equals(
-														Integer.parseInt(map.get("kelompokPasienId").toString())))
-												|| (!Master.KelompokPasien.ASURANSI_LAIN.equals(
+										&& !Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+										&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+										&& !Master.Rekanan.JAMINAN_KEMENKES
+												.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (!Master.KelompokPasien.BPJS
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& !Master.KelompokPasien.ASURANSI_LAIN.equals(
 														Integer.parseInt(map.get("kelompokPasienId").toString()))
-														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-																Integer.parseInt(map.get("rekananId").toString()))))) {
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+												&& !Master.Rekanan.JAMINAN_KEMENKES
+														.equals(Integer.parseInt(map.get("rekananId").toString())))
+										|| (Master.KelompokPasien.ASURANSI_LAIN
+												.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+												&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -4870,16 +5400,26 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
-							if (!Master.KelompokPasien.BPJS
+							if ((!Master.KelompokPasien.BPJS
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-									&& ((CommonUtil.isNullOrEmpty(map.get("rekananId"))
-											&& Master.KelompokPasien.ASURANSI_LAIN
-													.equals(Integer.parseInt(map.get("kelompokPasienId").toString())))
-											|| (!Master.KelompokPasien.ASURANSI_LAIN
+									&& !Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+									&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+									&& !Master.Rekanan.JAMINAN_KEMENKES
+											.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (!Master.KelompokPasien.BPJS
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& !Master.KelompokPasien.ASURANSI_LAIN
 													.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
-													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
-													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
-															Integer.parseInt(map.get("rekananId").toString()))))) {
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+											&& !Master.Rekanan.JAMINAN_KEMENKES
+													.equals(Integer.parseInt(map.get("rekananId").toString())))
+									|| (Master.KelompokPasien.ASURANSI_LAIN
+											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))
+											&& CommonUtil.isNullOrEmpty(map.get("rekananId")))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									result.add(map);
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java
index 6e60ab3e..e5033b22 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java
@@ -234,7 +234,7 @@ public class PasienDaftar extends BaseTransaction {
 	private StrukPelayanan strukPelayanan;
 
 	@Column(name = "NoStrukLastFk", insertable = false, updatable = false)
-	private Integer strukPelayananId;
+	private String strukPelayananId;
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "NoSbmLastFk")
@@ -656,11 +656,11 @@ public class PasienDaftar extends BaseTransaction {
 		this.strukPelayanan = strukPelayanan;
 	}
 
-	public Integer getStrukPelayananId() {
+	public String getStrukPelayananId() {
 		return strukPelayananId;
 	}
 
-	public void setStrukPelayananId(Integer strukPelayananId) {
+	public void setStrukPelayananId(String strukPelayananId) {
 		this.strukPelayananId = strukPelayananId;
 	}
 
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UserLogging.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UserLogging.java
new file mode 100644
index 00000000..bb7ab9d6
--- /dev/null
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UserLogging.java
@@ -0,0 +1,125 @@
+package com.jasamedika.medifirst2000.entities;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.annotations.GenericGenerator;
+
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+
+@Entity
+@Table(name = "logginguser_t")
+public class UserLogging extends BaseMaster {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.logginguser_t_id_seq")
+	@javax.persistence.SequenceGenerator(name = "public.logginguser_t_id_seq", sequenceName = "public.logginguser_t_id_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Integer id;
+
+	@Column(name = "tanggal", nullable = true)
+	@Temporal(TemporalType.TIMESTAMP)
+	@Caption(value = "Tanggal")
+	private Date tanggal;
+
+	@ManyToOne
+	@JoinColumn(name = "objectloginuserfk")
+	@Caption(value = "User Login")
+	private LoginUser loginUser;
+
+	@Column(name = "objectloginuserfk", insertable = false, updatable = false, nullable = true)
+	private Integer loginUserId;
+
+	@Column(name = "jenislog", nullable = true, length = 500)
+	@Caption(value = "Jenis Log")
+	private String jenisLog;
+
+	@Column(name = "noreff", nullable = true, columnDefinition = "CHAR(32)")
+	@Caption(value = "No Referensi")
+	private String noReff;
+
+	@Column(name = "referensi", nullable = true, length = 100)
+	@Caption(value = "Referensi")
+	private String referensi;
+
+	@Column(name = "keterangan", nullable = true, length = 200)
+	@Caption(value = "Keterangan")
+	private String keterangan;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Date getTanggal() {
+		return tanggal;
+	}
+
+	public void setTanggal(Date tanggal) {
+		this.tanggal = tanggal;
+	}
+
+	public LoginUser getLoginUser() {
+		return loginUser;
+	}
+
+	public void setLoginUser(LoginUser loginUser) {
+		this.loginUser = loginUser;
+	}
+
+	public Integer getLoginUserId() {
+		return loginUserId;
+	}
+
+	public void setLoginUserId(Integer loginUserId) {
+		this.loginUserId = loginUserId;
+	}
+
+	public String getJenisLog() {
+		return jenisLog;
+	}
+
+	public void setJenisLog(String jenisLog) {
+		this.jenisLog = jenisLog;
+	}
+
+	public String getNoReff() {
+		return noReff;
+	}
+
+	public void setNoReff(String noReff) {
+		this.noReff = noReff;
+	}
+
+	public String getReferensi() {
+		return referensi;
+	}
+
+	public void setReferensi(String referensi) {
+		this.referensi = referensi;
+	}
+
+	public String getKeterangan() {
+		return keterangan;
+	}
+
+	public void setKeterangan(String keterangan) {
+		this.keterangan = keterangan;
+	}
+
+}
diff --git a/jasamedika-domain/src/main/resources/hibernate.cfg.xml b/jasamedika-domain/src/main/resources/hibernate.cfg.xml
index b4e00a7f..2ab59542 100644
--- a/jasamedika-domain/src/main/resources/hibernate.cfg.xml
+++ b/jasamedika-domain/src/main/resources/hibernate.cfg.xml
@@ -690,5 +690,6 @@
   <mapping class="com.jasamedika.medifirst2000.entities.LogbookKinerjaDokter"/>
   <mapping class="com.jasamedika.medifirst2000.entities.TabelAcuanIndeksIKI"/>
   <mapping class="com.jasamedika.medifirst2000.entities.RemunerasiOperasional"/>
+  <mapping class="com.jasamedika.medifirst2000.entities.UserLogging"/>
  </session-factory>
 </hibernate-configuration>
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 17eec05a..0c8f839b 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
@@ -6499,6 +6499,7 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
 		Map<String, Object> pegawai = pegawaiDao.findPegawaiById(idPegawai);
 
 		if (ffs) {
+			// FFS : sudah tidak dipakai
 			resultFFS = indekKinerjaService.getAllTindakanByDokterForfeeForServiceReview(periode, idPegawai);
 			allDetailTindakan = indekKinerjaService.findPatientDetailForEveryTindakanReview(idPegawai, periode, ffs);
 		} else {
@@ -7693,5 +7694,46 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
 			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
+	
+	@RequestMapping(value = "/rekapitulasi-diskon", method = RequestMethod.GET)
+	public ResponseEntity<List<Map<String, Object>>> getRekapDiskon(HttpServletRequest request,
+			@RequestParam(value = "periode", required = true) Long periode) {
+		try {
+			List<Map<String, Object>> result = pasienDaftarService.findRekapDiskon(periode);
+
+			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
+					getMessage(MessageResource.LABEL_SUCCESS, request));
+			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
+		} catch (ServiceVOException e) {
+			LOGGER.error("Got exception {} when get rekap diskon", e.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		} catch (JpaSystemException jse) {
+			LOGGER.error("Got exception {} when get rekap diskon", jse.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+		}
+	}
+
+	@RequestMapping(value = "/log-rekapitulasi-diskon", method = RequestMethod.GET)
+	public ResponseEntity<List<Map<String, Object>>> getLogRekapDiskon(HttpServletRequest request,
+			@RequestParam(value = "norecPd", required = false) String norecPd,
+			@RequestParam(value = "norecSp", required = false) String norecSp) {
+		try {
+			List<Map<String, Object>> result = pasienDaftarService.findLogRekapDiskon(norecPd, norecSp);
+
+			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
+					getMessage(MessageResource.LABEL_SUCCESS, request));
+			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
+		} catch (ServiceVOException e) {
+			LOGGER.error("Got exception {} when get log rekap diskon", e.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		} catch (JpaSystemException jse) {
+			LOGGER.error("Got exception {} when get log rekap diskon", jse.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+		}
+	}
 
 }
diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java
index 02444a89..f2bf7125 100644
--- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java
+++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java
@@ -400,7 +400,6 @@ public class PelayananController extends LocaleController<PelayananPasienVO> {
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
 			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
-
 	}
 
 }