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

Merge branch 'dev/remun/exclude-dokter-luar' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2024-11-26 10:54:24 +07:00
commit a438d0d69e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,6 +390,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/* /*
* Mapping set awal persentase jasa remunerasi dan harga jasa remunerasi * Mapping set awal persentase jasa remunerasi dan harga jasa remunerasi
*/ */
if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai))
persenVisite = 15.0;
for (Map<String, Object> d : listRatedPay) { for (Map<String, Object> d : listRatedPay) {
if (paketBukanFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) if (paketBukanFixedPay.contains(Integer.parseInt(d.get("idProduk").toString())))
d.put("hargaJual", d.get("komponenTotalTarif")); d.put("hargaJual", d.get("komponenTotalTarif"));
@ -944,7 +946,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
List<Map<String, Object>> listPelayananFfs = new ArrayList<>(); List<Map<String, Object>> listPelayananFfs = new ArrayList<>();
List<Map<String, Object>> listPelayananNonJknLuarJamKerja = new ArrayList<>(); List<Map<String, Object>> listPelayananNonJknLuarJamKerja = new ArrayList<>();
double capaianRemun = 0.0; double capaianRemun = 0.0;
if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai)) { if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai)
&& idPegawai != 1417) {
/* /*
* Dokter luar hanya mendapatkan ffs * Dokter luar hanya mendapatkan ffs
*/ */
@ -1946,6 +1949,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/* /*
* Mapping persentase jasa remunerasi * Mapping persentase jasa remunerasi
*/ */
if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai))
persenVisite = 15.0;
for (Map<String, Object> d : listData) { for (Map<String, Object> d : listData) {
double hargaJual = Double.parseDouble(d.get("hargaJual").toString()); double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) { if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {