salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/logbook/diskon' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2024-10-07 10:36:34 +07:00
commit 3b5827a778
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
View File

@ -1731,6 +1731,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} }
}); });
listData.forEach(d -> { listData.forEach(d -> {
d.put("hargaJual", d.get("hargaJasa"));
RemunHargaJasa hargaJasa = hargaJasaFixedPay(d); RemunHargaJasa hargaJasa = hargaJasaFixedPay(d);
d.put("hargaJasa", hargaJasa.getNilai()); d.put("hargaJasa", hargaJasa.getNilai());
d.put("keterangan", hargaJasa.getKeterangan()); d.put("keterangan", hargaJasa.getKeterangan());
@ -1875,6 +1876,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
d.put("isBatalPaket", false); d.put("isBatalPaket", false);
}); });
listData.forEach(d -> { listData.forEach(d -> {
d.put("hargaJual", d.get("hargaJasa"));
RemunHargaJasa hargaJasa = hargaJasaFixedPay(d); RemunHargaJasa hargaJasa = hargaJasaFixedPay(d);
d.put("hargaJasa", hargaJasa.getNilai()); d.put("hargaJasa", hargaJasa.getNilai());
d.put("keterangan", hargaJasa.getKeterangan()); d.put("keterangan", hargaJasa.getKeterangan());