From ad6482477c6c1ccb39f2beeeaaa41e37f77bbf05 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 7 Jun 2023 18:52:16 +0700 Subject: [PATCH] Update PelayananPasienServiceImpl.java Penyesuaian perubahan aturan proporsi kk umum sebagai asisten spesialis --- .../service/impl/PelayananPasienServiceImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 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 408731e8..b117cf7e 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 @@ -531,7 +531,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel */ d.put("hargaJasa", 0.0); } else if (drKsmUmumList.contains(idPegawai) - && Master.Ruangan.KLINIK_TERPADU_DIALISIS.equals(d.get("idRuangan")) && Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { d.put("hargaJasa", persenRemunDokterUmumHD / 100 * Double.parseDouble(d.get("hargaJual").toString())); } else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen")) @@ -1478,7 +1477,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel * Mapping persentase jasa remunerasi */ for (Map d : listData) { - if (drKsmUmumList.contains(idPegawai) && Master.Ruangan.KLINIK_TERPADU_DIALISIS.equals(d.get("idRuangan")) + if (drKsmUmumList.contains(idPegawai) && Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenRemunDokterUmumHD.toString() + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) @@ -1724,7 +1723,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel Double persenVisite = Double.parseDouble(GetSettingDataFixed("persenJasaVisiteDokter").toString()); Double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenJasaTindakanDokter").toString()); Double persenJasaDokterPA = Double.parseDouble(GetSettingDataFixed("persenJasaDokterPA").toString()); - Double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD").toString()); + Double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD").toString()); /* * Persiapan filter logic remunerasi */ @@ -1748,12 +1747,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenBPJS / 100 * Double.parseDouble(d.get("hargaJual").toString())); } else if (drKsmUmumList.contains(idPegawai) - && Master.Ruangan.KLINIK_TERPADU_DIALISIS.equals(d.get("idRuangan")) && Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { - d.put("persenJasa", persenRemunDokterUmumHD.toString() + "%"); + d.put("persenJasa", persenJasaDokterUmumHD.toString() + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", - persenRemunDokterUmumHD / 100 * Double.parseDouble(d.get("hargaJual").toString())); + persenJasaDokterUmumHD / 100 * Double.parseDouble(d.get("hargaJual").toString())); } else if (Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen")) && Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenOperatorIBS.toString() + "%");