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 18fcbc73..6528d282 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
@@ -235,8 +235,8 @@ public class Master {
 		/**
 		 * Komponen operator dari tarif konsultasi dokter spesialis
 		 */
-		public static final Double KOMPONEN_DASAR = 120000.0; 
-		
+		public static final Double KOMPONEN_DASAR = 120000.0;
+
 		public static final Double PERSENTASE_TINDAKAN_ASISTEN_SPESIALIS = 15.0;
 		public static final Double PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA = 30.0;
 		public static final Double PERSENTASE_TINDAKAN_DOKTER_ANASTESI = 15.0;
@@ -289,6 +289,7 @@ public class Master {
 
 		public static final Integer[] DOKTER_UMUM_IGD = { 783, 401333, 402413, 402414, 402449, 402484 };
 		public static final Integer[] KONSULTASI_EKSEKUTIF = { 401092, 401093 };
+		public static final Integer[] MONITORING_INTERVENSI = { 10666, 4037948 };
 		public static final Integer[] PENUNJANG_BUKAN_ANASTESI = { 13409, 15208, 19325, 19346, 19371, 19405, 19406,
 				19535, 19599, 402009, 10009835, 10012269, 1002117344, 1002117938, 1002117963, 1002117964, 1002117965,
 				1002117966 };
@@ -334,7 +335,7 @@ public class Master {
 		public static final Integer[] PENUNJANG_MURNI = { 39, 276 };
 		public static final Integer[] PERISTI = { 45, 75, 76, 463, 464 };
 		public static final Integer[] TANJUNG = { 72, 551 };
-		
+
 		public static final Integer ICU = 328;
 
 		public static final int KLINIK_FALSE_EMERGENCY = 309;
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 de8cc54f..684db3bb 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
@@ -2996,7 +2996,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
 							rawResult.add(map);
 						}
-						
+
 					} else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))
 							&& drKkPerinatologiList.contains(idPegawai)
 							&& idsDokterPerinatologi.contains(Integer.parseInt(map.get("idProduk").toString()))) {
@@ -3225,7 +3225,22 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										&& (Double.parseDouble(map.get("diskon").toString()) > 0
 												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
 														.valueOf(map.get("statusDiskon").toString()).equals(0)))) {
-									count1 = count1 + Double.parseDouble(map.get("count").toString());
+									if (drKkPerinatologiList.contains(idPegawai)) {
+										if ((Arrays.asList(Master.Produk.MONITORING_INTERVENSI)
+												.contains(map.get("idProduk"))
+												|| map.get("namaProduk").toString().toLowerCase()
+														.contains(Master.VISIT))
+												&& count1 < 2) {
+											count1 = count1 + Double.parseDouble(map.get("count").toString());
+										} else if (!Arrays.asList(Master.Produk.MONITORING_INTERVENSI)
+												.contains(map.get("idProduk"))
+												&& !map.get("namaProduk").toString().toLowerCase()
+														.contains(Master.VISIT)) {
+											count1 = count1 + Double.parseDouble(map.get("count").toString());
+										}
+									} else {
+										count1 = count1 + Double.parseDouble(map.get("count").toString());
+									}
 									dataCount1 = dataCount1 + 1;
 									if (dataCount1 == 1) {
 										mapResult1.putAll(map);
@@ -3234,7 +3249,22 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										&& Integer.parseInt(map.get("idKelas").toString()) == idKelas
 										&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
 										&& map.get("tanggal").toString().equals(tanggal)) {
-									count2 = count2 + Double.parseDouble(map.get("count").toString());
+									if (drKkPerinatologiList.contains(idPegawai)) {
+										if ((Arrays.asList(Master.Produk.MONITORING_INTERVENSI)
+												.contains(map.get("idProduk"))
+												|| map.get("namaProduk").toString().toLowerCase()
+														.contains(Master.VISIT))
+												&& count2 < 2) {
+											count2 = count2 + Double.parseDouble(map.get("count").toString());
+										} else if (!Arrays.asList(Master.Produk.MONITORING_INTERVENSI)
+												.contains(map.get("idProduk"))
+												&& !map.get("namaProduk").toString().toLowerCase()
+														.contains(Master.VISIT)) {
+											count2 = count2 + Double.parseDouble(map.get("count").toString());
+										}
+									} else {
+										count2 = count2 + Double.parseDouble(map.get("count").toString());
+									}
 									dataCount2 = dataCount2 + 1;
 									if (dataCount2 == 1) {
 										mapResult2.putAll(map);
@@ -4569,7 +4599,22 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										&& (Double.valueOf(map.get("diskon").toString()) > 0
 												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
 														.valueOf(map.get("statusDiskon").toString()).equals(0)))) {
-									count1 = count1 + Double.parseDouble(map.get("count").toString());
+									if (drKkPerinatologiList.contains(idPegawai)) {
+										if ((Arrays.asList(Master.Produk.MONITORING_INTERVENSI)
+												.contains(map.get("idProduk"))
+												|| map.get("namaProduk").toString().toLowerCase()
+														.contains(Master.VISIT))
+												&& count1 < 2) {
+											count1 = count1 + Double.parseDouble(map.get("count").toString());
+										} else if (!Arrays.asList(Master.Produk.MONITORING_INTERVENSI)
+												.contains(map.get("idProduk"))
+												&& !map.get("namaProduk").toString().toLowerCase()
+														.contains(Master.VISIT)) {
+											count1 = count1 + Double.parseDouble(map.get("count").toString());
+										}
+									} else {
+										count1 = count1 + Double.parseDouble(map.get("count").toString());
+									}
 									dataCount1 = dataCount1 + 1;
 									if (dataCount1 == 1) {
 										mapResult1.putAll(map);
@@ -4578,7 +4623,22 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										&& Integer.parseInt(map.get("idKelas").toString()) == idKelas
 										&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
 										&& map.get("tanggal").toString().equals(tanggal)) {
-									count2 = count2 + Double.parseDouble(map.get("count").toString());
+									if (drKkPerinatologiList.contains(idPegawai)) {
+										if ((Arrays.asList(Master.Produk.MONITORING_INTERVENSI)
+												.contains(map.get("idProduk"))
+												|| map.get("namaProduk").toString().toLowerCase()
+														.contains(Master.VISIT))
+												&& count2 < 2) {
+											count2 = count2 + Double.parseDouble(map.get("count").toString());
+										} else if (!Arrays.asList(Master.Produk.MONITORING_INTERVENSI)
+												.contains(map.get("idProduk"))
+												&& !map.get("namaProduk").toString().toLowerCase()
+														.contains(Master.VISIT)) {
+											count2 = count2 + Double.parseDouble(map.get("count").toString());
+										}
+									} else {
+										count2 = count2 + Double.parseDouble(map.get("count").toString());
+									}
 									dataCount2 = dataCount2 + 1;
 									if (dataCount2 == 1) {
 										mapResult2.putAll(map);
diff --git a/jasamedika-config/src/main/resources/jdbc.development.properties b/jasamedika-config/src/main/resources/jdbc.development.properties
index 1d9ca0b9..b51392ca 100644
--- a/jasamedika-config/src/main/resources/jdbc.development.properties
+++ b/jasamedika-config/src/main/resources/jdbc.development.properties
@@ -8,11 +8,11 @@ hibernate.show_sql = true
 hikari.config.maximum.pool.size = 5
 
 # DB Development
-jdbc.url = jdbc:postgresql://192.168.12.3:5432/production_backup_18_06_2022
+jdbc.url = jdbc:postgresql://192.168.12.3:5432/backup_20230104
 jdbc.username = postgres
 jdbc.password = root
 jdbc.serverName = 192.168.12.3
-jdbc.databaseName = production_backup_18_06_2022
+jdbc.databaseName = backup_20230104
 jdbc.portNumber = 5432
 
 corePoolSizeAsyncConfigurer = 5