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 9a469b20..20271352 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
@@ -120,7 +120,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "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 <> :jaminanKemenkesId))) "
+			+ "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")
@@ -156,7 +156,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "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 <> :jaminanKemenkesId))) "
+			+ "and (pd.kelompokPasienId not in (:listBpjsId) and ((pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null) or (pd.kelompokPasienId <> :asuransiLainId and pd.rekananId <> :jaminanKemenkesId)))) "
 			+ "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")
@@ -186,7 +186,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "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 <> :jaminanKemenkesId))) "
+			+ "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) ";
@@ -241,7 +241,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "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 <> :jaminanKemenkesId))) "
+			+ "and (pd.kelompokPasienId not in (:listBpjsId) and ((pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null) 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)) "
@@ -279,7 +279,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "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 <> :jaminanKemenkesId))) "
+			+ "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) "
@@ -322,7 +322,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "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 <> :jaminanKemenkesId))) "
+			+ "and (pd.kelompokPasienId not in (:listBpjsId) and ((pd.kelompokPasienId = :asuransiLainId and pd.rekananId is null) 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)) "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PendapatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PendapatanDao.java
index 29aa61f9..9c4b11b5 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PendapatanDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PendapatanDao.java
@@ -170,8 +170,9 @@ public interface PendapatanDao extends PagingAndSortingRepository<PelayananPasie
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, " + "kelas.id as idKelas,"
 			+ "kelas.namaKelas as namaKelas," + "pasienDaftar.noRegistrasi as noRegistrasi,"
 			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pasienDaftar.tglPulang as tglPulang,"
-			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.diskonPegawai as statusDiskon, "
-			+ "produk.id as idProduk," + "produk.namaProduk as namaProduk," + "dokter.id as idPegawai,"
+			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.rekananId as rekananId, "
+			+ "pasienDaftar.diskonPegawai as statusDiskon, " + "produk.id as idProduk,"
+			+ "produk.namaProduk as namaProduk," + "dokter.id as idPegawai,"
 			+ "kategoryPegawai.id as kategoryPegawaiId, " + "jenisPetugas.id as idJenisPelaksana, "
 			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, "
 			+ "ruangan.id as ruanganId, " + "ruangan.namaRuangan as ruangan,"
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
index ae1d74d3..9b47a3c4 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
@@ -177,7 +177,7 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "detail.id as detailId, " + "produk.namaProduk as namaProduk," + "pasien.namaPasien as namapasien,"
 			+ "pasien.noCm as noCm," + "pasien.tglLahir as tglLahir," + "pasienDaftar.noRegistrasi as noRegistrasi,"
 			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pelayananPasien.hargaSatuan as harga,"
-			+ "pelayananPasien.hargaDiscount as diskon, "
+			+ "pelayananPasien.hargaDiscount as diskon," + "pelayananPasien.jumlah as jumlah, "
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
 			+ "where harga.produkId = produk.id and harga.statusEnabled is true and harga.kelasId = :idKelasSatu) as hargaKelas1,"
 			+ "pelayananPasien.tglPelayanan as tglpelayanan," + "kelas.namaKelas as namaKelas,"
@@ -218,6 +218,7 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "detail.id as detailId, " + "produk.namaProduk as namaProduk," + "pasien.namaPasien as namapasien,"
 			+ "pasien.noCm as noCm," + "pasien.tglLahir as tglLahir," + "pasienDaftar.noRegistrasi as noRegistrasi,"
 			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pelayananPasien.hargaSatuan as harga,"
+			+ "pelayananPasien.hargaDiscount as diskon," + "pelayananPasien.jumlah as jumlah, "
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
 			+ "where harga.produkId = produk.id and harga.statusEnabled is true and harga.kelasId = :idKelasSatu) as hargaKelas1,"
 			+ "pelayananPasien.tglPelayanan as tglpelayanan," + "kelas.namaKelas as namaKelas,"
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 f97cae2c..e2ffe383 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
@@ -1423,6 +1423,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 					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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -1432,7 +1437,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("jumlah").toString());
 								map.put("jasaMedis", jasaMedis);
