From e80fdedd5c2b05b80a3184cd9f3c25b5397924cc Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 7 Jun 2023 11:27:00 +0700 Subject: [PATCH] Update PelayananPasienServiceImpl.java Rollback aturan reduksi tarif monttoring intensif --- .../service/impl/PelayananPasienServiceImpl.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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 7fb83873..7ab81b61 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 @@ -572,10 +572,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("hargaJasa", persenRemunDokterPA / 100 * Double.parseDouble(d.get("hargaJual").toString())); } else if (Master.Departemen.LABORATORIUM.equals(d.get("idDepartemen"))) { d.put("hargaJasa", persenLaboratorium / 100 * Double.parseDouble(d.get("hargaJual").toString())); - } else if ((Master.Ruangan.ICU_PICU.equals(d.get("idRuangan")) - || Master.Ruangan.NICU.equals(d.get("idRuangan"))) - && !idsMonitoringIntervensi.contains(d.get("idProduk")) - && !idsMonitoringHemodinamikGagalOrgan.contains(d.get("idProduk"))) { + } else if (Master.Ruangan.ICU_PICU.equals(d.get("idRuangan")) + || Master.Ruangan.NICU.equals(d.get("idRuangan"))) { double persenJasa = persenTindakan / 100; d.put("hargaJasa", persenJasa * persenTarifICU * Double.parseDouble(d.get("hargaJual").toString())); } else { @@ -1541,10 +1539,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("persenJasa", persenLaboratorium.toString() + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenLaboratorium / 100 * Double.parseDouble(d.get("hargaJual").toString())); - } else if ((Master.Ruangan.ICU_PICU.equals(d.get("idRuangan")) - || Master.Ruangan.NICU.equals(d.get("idRuangan"))) - && !idsMonitoringIntervensi.contains(d.get("idProduk")) - && !idsMonitoringHemodinamikGagalOrgan.contains(d.get("idProduk"))) { + } else if (Master.Ruangan.ICU_PICU.equals(d.get("idRuangan")) + || Master.Ruangan.NICU.equals(d.get("idRuangan"))) { double persenJasa = persenTindakan / 100; d.put("persenJasa", persenTarifJasaICU.toString() + "% + " + persenTindakan.toString() + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)