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 df6f12fa..6ab1bb39 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
@@ -2741,6 +2741,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 		
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
+		Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar"));
+		Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator"));
+		Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator"));
 
 		// LOGIC_RULES_REMUN
 		if (CommonUtil.isNotNullOrEmpty(listData)) {
@@ -3191,10 +3194,10 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								if (drAnastesiList.contains(idPegawai)) {
 									if (idsPenunjangBukanAnestesi
 											.contains(mapResult1.get("idProduk"))) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+										percentage = persenOperator;
 									} else if ((Integer) mapResult1
 											.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+										percentage = persenOperator;
 										if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 												&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon"))
 														|| Integer.valueOf(mapResult1.get("statusDiskon").toString())
@@ -3207,14 +3210,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											}
 										}
 									} else {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+										percentage = persenCooperator;
 									}
 								} else {
 									if ((Integer) mapResult1.get(
 											"idJenisPelaksana") == Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+										percentage = persenCooperator;
 									} else {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+										percentage = persenOperator;
 										if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 												&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon"))
 														|| Integer.valueOf(mapResult1.get("statusDiskon").toString())
@@ -3236,7 +3239,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} else {
 									percentage = percentage / 100;
 									point = getPoinLogbookDokter(harga, percentage,
-											Master.LogbookDokter.TARIF_REMUNERASI, isDiskonJasamedis1);
+											komponenDasar, isDiskonJasamedis1);
 								}
 
 								pointQty = point * totalProduk1.doubleValue();
@@ -3293,10 +3296,10 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								if (drAnastesiList.contains(idPegawai)) {
 									if (idsPenunjangBukanAnestesi
 											.contains(mapResult2.get("idProduk"))) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+										percentage = persenOperator;
 									} else if ((Integer) mapResult2
 											.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+										percentage = persenOperator;
 										if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 												&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon"))
 														|| Integer.valueOf(mapResult2.get("statusDiskon").toString())
@@ -3309,14 +3312,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											}
 										}
 									} else {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+										percentage = persenCooperator;
 									}
 								} else {
 									if ((Integer) mapResult2.get(
 											"idJenisPelaksana") == Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+										percentage = persenCooperator;
 									} else {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+										percentage = persenOperator;
 										if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 												&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon"))
 														|| Integer.valueOf(mapResult2.get("statusDiskon").toString())
@@ -3338,7 +3341,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} else {
 									percentage = percentage / 100;
 									point = getPoinLogbookDokter(harga, percentage,
-											Master.LogbookDokter.TARIF_REMUNERASI, isDiskonJasamedis2);
+											komponenDasar, isDiskonJasamedis2);
 								}
 
 								pointQty = point * totalProduk2.doubleValue();
@@ -3449,6 +3452,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 		
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
+		Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar"));
+		Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator"));
+		Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator"));
 
 		// LOGIC_RULES_REMUN
 		if (CommonUtil.isNotNullOrEmpty(listData)) {
@@ -3825,24 +3831,24 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 						if (drAnastesiList.contains(idPegawai)) {
 							if (idsPenunjangBukanAnestesi
 									.contains(mapResult.get("idProduk"))) {
-								percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+								percentage = persenOperator;
 							} else if ((Integer) mapResult
 									.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
-								percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+								percentage = persenOperator;
 							} else {
-								percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+								percentage = persenCooperator;
 							}
 						} else {
 							if ((Integer) mapResult
 									.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) {
-								percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+								percentage = persenCooperator;
 							} else {
-								percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+								percentage = persenOperator;
 							}
 						}
 
 						percentage = percentage / 100;
-						point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
+						point = getPoin(harga, percentage, komponenDasar);
 						pointQty = point * totalProduk.doubleValue();
 						formatPointQty = Double.parseDouble(df.format(pointQty));
 
@@ -3935,6 +3941,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 		
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
+		Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar"));
+		Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator"));
+		Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator"));
 
 		if (CommonUtil.isNotNullOrEmpty(listData)) {
 			for (Map<String, Object> map : listData) {
@@ -4375,10 +4384,10 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								if (drAnastesiList.contains(idPegawai)) {
 									if (idsPenunjangBukanAnestesi
 											.contains(mapResult1.get("idProduk"))) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+										percentage = persenOperator;
 									} else if ((Integer) mapResult1
 											.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+										percentage = persenOperator;
 										if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 												&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon"))
 														|| Integer.valueOf(mapResult1.get("statusDiskon").toString())
@@ -4391,14 +4400,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											}
 										}
 									} else {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+										percentage = persenCooperator;
 									}
 								} else {
 									if ((Integer) mapResult1.get(
 											"idJenisPelaksana") == Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+										percentage = persenCooperator;
 									} else {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+										percentage = persenOperator;
 										if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
 												&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon"))
 														|| Integer.valueOf(mapResult1.get("statusDiskon").toString())
@@ -4420,7 +4429,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} else {
 									percentage = percentage / 100;
 									point = getPoinLogbookDokter(harga, percentage,
-											Master.LogbookDokter.TARIF_REMUNERASI, isDiskonJasamedis1);
+											komponenDasar, isDiskonJasamedis1);
 								}
 
 								pointQty = point * totalTindakan1.doubleValue();
