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 338943d5..48ae7a9d 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
@@ -96,7 +96,7 @@ public class Master {
 
 		public static final Integer[] INDIKATOR_PELAYANAN_MEDIS = { 1, 2, 3, 4, 5, 6, 7, 8 };
 	}
-	
+
 	public static final class IndikatorKinerjaLuarJamKerja {
 		public static final Integer KONSUL_EKS = 9;
 		public static final Integer KONSUL_GADAR = 10;
@@ -183,6 +183,7 @@ public class Master {
 	}
 
 	public static final class KelompokPasien {
+		public static final Integer ASURANSI_LAIN = 3;
 		public static final Integer BPJS = 2;
 		public static final Integer UMUM = 1;
 
@@ -277,6 +278,10 @@ public class Master {
 		public static final Integer KONSULTASI_DOKTER_JAGA = 400;
 	}
 
+	public static final class Rekanan {
+		public static final Integer JAMINAN_KEMENKES = 581398;
+	}
+
 	public static final class Remunerasi {
 		public static final Integer[] JENIS_INDIKATOR = { 1, 2, 3 };
 
@@ -289,7 +294,7 @@ public class Master {
 
 		public static final Double PERSEN_P1 = 0.3;
 		public static final Double PERSEN_P2 = 0.7;
-		
+
 		public static final Double PERSEN_SKOR_LUAR_JAM_KERJA = 1.15;
 
 		public static final Double PERSEN_SKOR_ASISTEN_SPESIALIS = 0.3;
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 d56d28f9..9a469b20 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,15 +120,16 @@ 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)) "
-			+ "or pd.kelompokPasienId in (:listBpjsId)) " + "and pg.jenisPegawaiId = :jenisPegawaiId "
-			+ "and djp.jenisProdukId not in (:listNontindakanId) " + "and pr.id <> :karcisId "
-			+ "order by su.name, pr.id")
+			+ "and sk.id not in (:listNonjadwalId)) and (pd.kelompokPasienId not in (:listBpjsId) and (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")
 	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,
 			@Param("listDepartemenId") List<Integer> listIdDepartemen, @Param("listKsmId") List<Integer> listIdKsm,
 			@Param("listNontindakanId") List<Integer> listIdNontindakan, @Param("listBpjsId") List<Integer> listIdBpjs,
+			@Param("asuransiLainId") Integer idAsuransiLain, @Param("jaminanKemenkesId") Integer idJaminanKemenkes,
 			@Param("karcisId") Integer idKarcis);
 
 	// Target_pelayanan_luar_jam_kerja
@@ -155,18 +156,20 @@ 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 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")
+			+ "and (pd.kelompokPasienId not in (:listBpjsId) and (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")
 	public List<Map<String, Object>> getDataLayananLuarJamKerja(@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,
 			@Param("listDepartemenId") List<Integer> listIdDepartemen, @Param("listKsmId") List<Integer> listIdKsm,
 			@Param("listNontindakanId") List<Integer> listIdNontindakan, @Param("listBpjsId") List<Integer> listIdBpjs,
+			@Param("asuransiLainId") Integer idAsuransiLain, @Param("jaminanKemenkesId") Integer idJaminanKemenkes,
 			@Param("karcisId") Integer idKarcis);
 
 	// Kinerja_jam_kerja_dokter
-	String KinerjaJamKerjaDokter = "select distinct new Map(ppp.ObjectJenisPetugasPeId as jenisPetugasId,"
+	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,"
 			+ "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) "
@@ -183,32 +186,38 @@ 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)) "
-			+ "or pd.kelompokPasienId in (:listBpjsId)) " + "and pg.jenisPegawaiId = :jenisPegawaiId "
-			+ "and djp.jenisProdukId not in (:listNontindakanId) " + "and pr.id <> :karcisId "
-			+ "and pg.id in (:listPegawaiId) ";
+			+ "and sk.id not in (:listNonjadwalId)) and (pd.kelompokPasienId not in (:listBpjsId) and (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) ";
 
-	String paramListDetailJenisProdukId = "and djp.id in (:listDetailJenisProdukId) ";
+	String paramListDetailJenisProdukId = "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)) ";
 
 	String sortingKinerjaJamKerjaDokter = "order by pr.namaProduk, pp.tglPelayanan";
 
-	@Query(KinerjaJamKerjaDokter + paramListDetailJenisProdukId + sortingKinerjaJamKerjaDokter)
+	@Query(kinerjaJamKerjaDokter + paramListDetailJenisProdukId + sortingKinerjaJamKerjaDokter)
 	public List<Map<String, Object>> getDataLogbookJamKerjaDokter(@Param("bulan") String bulan,
 			@Param("psbbAwal") Date psbbAwal, @Param("psbbAkhir") Date psbbAkhir,
 			@Param("listNonjadwalId") List<Integer> listIdNonjadwal, @Param("jenisPegawaiId") Integer idJenisPegawai,
 			@Param("listPegawaiId") List<Integer> listIdPegawai,
 			@Param("listDepartemenId") List<Integer> listIdDepartemen,
 			@Param("listDetailJenisProdukId") List<Integer> listIdDetailJenisProduk,
+			@Param("listProdukIgdId") List<Integer> listIdProdukIgd,
+			@Param("listDokterUmumId") List<Integer> listIdDokterUmum, @Param("IgdId") Integer idIgd,
 			@Param("listNontindakanId") List<Integer> listIdNontindakan, @Param("listBpjsId") List<Integer> listIdBpjs,
+			@Param("asuransiLainId") Integer idAsuransiLain, @Param("jaminanKemenkesId") Integer idJaminanKemenkes,
 			@Param("karcisId") Integer idKarcis);
 
-	@Query(KinerjaJamKerjaDokter + sortingKinerjaJamKerjaDokter)
+	@Query(kinerjaJamKerjaDokter + sortingKinerjaJamKerjaDokter)
 	public List<Map<String, Object>> getDataLogbookJamKerjaDokter(@Param("bulan") String bulan,
 			@Param("psbbAwal") Date psbbAwal, @Param("psbbAkhir") Date psbbAkhir,
 			@Param("listNonjadwalId") List<Integer> listIdNonjadwal, @Param("jenisPegawaiId") Integer idJenisPegawai,
 			@Param("listPegawaiId") List<Integer> listIdPegawai,
 			@Param("listDepartemenId") List<Integer> listIdDepartemen,
 			@Param("listNontindakanId") List<Integer> listIdNontindakan, @Param("listBpjsId") List<Integer> listIdBpjs,
+			@Param("asuransiLainId") Integer idAsuransiLain, @Param("jaminanKemenkesId") Integer idJaminanKemenkes,
 			@Param("karcisId") Integer idKarcis);
 
 	// Logbook_kinerja_luar_jam_kerja_dokter
@@ -232,15 +241,21 @@ 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 pg.jenisPegawaiId = :jenisPegawaiId "
-			+ "and djp.id in (:listDetailJenisProdukId) " + "and djp.jenisProdukId not in (:listNontindakanId) "
-			+ "and pr.id <> :karcisId " + "and pg.id = :pegawaiId " + "order by pr.namaProduk, pp.tglPelayanan")
+			+ "and (pd.kelompokPasienId not in (:listBpjsId) and (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 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,
 			@Param("psbbAwal") Date psbbAwal, @Param("psbbAkhir") Date psbbAkhir,
 			@Param("listNonjadwalId") List<Integer> listIdNonjadwal, @Param("jenisPegawaiId") Integer idJenisPegawai,
 			@Param("pegawaiId") Integer idPegawai, @Param("listDepartemenId") List<Integer> listIdDepartemen,
 			@Param("listDetailJenisProdukId") List<Integer> listIdDetailJenisProduk,
+			@Param("listProdukIgdId") List<Integer> listIdProdukIgd,
+			@Param("listDokterUmumId") List<Integer> listIdDokterUmum, @Param("IgdId") Integer idIgd,
 			@Param("listNontindakanId") List<Integer> listIdNontindakan, @Param("listBpjsId") List<Integer> listIdBpjs,
+			@Param("asuransiLainId") Integer idAsuransiLain, @Param("jaminanKemenkesId") Integer idJaminanKemenkes,
 			@Param("karcisId") Integer idKarcis);
 
 	// Detail_logbook_kinerja_jam_kerja_dokter
@@ -264,17 +279,23 @@ 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)) "
-			+ "or pd.kelompokPasienId in (:listBpjsId)) " + "and pg.jenisPegawaiId = :jenisPegawaiId "
-			+ "and djp.id in (:listDetailJenisProdukId) " + "and djp.jenisProdukId not in (:listNontindakanId) "
-			+ "and pr.id <> :karcisId " + "and pg.id = :pegawaiId" + " order by pr.namaProduk, pp.tglPelayanan")
+			+ "and sk.id not in (:listNonjadwalId)) and (pd.kelompokPasienId not in (:listBpjsId) and (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 djp.jenisProdukId not in (:listNontindakanId) " + "and pr.id <> :karcisId "
+			+ "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,
 			@Param("jenisPegawaiId") Integer idJenisPegawai, @Param("pegawaiId") Integer idPegawai,
 			@Param("listDepartemenId") List<Integer> listIdDepartemen,
 			@Param("listDetailJenisProdukId") List<Integer> listIdDetailJenisProduk,
+			@Param("listProdukIgdId") List<Integer> listIdProdukIgd,
+			@Param("listDokterUmumId") List<Integer> listIdDokterUmum, @Param("IgdId") Integer idIgd,
 			@Param("listNontindakanId") List<Integer> listIdNontindakan, @Param("listBpjsId") List<Integer> listIdBpjs,
+			@Param("asuransiLainId") Integer idAsuransiLain, @Param("jaminanKemenkesId") Integer idJaminanKemenkes,
 			@Param("karcisId") Integer idKarcis);
 
 	// Detail_logbook_kinerja_luar_jam_kerja_dokter
@@ -301,15 +322,21 @@ 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 pg.jenisPegawaiId = :jenisPegawaiId "
-			+ "and djp.id in (:listDetailJenisProdukId) " + "and djp.jenisProdukId not in (:listNontindakanId) "
-			+ "and pr.id <> :karcisId " + "and pg.id = :pegawaiId " + "order by pr.namaProduk, pp.tglPelayanan")
+			+ "and (pd.kelompokPasienId not in (:listBpjsId) and (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 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,
 			@Param("tglPelayanan") String tglPelayanan, @Param("psbbAwal") Date psbbAwal,
 			@Param("psbbAkhir") Date psbbAkhir, @Param("listNonjadwalId") List<Integer> listIdNonjadwal,
 			@Param("jenisPegawaiId") Integer idJenisPegawai, @Param("pegawaiId") Integer idPegawai,
 			@Param("listDepartemenId") List<Integer> listIdDepartemen,
 			@Param("listDetailJenisProdukId") List<Integer> listIdDetailJenisProduk,
