From 0c61d7a8f210acf9ef5d4d76eb7f8339c19c9405 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 18 Mar 2024 10:30:01 +0700 Subject: [PATCH] Update PelayananPasienServiceImpl.java Perbaikan keterangan selisih tarif setelah diskon pada logbook dokter karna diskon komponen dokter lain --- .../service/impl/PelayananPasienServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 bbbcdd52..65c81570 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 @@ -675,6 +675,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel } else if (drKkGenetika.contains(idPegawai) && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { + /* + * A rule for claimed <= Jul 31th 2023 + */ RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d, false); d.put("hargaJasa", hargaJasa.getNilai()); } else if (Arrays.asList(GENETIKA).contains(Integer.parseInt(d.get("idRuangan").toString()))) { @@ -3820,8 +3823,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel } } else { builder.nilai(persenRemunerasi * hargaJualSetelahDiskon); - builder.keterangan( - " dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + " terlebih dahulu"); + if (totalDiskon > 0.0) { + builder.keterangan( + " dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + " terlebih dahulu"); + } else { + builder.keterangan(""); + } + } return builder.build(); }