-							} else if (map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)) {
+							} else 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))) {
 								jasaMedis = (Double.parseDouble(map.get("hargaJual").toString())
 										- Double.parseDouble(map.get("hargaDiscount").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -1454,6 +1462,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -1463,7 +1476,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("jumlah").toString());
 								map.put("jasaMedis", jasaMedis);
-							} else if (map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)) {
+							} else 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))) {
 								jasaMedis = (Double.parseDouble(map.get("hargaJual").toString())
 										- Double.parseDouble(map.get("hargaDiscount").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -1485,6 +1501,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -1494,7 +1515,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("jumlah").toString());
 								map.put("jasaMedis", jasaMedis);
-							} else if (map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)) {
+							} else 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))) {
 								jasaMedis = (Double.parseDouble(map.get("hargaJual").toString())
 										- Double.parseDouble(map.get("hargaDiscount").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -1518,6 +1542,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 					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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -1527,7 +1556,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("jumlah").toString());
 								map.put("jasaMedis", jasaMedis);
-							} else if (map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)) {
+							} else 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))) {
 								jasaMedis = (Double.parseDouble(map.get("hargaJual").toString())
 										- Double.parseDouble(map.get("hargaDiscount").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -1549,6 +1581,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -1558,7 +1595,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("jumlah").toString());
 								map.put("jasaMedis", jasaMedis);
-							} else if (map.get("kelompokPasienId").equals(Master.KelompokPasien.BPJS)) {
+							} else 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))) {
 								jasaMedis = (Double.parseDouble(map.get("hargaJual").toString())
 										- Double.parseDouble(map.get("hargaDiscount").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -1763,7 +1803,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
 									if (!Master.KelompokPasien.BPJS
-											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+											.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.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
+																	.parseInt(map.get("rekananId").toString()))))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
@@ -1813,6 +1861,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								} 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.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																	Integer.parseInt(map.get("rekananId").toString()))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -1867,7 +1923,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							} else {
 								if (!Master.KelompokPasien.BPJS
-										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+										.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.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString()))))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -1951,7 +2015,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
 							if (!Master.KelompokPasien.BPJS
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+									.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.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+															Integer.parseInt(map.get("rekananId").toString()))))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									if (diskon > 0
@@ -2103,7 +2175,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
 									if (!Master.KelompokPasien.BPJS
-											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+											.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.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
+																	.parseInt(map.get("rekananId").toString()))))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
@@ -2153,6 +2233,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								} 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.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																	Integer.parseInt(map.get("rekananId").toString()))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -2207,7 +2295,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							} else {
 								if (!Master.KelompokPasien.BPJS
-										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+										.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.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString()))))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -2291,7 +2387,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
 							if (!Master.KelompokPasien.BPJS
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+									.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.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+															Integer.parseInt(map.get("rekananId").toString()))))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									if (diskon > 0
@@ -2442,7 +2546,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 								if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
 									if (!Master.KelompokPasien.BPJS
-											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+											.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.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(Integer
+																	.parseInt(map.get("rekananId").toString()))))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
@@ -2492,6 +2604,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								} 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.parseInt(map.get("kelompokPasienId").toString()))
+															&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+															&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																	Integer.parseInt(map.get("rekananId").toString()))))
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
@@ -2546,7 +2666,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								}
 							} else {
 								if (!Master.KelompokPasien.BPJS
-										.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+										.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.parseInt(map.get("kelompokPasienId").toString()))
+														&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+														&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+																Integer.parseInt(map.get("rekananId").toString()))))) {
 									if (map.get("departemenId").equals(Master.Departemen.RAWAT_JALAN)
 											&& map.get("namaShift").toString().equals("Non Shift")
 											&& CommonUtil.isNotNullOrEmpty(jamPulangPSBB)
@@ -2630,7 +2758,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							}
 						} else if (CommonUtil.isNullOrEmpty(map.get("jamMasuk"))) {
 							if (!Master.KelompokPasien.BPJS
-									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+									.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.parseInt(map.get("kelompokPasienId").toString()))
+													&& CommonUtil.isNotNullOrEmpty(map.get("rekananId"))
+													&& !Master.Rekanan.JAMINAN_KEMENKES.equals(
+															Integer.parseInt(map.get("rekananId").toString()))))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
 									if (diskon > 0