+			@Param("listProdukIgdId") List<Integer> listIdProdukIgd,
+			@Param("listDokterUmumId") List<Integer> listIdDokterUmum, @Param("IgdId") Integer idIgd,
 			@Param("listNontindakanId") List<Integer> listIdNontindakan, @Param("listBpjsId") List<Integer> listIdBpjs,
+			@Param("asuransiLainId") Integer idAsuransiLain, @Param("jaminanKemenkesId") Integer idJaminanKemenkes,
 			@Param("karcisId") Integer idKarcis);
 }
\ No newline at end of file
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
index 6711292f..42f6e7ba 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
@@ -1073,4 +1073,8 @@ public interface PegawaiDao extends PagingAndSortingRepository<Pegawai, Integer>
 			+ "order by pg.namaLengkap")
 	public List<Map<String, Object>> findPegawaiByListId(@Param("listPegawaiId") List<Integer> listIdPegawai);
 
+	@Query("select new Map(pg.id as id,pg.namaLengkap as namaLengkap) " + "from Pegawai pg "
+			+ "where pg.statusEnabled is true " + "and pg.idFinger = :fingerId " + "and pg.idFinger <> ''")
+	public List<Map<String, Object>> checkExistingFingerId(@Param("fingerId") String idFinger);
+
 }
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 44fb4bf1..29aa61f9 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
@@ -35,10 +35,10 @@ public interface PendapatanDao extends PagingAndSortingRepository<PelayananPasie
 			+ "coalesce(pelayananPasienDetail.hargaJual, 0) as hargaJual,"
 			+ "coalesce(pelayananPasienDetail.hargaDiscount, 0) as hargaDiskon,"
 			+ "pelayananPasienDetail.komponenHargaId as idJasa," + "pasienDaftar.kelompokPasienId as kelompokPasienId, "
-			+ "pasienDaftar.diskonPegawai as statusDiskon, " + "kategoryPegawai.id as kategoryPegawaiId, "
-			+ "departemen.id as departemenId, " + "ruangan.id as ruanganId, "
-			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
-			+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+			+ "pasienDaftar.rekananId as rekananId," + "pasienDaftar.diskonPegawai as statusDiskon, "
+			+ "kategoryPegawai.id as kategoryPegawaiId, " + "departemen.id as departemenId, "
+			+ "ruangan.id as ruanganId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
+			+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
 			+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PelayananPasienDetail pelayananPasienDetail, "
 			+ "PegawaiJadwalKerja jadwalKerja, " + "Kalender kalender, " + "ShiftKerja shift "
 			+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
@@ -73,8 +73,9 @@ public interface PendapatanDao extends PagingAndSortingRepository<PelayananPasie
 			+ "coalesce(pelayananPasienDetail.hargaDiscount, 0) as hargaDiskon,"
 			+ "pelayananPasienDetail.komponenHargaId as idKomponenHarga," + "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,"
 			+ "pelayananPasien.noRec as noRecPelayananPasien," + "pelayananPasien.jumlah as jumlah,"
 			+ "pelayananPasien.hargaSatuan as harga," + "pelayananPasien.hargaDiscount as diskon,"
 			+ "pelayananPasien.tglPelayanan as tglpelayanan,"
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 9a14231c..b4ca15ca 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
@@ -129,10 +129,11 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "coalesce(pelayananPasien.hargaSatuan, 0) as harga, " + "pelayananPasien.hargaDiscount as diskon, "
 			+ "pelayananPasien.jumlah as count, " + "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tanggal, "
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
-			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.diskonPegawai as statusDiskon, "
-			+ "kategoryPegawai.id as kategoryPegawaiId, " + "departemen.id as departemenId, "
-			+ "ruangan.id as ruanganId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
-			+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.rekananId as rekananId, "
+			+ "pasienDaftar.diskonPegawai as statusDiskon, " + "kategoryPegawai.id as kategoryPegawaiId, "
+			+ "departemen.id as departemenId, " + "ruangan.id as ruanganId, "
+			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
+			+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
 			+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PegawaiJadwalKerja jadwalKerja, "
 			+ "Kalender kalender, " + "ShiftKerja shift "
 			+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
@@ -223,10 +224,11 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk," + "dokter.id as idPegawai,"
 			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
-			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "kategoryPegawai.id as kategoryPegawaiId, "
-			+ "kelas.id as idKelas," + "jenisPetugas.jenisPetugasPe as jenisPetugas, "
-			+ "departemen.id as departemenId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
-			+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
+			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.rekananId as rekananId,"
+			+ "kategoryPegawai.id as kategoryPegawaiId, " + "kelas.id as idKelas,"
+			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, "
+			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
+			+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
 			+ "from PelayananPasienPetugas pelayananPasienPetugas, " + "PegawaiJadwalKerja jadwalKerja, "
 			+ "Kalender kalender, " + "ShiftKerja shift "
 			+ "left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PegawaiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PegawaiService.java
index 1d78940c..29249a9f 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PegawaiService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PegawaiService.java
@@ -170,4 +170,6 @@ public interface PegawaiService extends BaseVoService<Pegawai, PegawaiVO, Intege
 
 	Map<String, Object> getEvaluasiJabatanByPegawai(Integer idPegawai);
 
