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

Merge branch 'ade/logbook-kepdirjen8212026' into dev/no-cron

Browse Source
This commit is contained in:
adesyawal 2026-08-21 16:08:19 +07:00
commit 10c23e0ec8
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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