salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Perbaikan Conflict

Browse Source
This commit is contained in:
adesyawal 2026-08-27 13:25:32 +07:00
parent 8be54aeb44
commit 44a061af6e
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
View File

@ -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
}
}
/*