@@ -4458,10 +4467,10 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								if (drAnastesiList.contains(idPegawai)) {
 									if (idsPenunjangBukanAnestesi
 											.contains(mapResult2.get("idProduk"))) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+										percentage = persenOperator;
 									} else if ((Integer) mapResult2
 											.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+										percentage = persenOperator;
 										if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 												&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon"))
 														|| Integer.valueOf(mapResult2.get("statusDiskon").toString())
@@ -4474,14 +4483,14 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											}
 										}
 									} else {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+										percentage = persenCooperator;
 									}
 								} else {
 									if ((Integer) mapResult2.get(
 											"idJenisPelaksana") == Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+										percentage = persenCooperator;
 									} else {
-										percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+										percentage = persenOperator;
 										if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
 												&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon"))
 														|| Integer.valueOf(mapResult2.get("statusDiskon").toString())
@@ -4503,7 +4512,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} else {
 									percentage = percentage / 100;
 									point = getPoinLogbookDokter(harga, percentage,
-											Master.LogbookDokter.TARIF_REMUNERASI, isDiskonJasamedis2);
+											komponenDasar, isDiskonJasamedis2);
 								}
 
 								pointQty = point * totalTindakan2.doubleValue();
@@ -4590,6 +4599,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 		
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
+		Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar"));
+		Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator"));
+		Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator"));
 
 		// LOGIC_RULES_FFS
 		if (CommonUtil.isNotNullOrEmpty(listData)) {
@@ -4965,24 +4977,24 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 						if (drAnastesiList.contains(idPegawai)) {
 							if (idsPenunjangBukanAnestesi
 									.contains(mapResult.get("idProduk"))) {
-								percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+								percentage = persenOperator;
 							} else if ((Integer) mapResult
 									.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
-								percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+								percentage = persenOperator;
 							} else {
-								percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+								percentage = persenCooperator;
 							}
 						} else {
 							if ((Integer) mapResult
 									.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS) {
-								percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+								percentage = persenCooperator;
 							} else {
-								percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+								percentage = persenOperator;
 							}
 						}
 
 						percentage = percentage / 100;
-						point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
+						point = getPoin(harga, percentage, komponenDasar);
 						pointQty = point * totalTindakan.doubleValue();
 						formatPointQty = Double.parseDouble(df.format(pointQty));
 
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 71c33c83..302172af 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
@@ -110,7 +110,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 			Integer idKomponenHarga, Double hargaJual, Double hargaDiskon, Double count) {
 		Map<String, Object> result = new HashMap<>();
 		
-		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
 		List<Integer> idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
 
@@ -282,7 +281,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
@@ -306,6 +304,9 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
 		List<Integer> idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
+		Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar"));
+		Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator"));
+		Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator"));
 
 		// RULES_NOTE_SK_FFS_2015_DI_2019
 		if (CommonUtil.isNotNullOrEmpty(data)) {
@@ -1295,24 +1296,24 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (drAnastesiList.contains(idPegawai)) {
 								if (idsPenunjangBukanAnestesi
 										.contains(mapResult1.get("idProduk"))) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+									percentage = persenOperator;
 								} else if (mapResult1.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+									percentage = persenCooperator;
 								}
 							} else {
 								if (mapResult1.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+									percentage = persenCooperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								}
 							}
 
 							percentage = percentage / 100;
-							point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
+							point = getPoin(harga, percentage, komponenDasar);
 							pointQty = point * totalTindakan1.doubleValue();
 							formatPointQty = Double.parseDouble(df.format(pointQty));
 
@@ -1329,24 +1330,24 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (drAnastesiList.contains(idPegawai)) {
 								if (idsPenunjangBukanAnestesi
 										.contains(mapResult2.get("idProduk"))) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+									percentage = persenOperator;
 								} else if (mapResult2.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+									percentage = persenCooperator;
 								}
 							} else {
 								if (mapResult2.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+									percentage = persenCooperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								}
 							}
 
 							percentage = percentage / 100;
-							point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
+							point = getPoin(harga, percentage, komponenDasar);
 							pointQty = point * totalTindakan2.doubleValue();
 							formatPointQty = Double.parseDouble(df.format(pointQty));
 
@@ -1392,7 +1393,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
@@ -1445,7 +1445,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 			}
 		}
 		
-		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
 		List<Integer> idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
 
