From 6ec433d13574b79f4ec76891770b711f148f8672 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 7 Feb 2024 14:42:18 +0700 Subject: [PATCH 1/2] Update JenisLogController.java Clean code --- .../controller/JenisLogController.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java index 66bb19c4..bede85d7 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLogController.java @@ -29,19 +29,19 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/log/jenis") public class JenisLogController { - private static final Logger LOGGER = getLogger(JenisLogController.class); + private static final Logger LOGGER = getLogger(JenisLogController.class); - @Autowired - private JenisLogService jenisLogService; + @Autowired + private JenisLogService jenisLogService; - @RequestMapping(method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) - public ResponseEntity addVO(@Valid @RequestBody List vos, HttpServletRequest request) { - try { - jenisLogService.save(vos); - return RestUtil.getJsonResponse(CREATED.getReasonPhrase(), CREATED); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Agama", e.getMessage()); - return RestUtil.getJsonHttptatus(INTERNAL_SERVER_ERROR); - } - } + @RequestMapping(method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity addVO(@Valid @RequestBody List vos, HttpServletRequest request) { + try { + jenisLogService.save(vos); + return RestUtil.getJsonResponse(CREATED.getReasonPhrase(), CREATED); + } catch (ServiceVOException e) { + LOGGER.error("Got exception {} when add jenis log", e.getMessage()); + return RestUtil.getJsonHttptatus(INTERNAL_SERVER_ERROR); + } + } } From 6d7b595a2566141f6745a8fade6d9dc0a3e5a397 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 12 Feb 2024 11:34:24 +0700 Subject: [PATCH 2/2] Update service pelayanan pasien Penyesuaian aturan remun kk radiologi di cathlab dan ok mendapatkan sesuai persentase ibs --- .../medifirst2000/constants/Master.java | 1 + .../impl/PelayananPasienServiceImpl.java | 114 +++++++++++++----- 2 files changed, 83 insertions(+), 32 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index 8ea78b57..d0d72d1a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -343,6 +343,7 @@ public final class Master { } public static final class Ruangan { + public static final Integer CATHLAB = 703; public static final Integer[] GENETIKA = { 277, 563, 587 }; public static final Integer[] ICU_NICU = { 328, 75, 707, 708 }; public static final int KLINIK_FALSE_EMERGENCY = 309; 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 2ff5d7d0..427dd3d7 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 @@ -530,6 +530,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(KK_PERINATOLOGI); List drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI); List drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA); + List drKkRadiologi = pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); @@ -545,11 +546,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List idsMonitoringHemodinamikGagalOrgan = splitDataSettingDatafixed( "idMonitoringHemodinamikGagalOrgan"); List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); - if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI).contains(idPegawai)) { + if (drKkPatologiAnatomiList.contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; } else if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_KLINIK).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPK; - } else if (pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI).contains(idPegawai)) { + } else if (drKkRadiologi.contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangRad; } else { listDetailJenisProduk = idsRegDJPMedisUtama; @@ -600,44 +601,55 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("hargaJasa", 0.0); } else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { d.put("hargaJasa", persenRemunDokterUmumHD / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { double persenJasa = persenOperator / 100; d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { double persenJasa = persenAsistenIBS / 100; d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { double persenJasa = persenAnestesi / 100; d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) + && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("hargaJasa", persenOperator / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("hargaJasa", persenAsistenIBS / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) + && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("hargaJasa", persenAnestesi / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { d.put("hargaJasa", persenOperator / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { d.put("hargaJasa", persenAnestesi / 100 * hargaJual); } else if (RADIOLOGI.equals(d.get("idDepartemen"))) { @@ -1122,6 +1134,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel listPelayananRemun.add(next); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); } + } else if (drKkRadiologi.contains(idPegawai) && (BEDAH_SENTRAL.equals(next.get("idDepartemen")) + || CATHLAB.equals(next.get("idRuangan")))) { + listPelayananRemun.add(next); + capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); } else { /* * Selain dokter-dokter kk pediatrik gawat darurat @@ -1239,6 +1255,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel listPelayananRemun.add(next); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); } + } else if (drKkRadiologi.contains(idPegawai) && (BEDAH_SENTRAL.equals(next.get("idDepartemen")) + || CATHLAB.equals(next.get("idRuangan")))) { + listPelayananRemun.add(next); + capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); } else { /* * Selain dokter-dokter kk pediatrik gawat darurat @@ -1353,6 +1373,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel */ listPelayananFfs.add(next); } + } else if (drKkRadiologi.contains(idPegawai) && (BEDAH_SENTRAL.equals(next.get("idDepartemen")) + || CATHLAB.equals(next.get("idRuangan")))) { + listPelayananFfs.add(next); } else { /* * Selain dokter-dokter kk pediatrik gawat darurat @@ -1819,7 +1842,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("persenJasa", persenRemunDokterUmumHD + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenRemunDokterUmumHD / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { @@ -1828,7 +1852,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { @@ -1837,7 +1862,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien")) && Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString())) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { @@ -1846,7 +1872,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("keterangan", "Dari " + persenTarifJasaBedah + "% tarif" + keteranganTambahan); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenJasa * persenTarifIBS * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) + && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("persenJasa", persenOperator + "%"); d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) @@ -1854,7 +1882,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenOperator / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("persenJasa", persenAsistenIBS + "%"); @@ -1863,7 +1892,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenAsistenIBS / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) + && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("persenJasa", persenAnestesi + "%"); d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) @@ -1871,17 +1902,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenAnestesi / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenOperator + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenOperator / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenAsistenIBS + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenAnestesi + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) @@ -2169,7 +2203,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("persenJasa", persenJasaDokterUmumHD + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenJasaDokterUmumHD / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) + && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("persenJasa", persenOperator + "%"); d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) @@ -2177,7 +2213,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenOperator / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("persenJasa", persenAsistenIBS + "%"); @@ -2186,7 +2223,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenAsistenIBS / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) + && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("persenJasa", persenAnestesi + "%"); d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) @@ -2194,17 +2233,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenAnestesi / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenOperator + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenOperator / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenAsistenIBS + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenAnestesi + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) @@ -2490,7 +2532,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("persenJasa", persenJasaDokterUmumHD + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenJasaDokterUmumHD / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) + && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("persenJasa", persenOperatorIBS + "%"); d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) @@ -2498,7 +2542,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenOperatorIBS / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("persenJasa", persenAsistenIBS + "%"); @@ -2507,7 +2552,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenAsistenIBS / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) + && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) { d.put("persenJasa", persenAnestesi + "%"); d.put("keterangan", "Dari " + (100.0 - Double.parseDouble(d.get("persenSayatan").toString())) @@ -2515,17 +2562,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenAnestesi / 100 * (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual))); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenOperatorIBS + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenOperatorIBS / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenAsistenIBS + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0) d.put("hargaJasa", persenAsistenIBS / 100 * hargaJual); - } else if (BEDAH_SENTRAL.equals(d.get("idDepartemen")) + } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) + || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { d.put("persenJasa", persenAnestesi + "%"); if (Double.parseDouble(d.get("hargaJasa").toString()) != 0.0)