+	List<Map<String, Object>> findExistingFingerId(String idFinger);
+
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java
index d3c72901..a2a0ad8e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java
@@ -526,6 +526,9 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik
 
 		List<Integer> listIdNonjadwal = shiftKerjaDao.findListNonjadwal();
 
+		List<Integer> listIdDokterKsmUmum = mapPegawaiJabatanToUnitKerjaDao
+				.getPegawaiByUnitKerja(Master.UnitKerja.KSM_UMUM);
+
 		List<Integer> listIdDokterLabPA = pegawaiDao.getDokterLabPatologiAnatomi();
 		List<Integer> listIdDJPLabPA = Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI);
 
@@ -544,7 +547,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik
 				bulan.getTime(), pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER,
 				Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN), Arrays.asList(Master.UnitKerja.KSM),
 				Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS),
-				Master.Produk.KARCIS);
+				Master.KelompokPasien.ASURANSI_LAIN, Master.Rekanan.JAMINAN_KEMENKES, Master.Produk.KARCIS);
 
 		// filter detail jenis produk
 		for (Map<String, Object> map : dataRaw) {
@@ -596,6 +599,21 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik
 				if (listIdTempUtama.contains(map.get("djpId"))) {
 					dataLayananRaw.add(map);
 				}
+			} else if (!listIdDJPUtama.contains(map.get("djpId"))) {
+				List<Integer> listIdTempUtama = listIdDJPUtama;
+				List<Integer> listIdTempAdmPK = listIdDJPAdmPK;
+				if (listIdLaboranRadiolog.contains(map.get("pegawaiId"))) {
+					listIdTempAdmPK.removeAll(listIdTempUtama);
+					if (CommonUtil.isNotNullOrEmpty(listIdTempAdmPK)) {
+						listIdTempUtama.addAll(listIdTempAdmPK);
+					}
+				}
+				if (!listIdTempUtama.contains(map.get("djpId"))
+						&& Arrays.asList(Master.Produk.DOKTER_UMUM_IGD).contains(map.get("idTindakan"))
+						&& listIdDokterKsmUmum.contains(map.get("pegawaiId"))
+						&& Master.Departemen.IGD.equals(map.get("idDepartemen"))) {
+					dataLayananRaw.add(map);
+				}
 			}
 		}
 
@@ -1022,6 +1040,9 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik
 
 		List<Integer> listIdNonjadwal = shiftKerjaDao.findListNonjadwal();
 
+		List<Integer> listIdDokterKsmUmum = mapPegawaiJabatanToUnitKerjaDao
+				.getPegawaiByUnitKerja(Master.UnitKerja.KSM_UMUM);
+
 		List<Integer> listIdDokterLabPA = pegawaiDao.getDokterLabPatologiAnatomi();
 		List<Integer> listIdDJPLabPA = Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI);
 
@@ -1040,7 +1061,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik
 				bulan.getTime(), pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER,
 				Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN), Arrays.asList(Master.UnitKerja.KSM),
 				Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS),
-				Master.Produk.KARCIS);
+				Master.KelompokPasien.ASURANSI_LAIN, Master.Rekanan.JAMINAN_KEMENKES, Master.Produk.KARCIS);
 
 		// filter detail jenis produk
 		for (Map<String, Object> map : dataRaw) {
@@ -1092,6 +1113,21 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik
 				if (listIdTempUtama.contains(map.get("djpId"))) {
 					dataLayananRaw.add(map);
 				}
+			} else if (!listIdDJPUtama.contains(map.get("djpId"))) {
+				List<Integer> listIdTempUtama = listIdDJPUtama;
+				List<Integer> listIdTempAdmPK = listIdDJPAdmPK;
+				if (listIdLaboranRadiolog.contains(map.get("pegawaiId"))) {
+					listIdTempAdmPK.removeAll(listIdTempUtama);
+					if (CommonUtil.isNotNullOrEmpty(listIdTempAdmPK)) {
+						listIdTempUtama.addAll(listIdTempAdmPK);
+					}
+				}
+				if (!listIdTempUtama.contains(map.get("djpId"))
+						&& Arrays.asList(Master.Produk.DOKTER_UMUM_IGD).contains(map.get("idTindakan"))
+						&& listIdDokterKsmUmum.contains(map.get("pegawaiId"))
+						&& Master.Departemen.IGD.equals(map.get("idDepartemen"))) {
+					dataLayananRaw.add(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 3c322ce1..7eaf30c8 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
@@ -2681,7 +2681,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("detailId").toString()))) {
 						rawResult.add(map);
 					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							.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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -2768,7 +2773,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 						&& map.get("departemenId").equals(Master.Departemen.IGD) && drKsmUmumList.contains(idPegawai)
 						&& Arrays.asList(Master.Produk.DOKTER_UMUM_IGD)
 								.contains(Integer.parseInt(map.get("idProduk").toString()))) {
-					if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+					if (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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -2859,7 +2869,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("detailId").toString()))) {
 						rawResult.add(map);
 					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							.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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -3268,7 +3283,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("detailId").toString()))) {
 						rawResult.add(map);
 					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							.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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -3355,7 +3375,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 						&& map.get("departemenId").equals(Master.Departemen.IGD) && drKsmUmumList.contains(idPegawai)
 						&& Arrays.asList(Master.Produk.DOKTER_UMUM_IGD)
 								.contains(Integer.parseInt(map.get("idProduk").toString()))) {
-					if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+					if (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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -3446,7 +3471,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("detailId").toString()))) {
 						rawResult.add(map);
 					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							.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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -3723,7 +3753,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("detailId").toString()))) {
 						rawResult.add(map);
 					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							.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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -3811,7 +3846,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 						&& map.get("departemenId").equals(Master.Departemen.IGD) && drKsmUmumList.contains(idPegawai)
 						&& Arrays.asList(Master.Produk.DOKTER_UMUM_IGD)
 								.contains(Integer.parseInt(map.get("idProduk").toString()))) {
-					if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+					if (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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -3902,7 +3942,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("detailId").toString()))) {
 						rawResult.add(map);
 					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							.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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -6024,7 +6069,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("detailId").toString()))) {
 						rawResult.add(map);
 					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							.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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -6111,7 +6161,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 						&& map.get("departemenId").equals(Master.Departemen.IGD) && drKsmUmumList.contains(idPegawai)
 						&& Arrays.asList(Master.Produk.DOKTER_UMUM_IGD)
 								.contains(Integer.parseInt(map.get("idProduk").toString()))) {
-					if (Master.KelompokPasien.BPJS.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+					if (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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -6202,7 +6257,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("detailId").toString()))) {
 						rawResult.add(map);
 					} else if (Master.KelompokPasien.BPJS
-							.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+							.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())))) {
 						rawResult.add(map);
 					} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 						Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -6539,7 +6599,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									|| 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()))) {
 											rawResult.add(map);
@@ -6553,6 +6621,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} 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))) {
@@ -6571,7 +6647,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								}
 							} 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)
