From c358b59f9dc6f64af79e368841e5915286f3999f Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 2 Oct 2024 20:48:19 +0700 Subject: [PATCH 1/4] Update LogbookTask.java Penyesuaian cut-off tarif baru untuk scheduler rekap logbook dokter --- .../service/impl/RemunerasiServiceImpl.java | 12 ++- .../task/schedule/LogbookTask.java | 77 +++++++++++++++---- 2 files changed, 72 insertions(+), 17 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java index 91d0fd96..884b6b28 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java @@ -3170,6 +3170,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera } return builder.build(); } + double hargaDiskon = Double.parseDouble(d.get("hargaDiskon").toString()); double persenDiskonPegawai = Double.parseDouble(d.get("persenDiskonPegawai").toString()); double persenDiskonJasa = 0.0; if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) { @@ -3179,7 +3180,12 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera } else if (DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) { persenDiskonJasa = Double.parseDouble(d.get("persenDiskonAn").toString()); } - builder.nilai(persenRemunerasi * hargaJual * (1 - persenDiskonPegawai / 100) * (1 - persenDiskonJasa / 100)); + if (Boolean.parseBoolean(d.get("isSelisihPaket").toString())) { + builder.nilai(persenRemunerasi * (hargaJual - hargaDiskon)); + } else { + builder.nilai( + persenRemunerasi * hargaJual * (1 - persenDiskonPegawai / 100) * (1 - persenDiskonJasa / 100)); + } if (Boolean.parseBoolean(d.get("isSelisihPaket").toString())) { if (persenDiskonPegawai > 0.0 && persenDiskonJasa > 0.0) { if (isFrontNote) { @@ -3201,6 +3207,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera } else { builder.keterangan(" + Selisih Paket + Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)"); } + } else { + builder.keterangan(""); } } else { if (persenDiskonPegawai > 0.0 && persenDiskonJasa > 0.0) { @@ -3223,6 +3231,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera } else { builder.keterangan(" + Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)"); } + } else { + builder.keterangan(""); } } return builder.build(); diff --git a/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/task/schedule/LogbookTask.java b/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/task/schedule/LogbookTask.java index 8520c089..7b5d3673 100644 --- a/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/task/schedule/LogbookTask.java +++ b/jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/task/schedule/LogbookTask.java @@ -5,6 +5,7 @@ import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.service.LogbookRemunService; import com.jasamedika.medifirst2000.service.PelayananPasienService; import com.jasamedika.medifirst2000.service.RekapLogbookDokterService; +import com.jasamedika.medifirst2000.service.RemunerasiService; import com.jasamedika.medifirst2000.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,7 +17,9 @@ import java.math.BigDecimal; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.YearMonth; import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -31,7 +34,7 @@ import static com.jasamedika.medifirst2000.constants.Master.Profesi.TERAPI; */ @Component public class LogbookTask { - private static final Logger LOGGER = LoggerFactory.getLogger(PasienTask.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LogbookTask.class); @Autowired private PelayananPasienPetugasDao pelayananPasienPetugasDao; @@ -42,6 +45,9 @@ public class LogbookTask { @Autowired private PelayananPasienService pelayananPasienService; + @Autowired + private RemunerasiService remunerasiService; + @Autowired private RekapLogbookDokterService rekapLogbookDokterService; @@ -81,11 +87,18 @@ public class LogbookTask { Set idPegawaiByTglPelayanan = pelayananPasienPetugasDao.findPegawaiByTglPelayanan(tglAwal, tglAkhir); DateFormat df = new SimpleDateFormat("yyyy-MM"); String bulan = df.format(date); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); + YearMonth oct24 = YearMonth.parse("2024-10", formatter); + YearMonth month = YearMonth.parse(bulan, formatter); List models = new ArrayList<>(); idPegawaiByTglPelayanan.forEach(idPegawai -> { { - Map kinerjaDokter = pelayananPasienService.logbookRemunTarifDokter(idPegawai, bulan, - null); + Map kinerjaDokter; + if (month.isBefore(oct24)) { + kinerjaDokter = pelayananPasienService.logbookRemunTarifDokter(idPegawai, bulan, null); + } else { + kinerjaDokter = remunerasiService.logbookRemunTarifDokter(idPegawai, bulan, null); + } List> remun = (List>) kinerjaDokter.get("data"); List listIdKelompokPasien = new ArrayList<>(); remun.forEach(r -> { @@ -114,7 +127,12 @@ public class LogbookTask { }); } { - List> ffs = pelayananPasienService.logbookFfsTarifDokter(idPegawai, bulan, null); + List> ffs; + if (month.isBefore(oct24)) { + ffs = pelayananPasienService.logbookFfsTarifDokter(idPegawai, bulan, null); + } else { + ffs = remunerasiService.logbookFfsTarifDokter(idPegawai, bulan, null); + } List listJenisRuangan = new ArrayList<>(); List listIdKelompokPasien = new ArrayList<>(); ffs.forEach(r -> { @@ -150,8 +168,12 @@ public class LogbookTask { })); } { - List> fixedPay = pelayananPasienService.logbookFixedPayDokter(idPegawai, bulan, - null); + List> fixedPay; + if (month.isBefore(oct24)) { + fixedPay = pelayananPasienService.logbookFixedPayDokter(idPegawai, bulan, null); + } else { + fixedPay = remunerasiService.logbookFixedPayDokter(idPegawai, bulan, null); + } List listJenisRuangan = new ArrayList<>(); List listIdKelompokPasien = new ArrayList<>(); List listBulanIbuPulangRanap = new ArrayList<>(); @@ -222,6 +244,9 @@ public class LogbookTask { private void saveRekapDetailLogbookDokter(Set idPegawaiKelompokKerja, Date date) { DateFormat df = new SimpleDateFormat("yyyy-MM"); String bulan = df.format(date); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); + YearMonth oct24 = YearMonth.parse("2024-09", formatter); + YearMonth month = YearMonth.parse(bulan, formatter); ExecutorService executorService = Executors.newFixedThreadPool(50); CountDownLatch latch = new CountDownLatch(50); try { @@ -237,8 +262,12 @@ public class LogbookTask { logbookRemun.setTanggalTarikData(new Date()); LogbookRemun savedRemun = logbookRemunDao.save(logbookRemun); { - Map kinerjaDokter = pelayananPasienService.logbookRemunTarifDokter(idPegawai, - bulan, null); + Map kinerjaDokter; + if (month.isBefore(oct24)) { + kinerjaDokter = pelayananPasienService.logbookRemunTarifDokter(idPegawai, bulan, null); + } else { + kinerjaDokter = remunerasiService.logbookRemunTarifDokter(idPegawai, bulan, null); + } List> remun = (List>) kinerjaDokter.get("data"); for (Map map : remun) { List listNorecPelayananPasienPetugas = new ArrayList<>(); @@ -296,8 +325,12 @@ public class LogbookTask { } } { - List> ffs = pelayananPasienService.logbookFfsTarifDokter(idPegawai, bulan, - null); + List> ffs; + if (month.isBefore(oct24)) { + ffs = pelayananPasienService.logbookFfsTarifDokter(idPegawai, bulan, null); + } else { + ffs = remunerasiService.logbookFfsTarifDokter(idPegawai, bulan, null); + } for (Map fee : ffs) { List listNorecPelayananPasienPetugas = new ArrayList<>(); { @@ -355,8 +388,12 @@ public class LogbookTask { } } { - List> ffs = pelayananPasienService.logbookFfsLuarTarifDokter(idPegawai, - bulan, null); + List> ffs; + if (month.isBefore(oct24)) { + ffs = pelayananPasienService.logbookFfsLuarTarifDokter(idPegawai, bulan, null); + } else { + ffs = remunerasiService.logbookFfsLuarTarifDokter(idPegawai, bulan, null); + } for (Map fee : ffs) { List listNorecPelayananPasienPetugas = new ArrayList<>(); { @@ -414,8 +451,12 @@ public class LogbookTask { } } { - List> fixedPay = pelayananPasienService.logbookFixedPayDokter(idPegawai, - bulan, null); + List> fixedPay; + if (month.isBefore(oct24)) { + fixedPay = pelayananPasienService.logbookFixedPayDokter(idPegawai, bulan, null); + } else { + fixedPay = remunerasiService.logbookFixedPayDokter(idPegawai, bulan, null); + } for (Map pay : fixedPay) { List listNorecPelayananPasienPetugas = new ArrayList<>(); { @@ -471,8 +512,12 @@ public class LogbookTask { } } { - List> klaimMpp = pelayananPasienService.logbookKlaimMppDokter(idPegawai, - bulan); + List> klaimMpp; + if (month.isBefore(oct24)) { + klaimMpp = pelayananPasienService.logbookKlaimMppDokter(idPegawai, bulan); + } else { + klaimMpp = remunerasiService.logbookKlaimMppDokter(idPegawai, bulan); + } for (Map mpp : klaimMpp) { List listNorecPelayananPasienPetugas = new ArrayList<>(); { From 88c28f678da87508c27f2882a444512c90a0aea5 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Fri, 4 Oct 2024 15:49:05 +0700 Subject: [PATCH 2/4] Update IkiDanRemunerasiController.java Perbaikan validasi testing cut-off september-oktober --- .../controller/IkiDanRemunerasiController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java index c60ffd69..dbfe82a2 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java @@ -2672,7 +2672,7 @@ public class IkiDanRemunerasiController extends LocaleController result; if (month.isBefore(oct24)) { @@ -2699,7 +2699,7 @@ public class IkiDanRemunerasiController extends LocaleController> result; if (month.isBefore(oct24)) { @@ -2726,7 +2726,7 @@ public class IkiDanRemunerasiController extends LocaleController> result; if (month.isBefore(oct24)) { @@ -2755,7 +2755,7 @@ public class IkiDanRemunerasiController extends LocaleController> result; if (month.isBefore(oct24)) { @@ -2782,7 +2782,7 @@ public class IkiDanRemunerasiController extends LocaleController> result; if (month.isBefore(oct24)) { From ca7e587a3ec8698fba956ef445e28248ce7fb98a Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Fri, 4 Oct 2024 15:49:30 +0700 Subject: [PATCH 3/4] Update PelayananPasienServiceImpl.java Cabut reset diskon unutk jasa obat sudah tidak Rp800 --- .../medifirst2000/service/impl/PelayananPasienServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 92791cf0..f249b7ba 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 @@ -423,7 +423,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel /* * Update Pelayanan Pasien */ - double jasaObat = 800.00; + double jasaObat = 0.00; for (PelayananPasien pp : layanan) { /* * Get diskon jasamedis From 926dc3b30da44215c749469ff5182db1c50c816c Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Fri, 4 Oct 2024 15:50:15 +0700 Subject: [PATCH 4/4] Update RemunerasiServiceImpl.java Perbaikan keterangan tidak ditampilkan jika sayatan ke-1 --- .../service/impl/RemunerasiServiceImpl.java | 114 ++++++++++++++---- 1 file changed, 88 insertions(+), 26 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java index 884b6b28..627121eb 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java @@ -1540,7 +1540,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera List drKsmObgyn = pegawaiDao.getDokterByKsm(KSM_OBGYN); SimpleDateFormat month = new SimpleDateFormat("MMM-yyyy", new Locale("in", "ID")); listData.forEach(d -> { - if (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) + if (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + Double.parseDouble(d.get("persenSayatan").toString()) + "%)"); }); @@ -1866,7 +1867,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera private List> transformPelayananKepalaPaketFixedPay(List> listData) { listData.forEach(d -> { - if (CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) + if (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + Double.parseDouble(d.get("persenSayatan").toString()) + "%)"); }); @@ -1994,8 +1996,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenOperator + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2005,8 +2012,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenAsistenIBS + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2016,8 +2028,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenAnestesi + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2348,8 +2365,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenOperator + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2359,8 +2381,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenAsistenIBS + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2370,8 +2397,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenAnestesi + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2708,8 +2740,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenOperator + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2719,8 +2756,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenAsistenIBS + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2730,8 +2772,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenAnestesi + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2953,8 +3000,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenOperatorIBS + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2964,8 +3016,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenAsistenIBS + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan")))) @@ -2975,8 +3032,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d, false); d.put("persenJasa", persenAnestesi + "%"); - d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" - + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan")) + && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) { + d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " (" + + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan()); + } else { + d.put("keterangan", hargaJasa.getKeterangan()); + } d.put("hargaJasa", hargaJasa.getNilai()); } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) || (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))