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();