@@ -6605,7 +6689,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 							}
 						} 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()))) {
 									rawResult.add(map);
@@ -6723,7 +6815,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									|| 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()))) {
 											rawResult.add(map);
@@ -6737,6 +6837,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} 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))) {
@@ -6755,7 +6863,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								}
 							} 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)
@@ -6789,7 +6905,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 							}
 						} 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()))) {
 									rawResult.add(map);
@@ -6906,7 +7030,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									|| 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()))) {
 											rawResult.add(map);
@@ -6920,6 +7052,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} 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))) {
@@ -6938,7 +7078,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								}
 							} 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)
@@ -6972,7 +7120,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 							}
 						} 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()))) {
 									rawResult.add(map);
@@ -7112,7 +7268,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												.longValue();
 										dataCountRemun = dataCountRemun + 1;
 									} else if (Master.KelompokPasien.BPJS
-											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+											.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())))) {
 										remun = remun + (new Double(Double.parseDouble(map.get("count").toString())))
 												.longValue();
 										dataCountRemun = dataCountRemun + 1;
@@ -7267,7 +7428,16 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 																.longValue();
 												dataCountRemun = dataCountRemun + 1;
 											} 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 (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 														.contains(Integer.parseInt(map.get("detailId").toString()))
 														&& !Arrays
@@ -7305,7 +7475,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												|| 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()))) {
+														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.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 															.contains(Integer.parseInt(map.get("detailId").toString()))
@@ -7335,6 +7517,18 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											} 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(dateMasukFfs)
 																|| dateTimePelayanan.isEqual(datePulangFfs)
 																|| dateTimePelayanan.isAfter(datePulangFfs))) {
@@ -7368,7 +7562,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												}
 											}
 										} 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 (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 													.contains(Integer.parseInt(map.get("detailId").toString()))
 													&& !Arrays
@@ -7411,7 +7613,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										dataCountRemun = dataCountRemun + 1;
 									} 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.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 													.contains(Integer.parseInt(map.get("detailId").toString()))
 													&& !Arrays
@@ -7472,7 +7682,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									&& Integer.parseInt(map.get("idKelas").toString()) == idKelas) {
 								if (!dokterLuar.contains(idPegawai)) {
 									if (Master.KelompokPasien.BPJS
-											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+											.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())))) {
 										remun = remun + (new Double(Double.parseDouble(map.get("count").toString())))
 												.longValue();
 										dataCountRemun = dataCountRemun + 1;
@@ -7627,7 +7842,16 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 																.longValue();
 												dataCountRemun = dataCountRemun + 1;
 											} 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 (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 														.contains(Integer.parseInt(map.get("detailId").toString()))
 														&& !Arrays
@@ -7666,7 +7890,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												|| 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()))) {
+														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()))) {
 														ffs = ffs + (new Double(
@@ -7687,6 +7923,18 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											} 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(dateMasukFfs)
 																|| dateTimePelayanan.isEqual(datePulangFfs)
 																|| dateTimePelayanan.isAfter(datePulangFfs))) {
@@ -7712,7 +7960,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												}
 											}
 										} 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 (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 													.contains(Integer.parseInt(map.get("departemenId").toString()))
 													&& (dateTimePelayanan.isBefore(dateMasukFfs)
@@ -7747,7 +8003,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										dataCountRemun = dataCountRemun + 1;
 									} 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()))) {
 												ffs = ffs
@@ -7806,7 +8070,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												.longValue();
 										dataCountRemun = dataCountRemun + 1;
 									} else if (Master.KelompokPasien.BPJS
-											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+											.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())))) {
 										remun = remun + (new Double(Double.parseDouble(map.get("count").toString())))
 												.longValue();
 										dataCountRemun = dataCountRemun + 1;
@@ -7961,7 +8230,16 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 																.longValue();
 												dataCountRemun = dataCountRemun + 1;
 											} 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 (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 														.contains(Integer.parseInt(map.get("detailId").toString()))
 														&& !Arrays
@@ -7999,7 +8277,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												|| 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()))) {
+														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.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 															.contains(Integer.parseInt(map.get("detailId").toString()))
@@ -8029,6 +8319,18 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											} 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(dateMasukFfs)
 																|| dateTimePelayanan.isEqual(datePulangFfs)
 																|| dateTimePelayanan.isAfter(datePulangFfs))) {
@@ -8062,7 +8364,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 												}
 											}
 										} 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 (!Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 													.contains(Integer.parseInt(map.get("detailId").toString()))
 													&& !Arrays
@@ -8105,7 +8415,15 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										dataCountRemun = dataCountRemun + 1;
 									} 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.DetailJenisProduk.PENUNJANG_PATOLOGI_ANATOMI)
 													.contains(Integer.parseInt(map.get("detailId").toString()))
 													&& !Arrays
