diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDetailDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDetailDao.java
index 6a03ad78..c9331a60 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDetailDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDetailDao.java
@@ -20,4 +20,8 @@ public interface PelayananPasienDetailDao extends PagingAndSortingRepository<Pel
 	@Query("select model from PelayananPasienDetail model left join model.pelayananPasien a where a.noRec=:noRec")
 	List<PelayananPasienDetail> getPelayananPasienDetail(@Param("noRec") String noRec);
 
+	@Query("select sum(ppd.hargaDiscount) " + "from PelayananPasienDetail ppd "
+			+ "where ppd.pelayananPasienId = :noRec " + "and ppd.komponenHargaId = 35")
+	Double totalDiskonJasamedis(@Param("noRec") String noRec);
+
 }
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 152215f5..5177cca1 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
@@ -126,8 +126,9 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "produk.namaProduk as namaProduk, " + "kelas.id as idKelas, " + "kelas.namaKelas as namaKelas, "
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
 			+ "where harga.produkId = produk.id and harga.statusEnabled is true and harga.kelasId = :idKelasSatu) as hargaKelas1, "
-			+ "coalesce(pelayananPasien.hargaSatuan, 0) as harga, " + "coalesce(pelayananPasien.hargaDiscount,0) as diskon, "
-			+ "pelayananPasien.jumlah as count, " + "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tanggal, "
+			+ "pelayananPasien.noRec as noRec, " + "coalesce(pelayananPasien.hargaSatuan, 0) as harga, "
+			+ "coalesce(pelayananPasien.hargaDiscount,0) 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.rekananId as rekananId, "
 			+ "pasienDaftar.diskonPegawai as statusDiskon, " + "kategoryPegawai.id as kategoryPegawaiId, "
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 b6a679d4..2b28ddb0 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
@@ -42,6 +42,7 @@ import com.jasamedika.medifirst2000.dao.MapRuanganToProdukDao;
 import com.jasamedika.medifirst2000.dao.MonitoringAbsenDao;
 import com.jasamedika.medifirst2000.dao.NilaiIndexKinerjaIndividuDao;
 import com.jasamedika.medifirst2000.dao.PegawaiDao;
+import com.jasamedika.medifirst2000.dao.PelayananPasienDetailDao;
 import com.jasamedika.medifirst2000.dao.RevIndekKinerjaDao;
 import com.jasamedika.medifirst2000.dao.SettingDataFixedDao;
 import com.jasamedika.medifirst2000.dao.TabelAcuanIndeksIKIDao;
@@ -171,6 +172,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 	@Autowired
 	private HargaNettoProdukByKelasDDao detailHargaNettoDao;
 
+	@Autowired
+	private PelayananPasienDetailDao pelayananPasienDetailDao;
+
 	@Autowired
 	private IndeksKinerjaDaoCustom indeksKinerjaDaoCustom;
 
@@ -3134,7 +3138,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
 													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis1 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult1.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis1 = true;
+										}
 									}
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
@@ -3148,7 +3157,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
 													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis1 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult1.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis1 = true;
+										}
 									}
 								}
 							}
@@ -3217,7 +3231,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
 													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis2 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult2.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis2 = true;
+										}
 									}
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
@@ -3231,7 +3250,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
 													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis2 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult2.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis2 = true;
+										}
 									}
 								}
 							}
@@ -3286,7 +3310,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 
 		return result;
 	}
-	
+
 	@Override
 	public List<Map<String, Object>> getAllPelayananByDokterReview(String periode, Integer idPegawai) {
 		if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(Master.KategoryPegawai.DOKTER_LUAR))
@@ -3781,7 +3805,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
 													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis1 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult1.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis1 = true;
+										}
 									}
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
@@ -3795,7 +3824,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
 													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis1 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult1.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis1 = true;
+										}
 									}
 								}
 							}
@@ -3856,7 +3890,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
 													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis2 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult2.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis2 = true;
+										}
 									}
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
@@ -3870,7 +3909,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
 													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis2 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult2.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis2 = true;
+										}
 									}
 								}
 							}
@@ -4394,7 +4438,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 
 		return result;
 	}
-	
+
 	@Override
 	public List<Map<String, Object>> getAllPelayananByDokterReviewForReport(String periode, Integer idPegawai) {
 		if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(Master.KategoryPegawai.DOKTER_LUAR))
@@ -5345,7 +5389,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
 													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis1 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult1.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis1 = true;
+										}
 									}
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
@@ -5359,7 +5408,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
 													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis1 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult1.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis1 = true;
+										}
 									}
 								}
 							}
@@ -5407,7 +5461,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
 													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis2 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult2.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis2 = true;
+										}
 									}
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
@@ -5421,7 +5480,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
 													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis2 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult2.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis2 = true;
+										}
 									}
 								}
 							}
@@ -5455,7 +5519,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 
 		return result;
 	}
-	
+
 	@Override
 	public List<Map<String, Object>> getAllPelayananByDokterReportReview(String periode, Integer idPegawai) {
 		List<Map<String, Object>> result = new ArrayList<>();
@@ -5937,7 +6001,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
 													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis1 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult1.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis1 = true;
+										}
 									}
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
@@ -5951,7 +6020,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
 													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis1 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult1.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis1 = true;
+										}
 									}
 								}
 							}
@@ -5991,7 +6065,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
 													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis2 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult2.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis2 = true;
+										}
 									}
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
@@ -6005,7 +6084,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
 													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
-										isDiskonJasamedis2 = true;
+										Double totalDiskonJasamedis = pelayananPasienDetailDao
+												.totalDiskonJasamedis(mapResult2.get("noRec").toString());
+										if (CommonUtil.isNotNullOrEmpty(totalDiskonJasamedis)
+												&& totalDiskonJasamedis > 0.0) {
+											isDiskonJasamedis2 = true;
+										}
 									}
 								}
 							}
@@ -6495,7 +6579,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 
 		return result;
 	}
-	
+
 	@Override
 	public List<Map<String, Object>> getAllPelayananByDokterForFeeForServiceReview(String periode, Integer idPegawai) {
 		List<Map<String, Object>> result = new ArrayList<>();