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 9c36b169..9a236f58 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
@@ -534,31 +534,29 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					&& Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
 				d.put("hargaJasa", persenRemunDokterUmumHD / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
-					&& Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(d.get("idKelompokPasien"))) {
-				/*
-				 * Set harga jasa pasien bpjs di ibs
-				 */
-				if (Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
-					double persenJasa = persenOperatorIBS / 100;
-					d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
-				} else if (Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
-					double persenJasa = persenAsistenIBS / 100;
-					d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
-				} else if (Master.JenisPetugasPelaksana.DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
-					double persenJasa = persenAnestesiIBS / 100;
-					d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
-				}
-			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))) {
-				/*
-				 * Set harga jasa di ibs selain pasien bpjs
-				 */
-				if (Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
-					d.put("hargaJasa", persenOperatorIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				} else if (Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
-					d.put("hargaJasa", persenAsistenIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				} else if (Master.JenisPetugasPelaksana.DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
-					d.put("hargaJasa", persenAnestesiIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				}
+					&& Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(d.get("idKelompokPasien"))
+					&& Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
+				double persenJasa = persenOperatorIBS / 100;
+				d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
+			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					&& Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(d.get("idKelompokPasien"))
+					&& Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
+				double persenJasa = persenAsistenIBS / 100;
+				d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
+			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					&& Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(d.get("idKelompokPasien"))
+					&& Master.JenisPetugasPelaksana.DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
+				double persenJasa = persenAnestesiIBS / 100;
+				d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
+			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					&& Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
+				d.put("hargaJasa", persenOperatorIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
+			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					&& Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
+				d.put("hargaJasa", persenAsistenIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
+			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					&& Master.JenisPetugasPelaksana.DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
+				d.put("hargaJasa", persenAnestesiIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (Master.Departemen.RADIOLOGI.equals(d.get("idDepartemen"))) {
 				d.put("hargaJasa", persenRadiologi / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (Master.Departemen.REHAB_MEDIK.equals(d.get("idDepartemen"))) {
@@ -1480,43 +1478,41 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					d.put("hargaJasa",
 							persenRemunDokterUmumHD / 100 * Double.parseDouble(d.get("hargaJual").toString()));
 			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
-					&& Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(d.get("idKelompokPasien"))) {
-				if (Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
-					double persenJasa = persenOperatorIBS / 100;
-					d.put("persenJasa", persenTarifJasaBedah.toString() + "% + " + persenOperatorIBS.toString() + "%");
-					if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-						d.put("hargaJasa",
-								persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
-				} else if (Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
-					double persenJasa = persenAsistenIBS / 100;
-					d.put("persenJasa", persenTarifJasaBedah.toString() + "% + " + persenAsistenIBS.toString() + "%");
-					if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-						d.put("hargaJasa",
-								persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
-				} else if (Master.JenisPetugasPelaksana.DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
-					double persenJasa = persenAnestesiIBS / 100;
-					d.put("persenJasa", persenTarifJasaBedah.toString() + "% + " + persenAnestesiIBS.toString() + "%");
-					if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-						d.put("hargaJasa",
-								persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
-				}
-			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))) {
-				/*
-				 * Set persen jasa dan harga jasa di ibs selain pasien bpjs
-				 */
-				if (Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
-					d.put("persenJasa", persenOperatorIBS.toString() + "%");
-					if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-						d.put("hargaJasa", persenOperatorIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				} else if (Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
-					d.put("persenJasa", persenAsistenIBS.toString() + "%");
-					if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-						d.put("hargaJasa", persenAsistenIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				} else if (Master.JenisPetugasPelaksana.DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
-					d.put("persenJasa", persenAnestesiIBS.toString() + "%");
-					if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
-						d.put("hargaJasa", persenAnestesiIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
-				}
+					&& Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(d.get("idKelompokPasien"))
+					&& Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
+				double persenJasa = persenOperatorIBS / 100;
+				d.put("persenJasa", persenTarifJasaBedah.toString() + "% + " + persenOperatorIBS.toString() + "%");
+				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
+					d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
+			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					&& Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(d.get("idKelompokPasien"))
+					&& Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
+				double persenJasa = persenAsistenIBS / 100;
+				d.put("persenJasa", persenTarifJasaBedah.toString() + "% + " + persenAsistenIBS.toString() + "%");
+				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
+					d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
+			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					&& Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(d.get("idKelompokPasien"))
+					&& Master.JenisPetugasPelaksana.DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
+				double persenJasa = persenAnestesiIBS / 100;
+				d.put("persenJasa", persenTarifJasaBedah.toString() + "% + " + persenAnestesiIBS.toString() + "%");
+				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
+					d.put("hargaJasa", persenJasa * persenTarifIBS * Double.parseDouble(d.get("hargaJual").toString()));
+			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					&& Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
+				d.put("persenJasa", persenOperatorIBS.toString() + "%");
+				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
+					d.put("hargaJasa", persenOperatorIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
+			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					&& Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
+				d.put("persenJasa", persenAsistenIBS.toString() + "%");
+				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)
+					d.put("hargaJasa", persenAsistenIBS / 100 * Double.parseDouble(d.get("hargaJual").toString()));
+			} else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
+					&& Master.JenisPetugasPelaksana.DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
+				d.put("persenJasa", persenAnestesiIBS.toString() + "%");
+				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"))) {
 				d.put("persenJasa", persenRadiologi.toString() + "%");
 				if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)