From 44a061af6ee980d4acacaa1da5166bcd290a4486 Mon Sep 17 00:00:00 2001 From: adesyawal <52590145+adesyawal@users.noreply.github.com> Date: Thu, 27 Aug 2026 13:25:32 +0700 Subject: [PATCH] Perbaikan Conflict --- .../service/impl/PelayananPasienServiceImpl.java | 16 ---------------- 1 file changed, 16 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 66c8567f..c440c536 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 @@ -2489,21 +2489,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("persenJasa", persenLaboratorium + "%"); d.put("keterangan", keteranganTambahan + hargaJasa.getKeterangan()); d.put("hargaJasa", hargaJasa.getNilai()); -<<<<<<< HEAD - } else if (CommonUtil.isNotNullOrEmpty(d.get("idRuangan")) - && Arrays.asList(ICU_NICU).contains(Integer.parseInt(d.get("idRuangan").toString()))) { - double persenJasa = persenTindakan / 100; - RemunHargaJasaDto hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d, false); - d.put("persenJasa", persenTindakan + "%"); - d.put("keterangan", "Tarif jasa ICU (" + persenTarifJasaICU + "%) " + keteranganTambahan - + hargaJasa.getKeterangan()); - d.put("hargaJasa", hargaJasa.getNilai()); - } else { - RemunHargaJasaDto hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true); - d.put("persenJasa", persenTindakan + "%"); - d.put("keterangan", keteranganTambahan + 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()))) { if ( (date.before(new Date(1785542400000L)) || date.equals(new Date(1785542400000L))) && listRuanganIntensifRemun.contains(Integer.parseInt(d.get("idRuangan").toString())) ) { @@ -2541,7 +2526,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("keterangan", hargaJasa.getKeterangan()); d.put("hargaJasa", hargaJasa.getNilai()); } ->>>>>>> ade/penyesuaian-kepdirjen-agustus-2026 } } /*