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 8ea78b57..d0d72d1a 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
@@ -343,6 +343,7 @@ public final class Master {
 	}
 
 	public static final class Ruangan {
+		public static final Integer CATHLAB = 703;
 		public static final Integer[] GENETIKA = { 277, 563, 587 };
 		public static final Integer[] ICU_NICU = { 328, 75, 707, 708 };
 		public static final int KLINIK_FALSE_EMERGENCY = 309;
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 7b0bc2c7..645a0b7f 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
@@ -530,6 +530,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		List<Integer> drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(KK_PERINATOLOGI);
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
 		List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
+		List<Integer> drKkRadiologi = pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI);
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
 		List<Integer> idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk");
 		List<Integer> idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama");
@@ -545,11 +546,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 		List<Integer> idsMonitoringHemodinamikGagalOrgan = splitDataSettingDatafixed(
 				"idMonitoringHemodinamikGagalOrgan");
 		List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
-		if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI).contains(idPegawai)) {
+		if (drKkPatologiAnatomiList.contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPA;
 		} else if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_KLINIK).contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangPK;
-		} else if (pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI).contains(idPegawai)) {
+		} else if (drKkRadiologi.contains(idPegawai)) {
 			listDetailJenisProduk = idsRegDJPPenunjangRad;
 		} else {
 			listDetailJenisProduk = idsRegDJPMedisUtama;
@@ -601,44 +602,55 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				d.put("hargaJasa", 0.0);
 			} else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				d.put("hargaJasa", persenRemunDokterUmumHD / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
 					&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
 					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
 				double persenJasa = persenOperator / 100;
 				d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
 					&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				double persenJasa = persenAsistenIBS / 100;
 				d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
 					&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
 					&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
 				double persenJasa = persenAnestesi / 100;
 				d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
+					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("hargaJasa", persenOperator / 100
 						* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("hargaJasa", persenAsistenIBS / 100
 						* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
+					&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("hargaJasa", persenAnestesi / 100
 						* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
 				d.put("hargaJasa", persenOperator / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
 				d.put("hargaJasa", persenAnestesi / 100 * hargaJual);
 			} else if (RADIOLOGI.equals(d.get("idDepartemen"))) {
@@ -1123,6 +1135,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 							listPelayananRemun.add(next);
 							capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
 						}
+					} else if (drKkRadiologi.contains(idPegawai) && (BEDAH_SENTRAL.equals(next.get("idDepartemen"))
+							|| CATHLAB.equals(next.get("idRuangan")))) {
+						listPelayananRemun.add(next);
+						capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
 					} else {
 						/*
 						 * Selain dokter-dokter kk pediatrik gawat darurat
@@ -1240,6 +1256,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 							listPelayananRemun.add(next);
 							capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
 						}
+					} else if (drKkRadiologi.contains(idPegawai) && (BEDAH_SENTRAL.equals(next.get("idDepartemen"))
+							|| CATHLAB.equals(next.get("idRuangan")))) {
+						listPelayananRemun.add(next);
+						capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
 					} else {
 						/*
 						 * Selain dokter-dokter kk pediatrik gawat darurat
@@ -1354,6 +1374,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 							 */
 							listPelayananFfs.add(next);
 						}
+					} else if (drKkRadiologi.contains(idPegawai) && (BEDAH_SENTRAL.equals(next.get("idDepartemen"))
+							|| CATHLAB.equals(next.get("idRuangan")))) {
+						listPelayananFfs.add(next);
 					} else {
 						/*
 						 * Selain dokter-dokter kk pediatrik gawat darurat
@@ -1820,7 +1843,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				d.put("persenJasa", persenRemunDokterUmumHD + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenRemunDokterUmumHD / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
 					&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
 					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
@@ -1829,7 +1853,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan);
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
 					&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
@@ -1838,7 +1863,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan);
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
 					&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
 					&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
@@ -1847,7 +1873,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan);
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
+					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("persenJasa", persenOperator + "%");
 				d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
@@ -1855,7 +1883,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenOperator / 100
 							* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("persenJasa", persenAsistenIBS + "%");
@@ -1864,7 +1893,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenAsistenIBS / 100
 							* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
+					&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("persenJasa", persenAnestesi + "%");
 				d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
@@ -1872,17 +1903,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenAnestesi / 100
 							* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenOperator + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenOperator / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenAsistenIBS + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenAnestesi + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
@@ -2170,7 +2204,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				d.put("persenJasa", persenJasaDokterUmumHD + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenJasaDokterUmumHD / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
+					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("persenJasa", persenOperator + "%");
 				d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
@@ -2178,7 +2214,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenOperator / 100
 							* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("persenJasa", persenAsistenIBS + "%");
@@ -2187,7 +2224,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenAsistenIBS / 100
 							* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
+					&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("persenJasa", persenAnestesi + "%");
 				d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
@@ -2195,17 +2234,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenAnestesi / 100
 							* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenOperator + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenOperator / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenAsistenIBS + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenAnestesi + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
@@ -2491,7 +2533,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				d.put("persenJasa", persenJasaDokterUmumHD + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenJasaDokterUmumHD / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
+					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("persenJasa", persenOperatorIBS + "%");
 				d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
@@ -2499,7 +2543,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenOperatorIBS / 100
 							* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("persenJasa", persenAsistenIBS + "%");
@@ -2508,7 +2553,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenAsistenIBS / 100
 							* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
+					&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
 					&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
 				d.put("persenJasa", persenAnestesi + "%");
 				d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString()))
@@ -2516,17 +2563,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenAnestesi / 100
 							* (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)));
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenOperatorIBS + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenOperatorIBS / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenAsistenIBS + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
 					d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual);
-			} else if (BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+			} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
 					&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
 				d.put("persenJasa", persenAnestesi + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java
index 66bb19c4..bede85d7 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java
@@ -29,19 +29,19 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RestController
 @RequestMapping("/log/jenis")
 public class JenisLogController {
-    private static final Logger LOGGER = getLogger(JenisLogController.class);
+	private static final Logger LOGGER = getLogger(JenisLogController.class);
 
-    @Autowired
-    private JenisLogService jenisLogService;
+	@Autowired
+	private JenisLogService jenisLogService;
 
-    @RequestMapping(method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> addVO(@Valid @RequestBody List<JenisLogVO> vos, HttpServletRequest request) {
-        try {
-            jenisLogService.save(vos);
-            return RestUtil.getJsonResponse(CREATED.getReasonPhrase(), CREATED);
-        } catch (ServiceVOException e) {
-            LOGGER.error("Got exception {} when add Agama", e.getMessage());
-            return RestUtil.getJsonHttptatus(INTERNAL_SERVER_ERROR);
-        }
-    }
+	@RequestMapping(method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
+	public ResponseEntity<String> addVO(@Valid @RequestBody List<JenisLogVO> vos, HttpServletRequest request) {
+		try {
+			jenisLogService.save(vos);
+			return RestUtil.getJsonResponse(CREATED.getReasonPhrase(), CREATED);
+		} catch (ServiceVOException e) {
+			LOGGER.error("Got exception {} when add jenis log", e.getMessage());
+			return RestUtil.getJsonHttptatus(INTERNAL_SERVER_ERROR);
+		}
+	}
 }