From 79b489de054a33d1b74f33e9340e4700d41a1062 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 6 Feb 2024 14:44:24 +0700 Subject: [PATCH 1/3] Update service slip gaji Penyesuaian dihapusnya penerimaan dan potongan remunerasi operasi di fitur slip gaji --- .../service/impl/ReportServiceImpl.java | 18 +- .../medifirst2000/dto/SlipHeaderDto.java | 103 +---------- .../medifirst2000/dto/SlipPenerimaanDto.java | 4 - .../medifirst2000/dto/SlipPotonganDto.java | 4 - .../WEB-INF/templates/jrxml/slipGaji.jrxml | 167 +++++++----------- 5 files changed, 70 insertions(+), 226 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index bfa1e99a..f8170f95 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -3221,7 +3221,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("pembulatan", "-"); result.put("remunerasiKinerja", "-"); result.put("feeForService", "-"); - result.put("remunerasiOperasional", "-"); result.put("kelebihanJamKerja", "-"); result.put("remunerasiManajerial", "-"); result.put("remunerasiTambahanDiklitjar", "-"); @@ -3238,7 +3237,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("simpananWajibKoperasiGaji", "-"); result.put("pinjamanKoperasiGaji", "-"); result.put("potonganPphRemunerasi", "-"); - result.put("potonganPphRemunerasiOperasional", "-"); result.put("potonganObat", "-"); result.put("potonganRawatInap", "-"); result.put("potonganRawatJalan", "-"); @@ -3301,8 +3299,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("remunerasiKinerja", nf.format(k.getNominal())); } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { result.put("feeForService", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { - result.put("remunerasiOperasional", nf.format(k.getNominal())); } else if (Master.KomponenGaji.KELEBIHAN_JAM_KERJA.equals(k.getIdKomponen())) { result.put("kelebihanJamKerja", nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_MANAJERIAL.equals(k.getIdKomponen())) { @@ -3335,8 +3331,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic result.put("pinjamanKoperasiGaji", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) { result.put("potonganPphRemunerasi", nf.format(k.getNominal())); - } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { - result.put("potonganPphRemunerasiOperasional", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) { result.put("potonganObat", nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) { @@ -3476,8 +3470,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic penerimaanDtoBuilder.remunerasiKinerja(nf.format(k.getNominal())); } else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) { penerimaanDtoBuilder.feeForService(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { - penerimaanDtoBuilder.remunerasiOperasional(nf.format(k.getNominal())); } else if (Master.KomponenGaji.KELEBIHAN_JAM_KERJA.equals(k.getIdKomponen())) { penerimaanDtoBuilder.kelebihanJamKerja(nf.format(k.getNominal())); } else if (Master.KomponenGaji.REMUNERASI_MANAJERIAL.equals(k.getIdKomponen())) { @@ -3510,8 +3502,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic potonganDtoBuilder.pinjamanKoperasiGaji(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganPphRemunerasi(nf.format(k.getNominal())); - } else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) { - potonganDtoBuilder.potonganPphRemunerasiOperasional(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) { potonganDtoBuilder.potonganObat(nf.format(k.getNominal())); } else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) { @@ -3555,10 +3545,10 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic jumlahPenerimaanBersih = jumlahGajiBersih.add(jumlahRemunerasiBersih).add(jumlahUangMakanBersih); jumlahDtoBuilder.jumlahPenerimaanBersih(nf.format(jumlahPenerimaanBersih)); } - resultBuilder.pegawaiDto(pegawaiDtoBuilder.build()); - resultBuilder.penerimaanDto(penerimaanDtoBuilder.build()); - resultBuilder.potonganDto(potonganDtoBuilder.build()); - resultBuilder.jumlahDto(jumlahDtoBuilder.build()); + resultBuilder.pegawai(pegawaiDtoBuilder.build()); + resultBuilder.penerimaan(penerimaanDtoBuilder.build()); + resultBuilder.potongan(potonganDtoBuilder.build()); + resultBuilder.jumlah(jumlahDtoBuilder.build()); } SlipHeaderDto result = resultBuilder.build(); if (CommonUtil.isNullOrEmpty(result.getPegawai())) { diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java index 44609b85..95e3638c 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipHeaderDto.java @@ -4,11 +4,17 @@ package com.jasamedika.medifirst2000.dto; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.*; /** * @author Salman * @since May 16th, 2023 */ +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder public class SlipHeaderDto { @Caption(value = "Pegawai") private SlipPegawaiDto pegawai; @@ -24,101 +30,4 @@ public class SlipHeaderDto { @Caption(value = "Print") private String print; - - public SlipHeaderDto() { - } - - public SlipHeaderDto(SlipPegawaiDto pegawai, SlipPenerimaanDto penerimaan, SlipPotonganDto potongan, - SlipJumlahDto jumlah, String print) { - super(); - this.pegawai = pegawai; - this.penerimaan = penerimaan; - this.potongan = potongan; - this.jumlah = jumlah; - this.print = print; - } - - public SlipPegawaiDto getPegawai() { - return pegawai; - } - - public void setPegawai(SlipPegawaiDto pegawai) { - this.pegawai = pegawai; - } - - public SlipPenerimaanDto getPenerimaan() { - return penerimaan; - } - - public void setPenerimaan(SlipPenerimaanDto penerimaan) { - this.penerimaan = penerimaan; - } - - public SlipPotonganDto getPotongan() { - return potongan; - } - - public void setPotongan(SlipPotonganDto potongan) { - this.potongan = potongan; - } - - public SlipJumlahDto getJumlah() { - return jumlah; - } - - public void setJumlah(SlipJumlahDto jumlah) { - this.jumlah = jumlah; - } - - public String getPrint() { - return print; - } - - public void setPrint(String print) { - this.print = print; - } - - public static SlipHeaderDtoBuilder builder() { - return new SlipHeaderDtoBuilder(); - } - - public static class SlipHeaderDtoBuilder { - private SlipPegawaiDto pegawai; - private SlipPenerimaanDto penerimaan; - private SlipPotonganDto potongan; - private SlipJumlahDto jumlah; - private String print; - - public SlipHeaderDtoBuilder() { - } - - public SlipHeaderDtoBuilder pegawaiDto(final SlipPegawaiDto pegawai) { - this.pegawai = pegawai; - return this; - } - - public SlipHeaderDtoBuilder penerimaanDto(final SlipPenerimaanDto penerimaan) { - this.penerimaan = penerimaan; - return this; - } - - public SlipHeaderDtoBuilder potonganDto(final SlipPotonganDto potongan) { - this.potongan = potongan; - return this; - } - - public SlipHeaderDtoBuilder jumlahDto(final SlipJumlahDto jumlah) { - this.jumlah = jumlah; - return this; - } - - public SlipHeaderDtoBuilder print(final String print) { - this.print = print; - return this; - } - - public SlipHeaderDto build() { - return new SlipHeaderDto(this.pegawai, this.penerimaan, this.potongan, this.jumlah, this.print); - } - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java index 8aa0f018..0113760c 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java @@ -61,10 +61,6 @@ public class SlipPenerimaanDto { @Builder.Default private String feeForService = "-"; - @Caption(value = "Remunerasi Operasional") - @Builder.Default - private String remunerasiOperasional = "-"; - @Caption(value = "Kelebihan Jam Kerja") @Builder.Default private String kelebihanJamKerja = "-"; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java index 8dddb975..bfb15512 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java @@ -57,10 +57,6 @@ public class SlipPotonganDto { @Builder.Default private String potonganPphRemunerasi = "-"; - @Caption(value = "Potongan PPH Remunerasi Operasional") - @Builder.Default - private String potonganPphRemunerasiOperasional = "-"; - @Caption(value = "Potongan Obat") @Builder.Default private String potonganObat = "-"; diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml index 041e9962..21290ed7 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml @@ -18,7 +18,6 @@ - @@ -30,7 +29,6 @@ - @@ -65,7 +63,7 @@ - + @@ -966,52 +964,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1021,7 +974,7 @@ - + @@ -1047,7 +1000,7 @@ - + @@ -1057,7 +1010,7 @@ - + @@ -1068,7 +1021,7 @@ - + @@ -1083,7 +1036,7 @@ - + @@ -1093,7 +1046,7 @@ - + @@ -1104,7 +1057,7 @@ - + @@ -1119,7 +1072,7 @@ - + @@ -1131,7 +1084,7 @@ - + @@ -1141,7 +1094,7 @@ - + @@ -1157,7 +1110,7 @@ - + @@ -1169,7 +1122,7 @@ - + @@ -1179,7 +1132,7 @@ - + @@ -1195,7 +1148,7 @@ - + @@ -1205,7 +1158,7 @@ - + @@ -1213,7 +1166,7 @@ - + @@ -1229,7 +1182,7 @@ - + @@ -1239,7 +1192,7 @@ - + @@ -1250,7 +1203,7 @@ - + @@ -1261,7 +1214,7 @@ - + @@ -1276,7 +1229,7 @@ - + @@ -1289,7 +1242,7 @@ - + @@ -1301,7 +1254,7 @@ - + @@ -1313,7 +1266,7 @@ - + @@ -1328,7 +1281,7 @@ - + @@ -1341,7 +1294,7 @@ - + @@ -1356,7 +1309,7 @@ - + @@ -1372,7 +1325,7 @@ - + @@ -1383,7 +1336,7 @@ - + @@ -1396,7 +1349,7 @@ - + @@ -1406,7 +1359,7 @@ - + @@ -1422,7 +1375,7 @@ - + @@ -1435,7 +1388,7 @@ - + @@ -1450,7 +1403,7 @@ - + @@ -1464,7 +1417,7 @@ - + @@ -1479,7 +1432,7 @@ - + @@ -1490,7 +1443,7 @@ - + @@ -1501,7 +1454,7 @@ - + @@ -1511,7 +1464,7 @@ - + @@ -1522,7 +1475,7 @@ - + @@ -1533,7 +1486,7 @@ - + @@ -1544,7 +1497,7 @@ - + @@ -1555,7 +1508,7 @@ - + @@ -1565,7 +1518,7 @@ - + @@ -1589,7 +1542,7 @@ - + @@ -1602,7 +1555,7 @@ - + @@ -1615,7 +1568,7 @@ - + @@ -1629,7 +1582,7 @@ - + @@ -1645,7 +1598,7 @@ - + @@ -1661,7 +1614,7 @@ - + @@ -1691,7 +1644,7 @@ - + @@ -1706,7 +1659,7 @@ - + @@ -1717,7 +1670,7 @@ - + @@ -1763,7 +1716,7 @@ - + @@ -1771,7 +1724,7 @@ - + @@ -1779,7 +1732,7 @@ - + @@ -1787,7 +1740,7 @@ - + @@ -1795,7 +1748,7 @@ - + From 6ec433d13574b79f4ec76891770b711f148f8672 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 7 Feb 2024 14:42:18 +0700 Subject: [PATCH 2/3] 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 3/3] 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)