diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
index 75c48c3a..0ae3da22 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
@@ -572,8 +572,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				d.put("hargaJasa", persenRemunDokterPA / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (Master.Departemen.LABORATORIUM.equals(d.get("idDepartemen"))) {
 				d.put("hargaJasa", persenLaboratorium / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-			} else if (Master.Ruangan.ICU_PICU.equals(d.get("idRuangan"))
-					|| Master.Ruangan.NICU.equals(d.get("idRuangan"))) {
+			} else if ((Master.Ruangan.ICU_PICU.equals(d.get("idRuangan"))
+					|| Master.Ruangan.NICU.equals(d.get("idRuangan")))
+					&& !idsMonitoringIntervensi.contains(d.get("idProduk"))
+					&& !idsMonitoringHemodinamikGagalOrgan.contains(d.get("idProduk"))) {
 				double persenJasa = persenTindakan / 100;
 				d.put("hargaJasa", persenJasa * persenTarifICU * Double.parseDouble(d.get("hargaJual").toString()));
 			} else {
@@ -1442,6 +1444,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao
 				.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM);
+		List<Integer> idsMonitoringIntervensi = splitDataSettingDatafixed("idMonitoringIntervensi");
+		List<Integer> idsMonitoringHemodinamikGagalOrgan = splitDataSettingDatafixed(
+				"idMonitoringHemodinamikGagalOrgan");
 		/*
 		 * Set persen jasa dan harga jasa pasien bpjs di ibs, icu
 		 */
@@ -1519,8 +1524,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				d.put("persenJasa", persenLaboratorium.toString() + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenLaboratorium / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-			} else if (Master.Ruangan.ICU_PICU.equals(d.get("idRuangan"))
-					|| Master.Ruangan.NICU.equals(d.get("idRuangan"))) {
+			} else if ((Master.Ruangan.ICU_PICU.equals(d.get("idRuangan"))
+					|| Master.Ruangan.NICU.equals(d.get("idRuangan")))
+					&& !idsMonitoringIntervensi.contains(d.get("idProduk"))
+					&& !idsMonitoringHemodinamikGagalOrgan.contains(d.get("idProduk"))) {
 				double persenJasa = persenTindakan / 100;
 				d.put("persenJasa", persenTarifJasaICU.toString() + "% + " + persenTindakan.toString() + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)