@@ -2916,7 +2915,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
@@ -2970,9 +2968,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 			}
 		}
 		
-		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
 		List<Integer> idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
+		Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar"));
+		Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator"));
+		Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator"));
 
 		// RULES_SK_FFS_2015
 		if (CommonUtil.isNotNullOrEmpty(rawData)) {
@@ -3930,24 +3930,24 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (drAnastesiList.contains(idPegawai)) {
 								if (idsPenunjangBukanAnestesi
 										.contains(mapResult.get("idProduk"))) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+									percentage = persenOperator;
 								} else if (mapResult.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+									percentage = persenCooperator;
 								}
 							} else {
 								if (mapResult.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+									percentage = persenCooperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								}
 							}
 
 							percentage = percentage / 100;
-							point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
+							point = getPoin(harga, percentage, komponenDasar);
 							pointQty = point * totalTindakan.doubleValue();
 							formatPointQty = Double.parseDouble(df.format(pointQty));
 
@@ -4002,7 +4002,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
@@ -5014,7 +5013,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		if (drLabPatologiAnatomi.contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
@@ -5032,8 +5030,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		}
 		
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
-		List<Integer> idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
+		Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar"));
+		Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator"));
+		Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator"));
 
 		if (CommonUtil.isNotNullOrEmpty(data)) {
 			if (drParuhWaktu.contains(idPegawai)) {
@@ -5727,24 +5727,24 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (drAnastesiList.contains(idPegawai)) {
 								if (idsPenunjangBukanAnestesi
 										.contains(mapCollection.get("idProduk"))) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+									percentage = persenOperator;
 								} else if (mapCollection.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+									percentage = persenCooperator;
 								}
 							} else {
 								if (mapCollection.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+									percentage = persenCooperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								}
 							}
 
 							percentage = percentage / 100;
-							point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
+							point = getPoin(harga, percentage, komponenDasar);
 							pointQty = point * totalTindakan.doubleValue();
 							formatPointQty = Double.parseDouble(df.format(pointQty));
 
@@ -5815,7 +5815,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
@@ -5832,8 +5831,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		}
 		
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
-		List<Integer> idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga");
-		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
 
 		if (CommonUtil.isNotNullOrEmpty(data)) {
 			if (drParuhWaktu.contains(idPegawai)) {
@@ -6738,7 +6735,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		if (drLabPatologiAnatomi.contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
@@ -6756,8 +6752,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		}
 		
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
-		List<Integer> idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
+		Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar"));
+		Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator"));
+		Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator"));
 
 		// GET_JASA_MEDIS
 		if (CommonUtil.isNotNullOrEmpty(data)) {
@@ -7175,24 +7173,24 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (drAnastesiList.contains(idPegawai)) {
 								if (idsPenunjangBukanAnestesi
 										.contains(mapCollection.get("idProduk"))) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+									percentage = persenOperator;
 								} else if (mapCollection.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+									percentage = persenCooperator;
 								}
 							} else {
 								if (mapCollection.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+									percentage = persenCooperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								}
 							}
 
 							percentage = percentage / 100;
-							point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
+							point = getPoin(harga, percentage, komponenDasar);
 							pointQty = point * totalTindakan.doubleValue();
 							formatPointQty = Double.parseDouble(df.format(pointQty));
 
@@ -7262,7 +7260,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
@@ -7280,7 +7277,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		}
 		
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
-		List<Integer> idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
 
 		// GET_JASA_MEDIS
@@ -7698,7 +7694,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		if (drLabPatologiAnatomi.contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
@@ -7751,6 +7746,9 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
 		List<Integer> idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga");
 		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
+		Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar"));
+		Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator"));
+		Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator"));
 
 		// RULES_SK_FFS_2015
 		if (CommonUtil.isNotNullOrEmpty(rawData)) {
@@ -8582,24 +8580,24 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							if (drAnastesiList.contains(idPegawai)) {
 								if (idsPenunjangBukanAnestesi
 										.contains(mapCollection.get("idProduk"))) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_PENUNJANG_BUKAN_ANASTESI;
+									percentage = persenOperator;
 								} else if (mapCollection.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_ANASTESI;
+									percentage = persenCooperator;
 								}
 							} else {
 								if (mapCollection.get("idJenisPelaksana")
 										.equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS;
+									percentage = persenCooperator;
 								} else {
-									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
+									percentage = persenOperator;
 								}
 							}
 
 							percentage = percentage / 100;
-							point = getPoin(harga, percentage, Master.LogbookDokter.TARIF_REMUNERASI);
+							point = getPoin(harga, percentage, komponenDasar);
 							pointQty = point * totalTindakan.doubleValue();
 							formatPointQty = Double.parseDouble(df.format(pointQty));
 
@@ -8673,7 +8671,6 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;