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

- perbaikan validasi hitung capaian presensi dpjp dengan cppt untuk akses komite mutu

Browse Source 
- perbaikan kondisi batasan capaian di monitoring presensi dpjp
- perbaikan kondisi batasan capaian di dashboard pencatatan kinerja
This commit is contained in:
Salman Manoe 2021-12-14 08:59:46 +07:00
parent 946a6694b1
commit 55f5f1cc30
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganPasienTerintegrasiServiceImpl.java
View File

@ -339,10 +339,12 @@ public class CatatanPerkembanganPasienTerintegrasiServiceImpl extends BaseVoServ
resultDetail.add(mapRs); resultDetail.add(mapRs);
} }
} }
if (CommonUtil.isNotNullOrEmpty(idDr)) { if (CommonUtil.isNotNullOrEmpty(cpptDokterVo)) {
result.put("indikator", cpptDokterVo);
}
if (CommonUtil.isNotNullOrEmpty(cpptDokterVo) && CommonUtil.isNotNullOrEmpty(cpptDokterVo.getDetailCapaian())) {
result.put("persenTepatHadir", result.put("persenTepatHadir",
new BigDecimal(cpptDokterVo.getDetailCapaian()).setScale(2, RoundingMode.HALF_UP)); new BigDecimal(cpptDokterVo.getDetailCapaian()).setScale(2, RoundingMode.HALF_UP));
result.put("indikator", cpptDokterVo);
} }
result.put("detail", resultDetail); result.put("detail", resultDetail);

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

@ -123,7 +123,7 @@ public class LogbookKinerjaDokterServiceImpl extends BaseVoServiceImpl implement
Double result = 0.0; Double result = 0.0;
for (LogbookKinerjaDokter detailKinerja : listDetailKinerja) { for (LogbookKinerjaDokter detailKinerja : listDetailKinerja) {
if (Arrays.asList(Master.SatuanIndikator.PERCENTAGE).contains(idSatuan)) { if (Arrays.asList(Master.SatuanIndikator.PERCENTAGE).contains(idSatuan)) {
if (detailKinerja.getDetailCapaian() > detailKinerja.getDetailTarget()) { if (detailKinerja.getDetailCapaian() >= detailKinerja.getDetailTarget()) {
result += detailKinerja.getDetailTarget() / detailKinerja.getDetailTarget() * 100; result += detailKinerja.getDetailTarget() / detailKinerja.getDetailTarget() * 100;
} else { } else {
result += detailKinerja.getDetailCapaian() / detailKinerja.getDetailTarget() * 100; result += detailKinerja.getDetailCapaian() / detailKinerja.getDetailTarget() * 100;

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

@ -640,8 +640,15 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
Map<String, Object> presensiVisite = cpptService.findPresensiVisiteDokter(idPegawai, Map<String, Object> presensiVisite = cpptService.findPresensiVisiteDokter(idPegawai,
bulan); bulan);
if (CommonUtil.isNotNullOrEmpty(presensiVisite)) { if (CommonUtil.isNotNullOrEmpty(presensiVisite)) {
persenCapaian += Double.valueOf(presensiVisite.get("rataCapaian").toString()) if (Double.valueOf(presensiVisite.get("rataCapaian").toString()) >= Double
/ Double.valueOf(detail.get("detailTarget").toString()); .valueOf(detail.get("detailTarget").toString())) {
persenCapaian += Double.valueOf(detail.get("detailTarget").toString())
/ Double.valueOf(detail.get("detailTarget").toString());
} else {
persenCapaian += Double
.valueOf(presensiVisite.get("rataCapaian").toString())
/ Double.valueOf(detail.get("detailTarget").toString());
}
} }
} else { } else {
// TODO inserted by ITI-14 [Nov 19, 2021, // TODO inserted by ITI-14 [Nov 19, 2021,