@@ -8223,7 +8541,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										.contains(Integer.parseInt(map.get("detailId").toString()))) {
 							result.add(map);
 						} else if (Master.KelompokPasien.BPJS
-								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+								.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())))) {
 							result.add(map);
 						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -8310,8 +8633,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 							&& map.get("departemenId").equals(Master.Departemen.IGD)
 							&& drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD)
 									.contains(Integer.parseInt(map.get("idProduk").toString()))) {
-						if (Master.KelompokPasien.BPJS
-								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+						if (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())))) {
 							result.add(map);
 						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
@@ -8403,7 +8730,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										.contains(Integer.parseInt(map.get("detailId").toString()))) {
 							result.add(map);
 						} else if (Master.KelompokPasien.BPJS
-								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
+								.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())))) {
 							result.add(map);
 						} else if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) {
 							Date tanggalPelayanan = (Date) map.get("tanggalPelayanan");
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
index 6ab16409..4f5df30c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
@@ -32,6 +32,7 @@ import com.jasamedika.medifirst2000.dao.IndikatorKinerjaDetailDao;
 import com.jasamedika.medifirst2000.dao.LogbookKinerjaDao;
 import com.jasamedika.medifirst2000.dao.LogbookKinerjaDetailDao;
 import com.jasamedika.medifirst2000.dao.LogbookKinerjaDokterDao;
+import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaDao;
 import com.jasamedika.medifirst2000.dao.MapPegawaiLaboratRadiologiDao;
 import com.jasamedika.medifirst2000.dao.PegawaiDao;
 import com.jasamedika.medifirst2000.dao.ShiftKerjaDao;
@@ -105,6 +106,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 	@Autowired
 	private MapPegawaiLaboratRadiologiDao mapPegawaiLaboratRadiologiDao;
 
+	@Autowired
+	private MapPegawaiJabatanToUnitKerjaDao mapPegawaiJabatanToUnitKerjaDao;
+
 	@Override
 	public LogbookKinerjaVO add(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException {
 		Pegawai pegawai = pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai());
@@ -661,6 +665,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Integer> listRuangEks = splitDataSettingDatafixed("IdRuanganEksekutif");
 		List<Integer> listKonsulTapiVisit = splitDataSettingDatafixed("konsulTapiVisit");
 
+		List<Integer> drKsmUmumList = mapPegawaiJabatanToUnitKerjaDao.getPegawaiByUnitKerja(Master.UnitKerja.KSM_UMUM);
+
 		List<Integer> listIdNonjadwal = shiftKerjaDao.findListNonjadwal();
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
 		if (pegawaiDao.getDokterLabPatologiAnatomi().contains(idPegawai)) {
@@ -684,8 +690,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Map<String, Object>> dataLayanan = ikiDanRemunerasiDao.getDataLogbookJamKerjaDokter(
 				mf.format(new Date(bulan)), pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER,
 				Arrays.asList(idPegawai), Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN), listDetailJenisProduk,
+				Arrays.asList(Master.Produk.DOKTER_UMUM_IGD), drKsmUmumList, Master.Departemen.IGD,
 				Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS),
-				Master.Produk.KARCIS);
+				Master.KelompokPasien.ASURANSI_LAIN, Master.Rekanan.JAMINAN_KEMENKES, Master.Produk.KARCIS);
 
 		List<Map<String, Object>> dataSkor = skoringTindakanMedisDao.findSkoringLogbookDokter(
 				mf.format(new Date(bulan)), Arrays.asList(idPegawai), Arrays.asList(Master.UnitKerja.KSM));
@@ -891,6 +898,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Integer> listRuangEks = splitDataSettingDatafixed("IdRuanganEksekutif");
 		List<Integer> listKonsulTapiVisit = splitDataSettingDatafixed("konsulTapiVisit");
 
+		List<Integer> drKsmUmumList = mapPegawaiJabatanToUnitKerjaDao.getPegawaiByUnitKerja(Master.UnitKerja.KSM_UMUM);
+
 		List<Integer> listIdNonjadwal = shiftKerjaDao.findListNonjadwal();
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
 		if (pegawaiDao.getDokterLabPatologiAnatomi().contains(idPegawai)) {
@@ -914,8 +923,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Map<String, Object>> dataLayanan = ikiDanRemunerasiDao.getDataLogbookLuarJamKerjaDokter(
 				mf.format(new Date(bulan)), pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, idPegawai,
 				Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN), listDetailJenisProduk,
+				Arrays.asList(Master.Produk.DOKTER_UMUM_IGD), drKsmUmumList, Master.Departemen.IGD,
 				Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS),
