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 17c6adf2..30a4865f 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
@@ -36,7 +36,6 @@ import static com.jasamedika.medifirst2000.constants.Master.JenisProduk.OBAT_ALK
 import static com.jasamedika.medifirst2000.constants.Master.KONSUL_VISIT;
 import static com.jasamedika.medifirst2000.constants.Master.KategoryPegawai.DOKTER_LUAR;
 import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS;
-import static com.jasamedika.medifirst2000.constants.Master.Produk.PAKET_BAYI_TABUNG;
 import static com.jasamedika.medifirst2000.constants.Master.Ruangan.*;
 import static com.jasamedika.medifirst2000.constants.Master.SubUnitKerja.*;
 import static com.jasamedika.medifirst2000.constants.Master.TipePegawai.PURNA_WAKTU;
@@ -455,8 +454,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		double persenRemunDokterPA = Double.parseDouble(GetSettingDataFixed("persenRemunDokterPA"));
 		double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD"));
 		double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika"));
-		double persenRemunOperatorPBT = Double.parseDouble(GetSettingDataFixed("persenRemunOperatorPBT"));
-		double persenRemunAnestesiPBT = Double.parseDouble(GetSettingDataFixed("persenRemunAnestesiPBT"));
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
@@ -521,16 +518,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				 * Untuk semua klaim di ruangan klinik karyawan
 				 */
 				d.put("hargaJasa", 0.0);
-			} else if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
-					&& PAKET_BAYI_TABUNG.equals(d.get("idProduk"))) {
-				double persenJasa = persenOperator / 100;
-				double persenPBT = persenRemunOperatorPBT / 100;
-				d.put("hargaJasa", persenJasa * persenPBT * Double.parseDouble(d.get("hargaJual").toString()));
-			} else if (DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
-					&& PAKET_BAYI_TABUNG.equals(d.get("idProduk"))) {
-				double persenJasa = persenAnestesi / 100;
-				double persenPBT = persenRemunAnestesiPBT / 100;
-				d.put("hargaJasa", persenJasa * persenPBT * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				d.put("hargaJasa", persenRemunDokterUmumHD / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
@@ -1445,8 +1432,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		double persenRemunDokterPA = Double.parseDouble(GetSettingDataFixed("persenRemunDokterPA"));
 		double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD"));
 		double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika"));
-		double persenRemunOperatorPBT = Double.parseDouble(GetSettingDataFixed("persenRemunOperatorPBT"));
-		double persenRemunAnestesiPBT = Double.parseDouble(GetSettingDataFixed("persenRemunAnestesiPBT"));
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
@@ -1464,20 +1449,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		 * Mapping persentase jasa remunerasi
 		 */
 		for (Map<String, Object> d : listData) {
-			if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && PAKET_BAYI_TABUNG.equals(d.get("idProduk"))) {
-				double persenJasa = persenOperator / 100;
-				double persenPBT = persenRemunOperatorPBT / 100;
-				d.put("persenJasa", persenRemunOperatorPBT + "% + " + persenOperator + "%");
-				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-					d.put("hargaJasa", persenPBT * persenJasa * Double.parseDouble(d.get("hargaJual").toString()));
-			} else if (DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
-					&& PAKET_BAYI_TABUNG.equals(d.get("idProduk"))) {
-				double persenJasa = persenAnestesi / 100;
-				double persenPBT = persenRemunAnestesiPBT / 100;
-				d.put("persenJasa", persenRemunAnestesiPBT + "% + " + persenAnestesi + "%");
-				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-					d.put("hargaJasa", persenPBT * persenJasa * Double.parseDouble(d.get("hargaJual").toString()));
-			} else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
+			if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenRemunDokterUmumHD + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa",
@@ -1757,8 +1729,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		double persenJasaDokterPA = Double.parseDouble(GetSettingDataFixed("persenJasaDokterPA"));
 		double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD"));
 		double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika"));
-		double persenJasaOperatorPBT = Double.parseDouble(GetSettingDataFixed("persenJasaOperatorPBT"));
-		double persenJasaAnestesiPBT = Double.parseDouble(GetSettingDataFixed("persenJasaAnestesiPBT"));
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
@@ -1784,20 +1754,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				 */
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenBPJS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-			} else if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
-					&& PAKET_BAYI_TABUNG.equals(d.get("idProduk"))) {
-				double persenJasa = persenOperator / 100;
-				double persenPBT = persenJasaOperatorPBT / 100;
-				d.put("persenJasa", persenJasaOperatorPBT + "% + " + persenOperator + "%");
-				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-					d.put("hargaJasa", persenPBT * persenJasa * Double.parseDouble(d.get("hargaJual").toString()));
-			} else if (DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
-					&& PAKET_BAYI_TABUNG.equals(d.get("idProduk"))) {
-				double persenJasa = persenAnestesi / 100;
-				double persenPBT = persenJasaAnestesiPBT / 100;
-				d.put("persenJasa", persenJasaAnestesiPBT + "% + " + persenAnestesi + "%");
-				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-					d.put("hargaJasa", persenPBT * persenJasa * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenJasaDokterUmumHD + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)