jasamedika-bridging/src/main/webapp/WEB-INF/web.xml

@@ -15,7 +15,7 @@
     </context-param>
     <context-param>
         <param-name>spring.profiles.default</param-name>
-        <param-value>bridging</param-value>
+        <param-value>localhost</param-value>
     </context-param>
     
     <listener>

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java

@@ -2298,8 +2298,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		double persenKonsultasi = toDoubleSettingFix("persenRemunKonsultasiDokter", tglAkhir);
 		double persenVisite = toDoubleSettingFix("persenRemunVisiteDokter", tglAkhir);
 		double persenTindakan = toDoubleSettingFix("persenRemunTindakanDokter", tglAkhir);
-		double persenTindakanRuangIntensif = toDoubleSettingFix("persenRemunTindakanDokterRuangIntensif", tglAkhir);
-		List<Integer> listRuanganIntensifRemun = toListIntegerSettingFix("listRuanganIntensifRemun", tglAkhir);
 		double persenTarifJasaBedah = toDoubleSettingFix("persenTarifJasaBedah", tglAkhir);
 		double persenTarifJasaICU = toDoubleSettingFix("persenTarifJasaICU", tglAkhir);
 		double persenRemunDokterPA = toDoubleSettingFix("persenRemunDokterPA", tglAkhir);
@@ -2509,33 +2507,18 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 				d.put("persenJasa", persenLaboratorium + "%");
 				d.put("keterangan", hargaJasa.getKeterangan());
 				d.put("hargaJasa", hargaJasa.getNilai());
-			} else if (CommonUtil.isNotNullOrEmpty(d.get("idRuangan")) && Arrays.asList(ICU_NICU).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
+			} else if (CommonUtil.isNotNullOrEmpty(d.get("idRuangan"))
-				// Penyesuaian Perhitungan Remunerasi
+					&& Arrays.asList(ICU_NICU).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
-				if( listRuanganIntensifRemun.contains(Integer.parseInt(d.get("idRuangan").toString())) ){
+				double persenJasa = persenTindakan / 100;
-					double persenJasa = persenTindakanRuangIntensif / 100;
+				RemunHargaJasaDto hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d);
-					RemunHargaJasaDto hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d);
+				d.put("persenJasa", persenTindakan + "%");
-					d.put("persenJasa", persenTindakanRuangIntensif + "%");
+				d.put("keterangan", "Tarif Jasa (" + persenTarifJasaICU + "%)" + hargaJasa.getKeterangan());
-					d.put("keterangan", "Tarif Jasa (" + persenTarifJasaICU + "%)" + hargaJasa.getKeterangan());
+				d.put("hargaJasa", hargaJasa.getNilai());
-					d.put("hargaJasa", hargaJasa.getNilai());
-				}else{
-					double persenJasa = persenTindakan / 100;
-					RemunHargaJasaDto hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d);
-					d.put("persenJasa", persenTindakan + "%");
-					d.put("keterangan", "Tarif Jasa (" + persenTarifJasaICU + "%)" + hargaJasa.getKeterangan());
-					d.put("hargaJasa", hargaJasa.getNilai());
-				}
 			} else {
-				if( listRuanganIntensifRemun.contains(Integer.parseInt(d.get("idRuangan").toString())) ){
+				RemunHargaJasaDto hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
-					RemunHargaJasaDto hargaJasa = hargaJasa(persenTindakanRuangIntensif / 100, hargaJual, d);
+				d.put("persenJasa", persenTindakan + "%");
-					d.put("persenJasa", persenTindakanRuangIntensif + "%");
+				d.put("keterangan", hargaJasa.getKeterangan());
-					d.put("keterangan", hargaJasa.getKeterangan());
+				d.put("hargaJasa", hargaJasa.getNilai());
-					d.put("hargaJasa", hargaJasa.getNilai());
-				}else{
-					RemunHargaJasaDto hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
-					d.put("persenJasa", persenTindakan + "%");
-					d.put("keterangan", hargaJasa.getKeterangan());
-					d.put("hargaJasa", hargaJasa.getNilai());
-				}
 			}
 		}
 		/*