-				Master.Produk.KARCIS);
+				Master.KelompokPasien.ASURANSI_LAIN, Master.Rekanan.JAMINAN_KEMENKES, Master.Produk.KARCIS);
 
 		List<Map<String, Object>> dataSkor = skoringTindakanMedisDao.findSkoringLogbookDokter(
 				mf.format(new Date(bulan)), Arrays.asList(idPegawai), Arrays.asList(Master.UnitKerja.KSM));
@@ -1115,6 +1125,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Integer> listRuangEks = splitDataSettingDatafixed("IdRuanganEksekutif");
 		List<Integer> listKonsulTapiVisit = splitDataSettingDatafixed("konsulTapiVisit");
 
+		List<Integer> drKsmUmumList = mapPegawaiJabatanToUnitKerjaDao.getPegawaiByUnitKerja(Master.UnitKerja.KSM_UMUM);
+
 		List<Integer> listIdNonjadwal = shiftKerjaDao.findListNonjadwal();
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
 		if (pegawaiDao.getDokterLabPatologiAnatomi().contains(idPegawai)) {
@@ -1138,8 +1150,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Map<String, Object>> dataLayanan = ikiDanRemunerasiDao.findDetailPasienLogbookJamKerjaDokter(idProduk,
 				tglPelayanan, pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, idPegawai,
 				Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN), listDetailJenisProduk,
+				Arrays.asList(Master.Produk.DOKTER_UMUM_IGD), drKsmUmumList, Master.Departemen.IGD,
 				Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS),
-				Master.Produk.KARCIS);
+				Master.KelompokPasien.ASURANSI_LAIN, Master.Rekanan.JAMINAN_KEMENKES, Master.Produk.KARCIS);
 
 		for (Map<String, Object> mapLayanan : dataLayanan) {
 			if (idIndikator.equals(Master.IndikatorKinerjaJamKerja.VISITE)
@@ -1503,6 +1516,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Integer> listRuangEks = splitDataSettingDatafixed("IdRuanganEksekutif");
 		List<Integer> listKonsulTapiVisit = splitDataSettingDatafixed("konsulTapiVisit");
 
+		List<Integer> drKsmUmumList = mapPegawaiJabatanToUnitKerjaDao.getPegawaiByUnitKerja(Master.UnitKerja.KSM_UMUM);
+
 		List<Integer> listIdNonjadwal = shiftKerjaDao.findListNonjadwal();
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
 		if (pegawaiDao.getDokterLabPatologiAnatomi().contains(idPegawai)) {
@@ -1526,8 +1541,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Map<String, Object>> dataLayanan = ikiDanRemunerasiDao.findDetailPasienLogbookLuarJamKerjaDokter(idProduk,
 				tglPelayanan, pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, idPegawai,
 				Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN), listDetailJenisProduk,
+				Arrays.asList(Master.Produk.DOKTER_UMUM_IGD), drKsmUmumList, Master.Departemen.IGD,
 				Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS),
-				Master.Produk.KARCIS);
+				Master.KelompokPasien.ASURANSI_LAIN, Master.Rekanan.JAMINAN_KEMENKES, Master.Produk.KARCIS);
 
 		for (Map<String, Object> mapLayanan : dataLayanan) {
 			if (idIndikator.equals(Master.IndikatorKinerjaLuarJamKerja.VISITE)
@@ -2129,7 +2145,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Map<String, Object>> dataLayanan = ikiDanRemunerasiDao.getDataLogbookJamKerjaDokter(mf.format(bulan),
 				pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, listIdPegawai,
 				Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN), Arrays.asList(Master.JenisProduk.NONTINDAKAN),
-				Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.Produk.KARCIS);
+				Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.KelompokPasien.ASURANSI_LAIN,
+				Master.Rekanan.JAMINAN_KEMENKES, Master.Produk.KARCIS);
 
 		List<Map<String, Object>> dataSkor = skoringTindakanMedisDao.findSkoringLogbookDokter(mf.format(bulan),
 				listIdPegawai, Arrays.asList(Master.UnitKerja.KSM));
