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

Merge branch 'dev/remun/logbook-tarif' into prod/base

Browse Source
This commit is contained in:
Salman Manoe 2024-12-19 08:11:31 +07:00
commit 07ced4ffc7
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3280,14 +3280,18 @@ 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 persenDiskonPegawai = CommonUtil.isNotNullOrEmpty(d.get("persenDiskonPegawai"))
? Double.parseDouble(d.get("persenDiskonPegawai").toString()) : 0.0;
double persenDiskonJasa = 0.0;
if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
persenDiskonJasa = Double.parseDouble(d.get("persenDiskonD").toString());
persenDiskonJasa = CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
? Double.parseDouble(d.get("persenDiskonD").toString()) : 0.0;
} else if (ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
persenDiskonJasa = Double.parseDouble(d.get("persenDiskonAs").toString());
persenDiskonJasa = CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
? Double.parseDouble(d.get("persenDiskonAs").toString()) : 0.0;
} else if (DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
persenDiskonJasa = Double.parseDouble(d.get("persenDiskonAn").toString());
persenDiskonJasa = CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
? Double.parseDouble(d.get("persenDiskonAn").toString()) : 0.0;
}
if (Boolean.parseBoolean(d.get("isSelisihPaket").toString())) {
builder.nilai(persenRemunerasi * (hargaJual - hargaDiskon));
@ -3357,16 +3361,20 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
}
double hargaJasa = Double.parseDouble(d.get("hargaJasa").toString());
double hargaDiskon = Double.parseDouble(d.get("hargaDiskon").toString());
double persenDiskonPegawai = Double.parseDouble(d.get("persenDiskonPegawai").toString());
double persenDiskonPegawai = CommonUtil.isNotNullOrEmpty(d.get("persenDiskonPegawai"))
? Double.parseDouble(d.get("persenDiskonPegawai").toString()) : 0.0;
double persenDiskonJasa = 0.0;
if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")) && CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))) {
persenDiskonJasa = Double.parseDouble(d.get("persenDiskonD").toString());
persenDiskonJasa = CommonUtil.isNotNullOrEmpty(d.get("persenDiskonD"))
? Double.parseDouble(d.get("persenDiskonD").toString()) : 0.0;
} else if (ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))) {
persenDiskonJasa = Double.parseDouble(d.get("persenDiskonAs").toString());
persenDiskonJasa = CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAs"))
? Double.parseDouble(d.get("persenDiskonAs").toString()) : 0.0;
} else if (DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))) {
persenDiskonJasa = Double.parseDouble(d.get("persenDiskonAn").toString());
persenDiskonJasa = CommonUtil.isNotNullOrEmpty(d.get("persenDiskonAn"))
? Double.parseDouble(d.get("persenDiskonAn").toString()) : 0.0;
}
if (Boolean.parseBoolean(d.get("isSelisihPaket").toString())) {
builder.nilai(hargaJasa - hargaDiskon);