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 2fa9fb67..cdebfdbe 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
@@ -466,9 +466,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		Double persenTarifJasaICU = Double.parseDouble(GetSettingDataFixed("persenTarifJasaICU").toString());
 		Double persenRemunDokterPA = Double.parseDouble(GetSettingDataFixed("persenRemunDokterPA").toString());
 		Double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD").toString());
-		Double persenRemunAnestesiRadiologi = Double
-				.parseDouble(GetSettingDataFixed("persenRemunAnestesiRadiologi").toString());
-
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
@@ -564,13 +561,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					d.put("hargaJasa", persenAnestesiIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 				}
 			} else if (Master.Departemen.RADIOLOGI.equals(d.get("idDepartemen"))) {
-				if (drAnastesiList.contains(idPegawai)
-						&& Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
-					d.put("hargaJasa",
-							persenRemunAnestesiRadiologi / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				} else {
-					d.put("hargaJasa", persenRadiologi / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				}
+				d.put("hargaJasa", persenRadiologi / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (Master.Departemen.REHAB_MEDIK.equals(d.get("idDepartemen"))) {
 				d.put("hargaJasa", persenRehabMedik / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (Master.GolonganProduk.KONSULTASI.equals(d.get("idGolonganProduk"))) {
@@ -1461,15 +1452,12 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		Double persenTarifJasaICU = Double.parseDouble(GetSettingDataFixed("persenTarifJasaICU").toString());
 		Double persenRemunDokterPA = Double.parseDouble(GetSettingDataFixed("persenRemunDokterPA").toString());
 		Double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD").toString());
-		Double persenRemunAnestesiRadiologi = Double
-				.parseDouble(GetSettingDataFixed("persenRemunAnestesiRadiologi").toString());
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao
 				.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM);
-		List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI);
 		/*
 		 * Set persen jasa dan harga jasa pasien bpjs di ibs, icu
 		 */
@@ -1524,17 +1512,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						d.put("hargaJasa", persenAnestesiIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 				}
 			} else if (Master.Departemen.RADIOLOGI.equals(d.get("idDepartemen"))) {
-				if (drAnastesiList.contains(idPegawai)
-						&& Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
-					d.put("persenJasa", persenRemunAnestesiRadiologi.toString() + "%");
-					if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-						d.put("hargaJasa",
-								persenRemunAnestesiRadiologi / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				} else {
-					d.put("persenJasa", persenRadiologi.toString() + "%");
-					if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-						d.put("hargaJasa", persenRadiologi / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				}
+				d.put("persenJasa", persenRadiologi.toString() + "%");
+				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
+					d.put("hargaJasa", persenRadiologi / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (Master.Departemen.REHAB_MEDIK.equals(d.get("idDepartemen"))) {
 				d.put("persenJasa", persenRehabMedik.toString() + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
@@ -1734,15 +1714,12 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		Double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenJasaTindakanDokter").toString());
 		Double persenJasaDokterPA = Double.parseDouble(GetSettingDataFixed("persenJasaDokterPA").toString());
 		Double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD").toString());
-		Double persenJasaAnestesiRadiologi = Double
-				.parseDouble(GetSettingDataFixed("persenJasaAnestesiRadiologi").toString());
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao
 				.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM);
-		List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI);
 		/*
 		 * Mapping persentase jasa remunerasi
 		 */
@@ -1782,17 +1759,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenAnestesiIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (Master.Departemen.RADIOLOGI.equals(d.get("idDepartemen"))) {
-				if (drAnastesiList.contains(idPegawai)
-						&& Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
-					d.put("persenJasa", persenJasaAnestesiRadiologi.toString() + "%");
-					if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-						d.put("hargaJasa",
-								persenJasaAnestesiRadiologi / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				} else {
-					d.put("persenJasa", persenRadiologi.toString() + "%");
-					if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-						d.put("hargaJasa", persenRadiologi / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				}
+				d.put("persenJasa", persenRadiologi.toString() + "%");
+				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
+					d.put("hargaJasa", persenRadiologi / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (Master.Departemen.REHAB_MEDIK.equals(d.get("idDepartemen"))) {
 				d.put("persenJasa", persenRehabMedik.toString() + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)