@@ -2180,6 +2197,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		}
 
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
+		List<Integer> drKsmUmumList = mapPegawaiJabatanToUnitKerjaDao.getPegawaiByUnitKerja(Master.UnitKerja.KSM_UMUM);
 
 		for (Integer idPegawai : listIdPegawai) {
 			if (pegawaiDao.getDokterLabPatologiAnatomi().contains(idPegawai)) {
@@ -2204,8 +2222,12 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 
 			double capaian = 0.0;
 			for (Map<String, Object> mapLayanan : dataLayanan) {
-				if (mapLayanan.get("pegawaiId").equals(idPegawai)
-						&& listDetailJenisProduk.contains(mapLayanan.get("detailJenisProdukId"))) {
+				if (mapLayanan.get("pegawaiId").equals(idPegawai) && (listDetailJenisProduk
+						.contains(mapLayanan.get("detailJenisProdukId"))
+						|| (!listDetailJenisProduk.contains(mapLayanan.get("detailJenisProdukId"))
+								&& Arrays.asList(Master.Produk.DOKTER_UMUM_IGD).contains(mapLayanan.get("produkId"))
+								&& drKsmUmumList.contains(mapLayanan.get("pegawaiId"))
+								&& mapLayanan.get("departemenId").equals(Master.Departemen.IGD)))) {
 					capaian += Double.valueOf(mapLayanan.get("tSkor").toString());
 				}
 			}
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 8e0ee458..eb9401a8 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
@@ -5,7 +5,6 @@ import java.math.RoundingMode;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.time.ZoneId;
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
index b810867f..035de2e9 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
@@ -2403,4 +2403,11 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 		return result;
 	}
 
+	@Override
+	public List<Map<String, Object>> findExistingFingerId(String idFinger) {
+		List<Map<String, Object>> result = pegawaiDao.checkExistingFingerId(idFinger);
+
+		return result;
+	}
+
 }
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 7d037991..f97cae2c 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
@@ -339,6 +339,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 					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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -348,7 +353,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("count").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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -370,6 +378,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -379,7 +392,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("count").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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -401,6 +417,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -410,7 +431,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("count").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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -434,6 +458,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 					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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -443,7 +472,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("count").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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -465,6 +497,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -474,7 +511,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("count").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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -620,7 +660,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							}
 
 							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 (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 										|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 									if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
@@ -686,7 +734,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()))) {
 									rawResult.add(map);
@@ -801,7 +857,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							}
 
 							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 (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 										|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 									if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
@@ -867,7 +931,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()))) {
 									rawResult.add(map);
@@ -981,7 +1053,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							}
 
 							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 (dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SATURDAY)
 										|| dateTimePelayanan.getDayOfWeek().equals(DayOfWeek.SUNDAY)) {
 									if (map.get("namaShift").toString().contains("Pagi Sore Malam")) {
@@ -1047,7 +1127,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()))) {
 									rawResult.add(map);
@@ -2701,6 +2789,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 					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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -2710,7 +2803,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("count").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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -2732,6 +2828,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -2741,7 +2842,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("count").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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -2763,6 +2867,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -2772,7 +2881,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("count").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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -2796,6 +2908,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 					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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -2805,7 +2922,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("count").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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -2827,6 +2947,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -2836,7 +2961,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 								jasaMedis = Master.FeeForService.HK_02_04_III_558_2015_4_B_1
 										* Double.parseDouble(map.get("count").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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -2985,7 +3113,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()))) {
 											rawResult.add(map);
@@ -2999,6 +3135,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))) {
@@ -3017,7 +3161,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)
@@ -3051,7 +3203,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()))) {
 									rawResult.add(map);
@@ -3169,7 +3329,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()))) {
 											rawResult.add(map);
@@ -3183,6 +3351,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))) {
@@ -3201,7 +3377,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)
@@ -3237,7 +3421,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()))) {
 									rawResult.add(map);
@@ -3354,7 +3546,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()))) {
 											rawResult.add(map);
@@ -3368,6 +3568,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))) {
@@ -3386,7 +3594,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)
@@ -3420,7 +3636,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()))) {
 									rawResult.add(map);
@@ -3649,6 +3873,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 					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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -3659,7 +3888,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										* Double.parseDouble(map.get("jumlah").toString());
 								map.put("jasaMedis", jasaMedis);
 								map.put("jasaMedisStr", kursINA.format(jasaMedis).toString());
-							} 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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -3684,6 +3916,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -3694,7 +3931,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										* Double.parseDouble(map.get("jumlah").toString());
 								map.put("jasaMedis", jasaMedis);
 								map.put("jasaMedisStr", kursINA.format(jasaMedis).toString());
-							} 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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -3719,6 +3959,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -3729,7 +3974,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										* Double.parseDouble(map.get("jumlah").toString());
 								map.put("jasaMedis", jasaMedis);
 								map.put("jasaMedisStr", kursINA.format(jasaMedis).toString());
-							} 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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -3756,6 +4004,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 					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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -3766,7 +4019,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										* Double.parseDouble(map.get("jumlah").toString());
 								map.put("jasaMedis", jasaMedis);
 								map.put("jasaMedisStr", kursINA.format(jasaMedis).toString());
-							} 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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -3791,6 +4047,11 @@ 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)))
 									&& Arrays.stream(Master.KONSUL_VISIT)
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& map.get("departemenId").equals(Master.Departemen.RAWAT_INAP)
@@ -3801,7 +4062,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										* Double.parseDouble(map.get("jumlah").toString());
 								map.put("jasaMedis", jasaMedis);
 								map.put("jasaMedisStr", kursINA.format(jasaMedis).toString());
-							} 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("hargaDiskon").toString()))
 										* Master.FeeForService.HK_02_04_III_558_2015_5_B_C_D
@@ -3950,7 +4214,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()))) {
 											result.add(map);
@@ -3964,6 +4236,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))) {
@@ -3982,7 +4262,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)
@@ -4016,7 +4304,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()))) {
 									result.add(map);
@@ -4134,7 +4430,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()))) {
 											result.add(map);
@@ -4148,6 +4452,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))) {
@@ -4166,7 +4478,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)
@@ -4200,7 +4520,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()))) {
 									result.add(map);
@@ -4317,7 +4645,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()))) {
 											result.add(map);
@@ -4331,6 +4667,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))) {
@@ -4349,7 +4693,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)
@@ -4383,7 +4735,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()))) {
 									result.add(map);
diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java
index aedbd80e..79d1bbcf 100644
--- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java
+++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java
@@ -1393,4 +1393,23 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
+
+	@RequestMapping(value = "/check-existing-fingerid", method = RequestMethod.GET)
+	public ResponseEntity<List<Map<String, Object>>> findExistingFingerId(HttpServletRequest request,
+			@RequestParam(value = "fingerId", required = true) String idFinger) {
+		try {
+			List<Map<String, Object>> result = pegawaiService.findExistingFingerId(idFinger);
+			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 all jabatan", 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 all jabatan", jse.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+		}
+	}
 }