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

Merge branch 'dev/pegawai/presensi/compreface' of ssh://172.16.55.31/volume1/git/SC-be-java into dev/pegawai/presensi/compreface

Browse Source
This commit is contained in:
Salman Manoe 2024-10-30 18:58:56 +07:00
commit 3f138cc525
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
View File

@ -29,6 +29,7 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.jasamedika.medifirst2000.constants.Master.KelompokJabatan.PENUNJANG_MEDIK; import static com.jasamedika.medifirst2000.constants.Master.KelompokJabatan.PENUNJANG_MEDIK;
import static com.jasamedika.medifirst2000.constants.Master.SatuanIndikator.PERCENTAGE;
@Service("LogbookKinerjaService") @Service("LogbookKinerjaService")
public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements LogbookKinerjaService { public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements LogbookKinerjaService {
@ -563,6 +564,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
res.put("target", 100.0); res.put("target", 100.0);
} else if (res.get("indikatorId").equals(Master.IndikatorKinerja.KEPATUHAN_PELAYANAN_MEDIS)) { } else if (res.get("indikatorId").equals(Master.IndikatorKinerja.KEPATUHAN_PELAYANAN_MEDIS)) {
res.put("target", 100.0); res.put("target", 100.0);
} else if (Arrays.asList(PERCENTAGE).contains(Integer.parseInt(res.get("satuanId").toString()))) {
res.put("target", 100.0);
} else if (CommonUtil.isNotNullOrEmpty(res.get("target"))) { } else if (CommonUtil.isNotNullOrEmpty(res.get("target"))) {
res.put("target", res.get("target")); res.put("target", res.get("target"));
} else { } else {

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

@ -2319,6 +2319,9 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD")); double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD"));
double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika")); double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika"));
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis")); double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24"));
// Custom rule persentase jasa terapis 21 Oktober 2024
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
/* /*
* Persiapan filter logic remunerasi * Persiapan filter logic remunerasi
*/ */
@ -2353,8 +2356,16 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
d.put("keterangan", hargaJasa.getKeterangan()); d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai()); d.put("hargaJasa", hargaJasa.getNilai());
} else if (terapisRehabMedik.contains(idPegawai)) { } else if (terapisRehabMedik.contains(idPegawai)) {
RemunHargaJasa hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true); LocalDateTime tglJamPelayanan = ((Date) d.get("tglPelayanan")).toInstant()
d.put("persenJasa", persenJasaTerapis + "%"); .atZone(ZoneId.systemDefault()).toLocalDateTime();
RemunHargaJasa hargaJasa;
if (tglJamPelayanan.isBefore(tmtJasaTerapis24)) {
hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true);
d.put("persenJasa", persenJasaTerapis + "%");
} else {
hargaJasa = hargaJasa(persenJasaTerapis24 / 100, hargaJual, d, true);
d.put("persenJasa", persenJasaTerapis24 + "%");
}
d.put("keterangan", hargaJasa.getKeterangan()); d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai()); d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
@ -2687,7 +2698,10 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD")); double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD"));
double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika")); double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika"));
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis")); double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24"));
double persenJasaLuarTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaLuarTerapis")); double persenJasaLuarTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaLuarTerapis"));
// Custom rule persentase jasa terapis 21 Oktober 2024
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
/* /*
* Persiapan filter logic remunerasi * Persiapan filter logic remunerasi
*/ */
@ -2728,8 +2742,16 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
d.put("keterangan", hargaJasa.getKeterangan()); d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai()); d.put("hargaJasa", hargaJasa.getNilai());
} else if (terapisRehabMedik.contains(idPegawai)) { } else if (terapisRehabMedik.contains(idPegawai)) {
RemunHargaJasa hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true); LocalDateTime tglJamPelayanan = ((Date) d.get("tglPelayanan")).toInstant()
d.put("persenJasa", persenJasaTerapis + "%"); .atZone(ZoneId.systemDefault()).toLocalDateTime();
RemunHargaJasa hargaJasa;
if (tglJamPelayanan.isBefore(tmtJasaTerapis24)) {
hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true);
d.put("persenJasa", persenJasaTerapis + "%");
} else {
hargaJasa = hargaJasa(persenJasaTerapis24 / 100, hargaJual, d, true);
d.put("persenJasa", persenJasaTerapis24 + "%");
}
d.put("keterangan", hargaJasa.getKeterangan()); d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai()); d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen")) } else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
@ -2957,6 +2979,9 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD")); double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD"));
double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika")); double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika"));
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis")); double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
double persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24"));
// Custom rule persentase jasa terapis 21 Oktober 2024
LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0);
/* /*
* Persiapan filter logic remunerasi * Persiapan filter logic remunerasi
*/ */
@ -3068,8 +3093,16 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
d.put("hargaJasa", hargaJasa.getNilai()); d.put("hargaJasa", hargaJasa.getNilai());
} else if (terapisRehabMedik.contains(idPegawai) && REHAB_MEDIK.equals(d.get("idDepartemen")) } else if (terapisRehabMedik.contains(idPegawai) && REHAB_MEDIK.equals(d.get("idDepartemen"))
&& "Eksekutif".equals(d.get("jenisRuangan"))) { && "Eksekutif".equals(d.get("jenisRuangan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true); LocalDateTime tglJamPelayanan = ((Date) d.get("tglPelayanan")).toInstant()
d.put("persenJasa", persenJasaTerapis + "%"); .atZone(ZoneId.systemDefault()).toLocalDateTime();
RemunHargaJasa hargaJasa;
if (tglJamPelayanan.isBefore(tmtJasaTerapis24)) {
hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true);
d.put("persenJasa", persenJasaTerapis + "%");
} else {
hargaJasa = hargaJasa(persenJasaTerapis24 / 100, hargaJual, d, true);
d.put("persenJasa", persenJasaTerapis24 + "%");
}
d.put("keterangan", hargaJasa.getKeterangan()); d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai()); d.put("hargaJasa", hargaJasa.getNilai());
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) { } else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {