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

Merge branch 'dev/remun/diskon-dokter' of ssh://172.16.55.31/volume1/git/SC-be-java into dev/remun/diskon-dokter

Browse Source
This commit is contained in:
Salman Manoe 2024-03-20 08:11:48 +07:00
commit c386efe393
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
View File

@ -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,7 +3823,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
}
} else {
builder.nilai(persenRemunerasi * hargaJualSetelahDiskon);
builder.keterangan("");
if (totalDiskon > 0.0) {
builder.keterangan(
" dan dari pengurangan tarif dengan diskon " + nf.format(totalDiskon) + " terlebih dahulu");
} else {
builder.keterangan("");
}
}
return builder.build();
}