From 55f5f1cc30bc317908049b9ddfd9fc71c3ed511c Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 14 Dec 2021 08:59:46 +0700 Subject: [PATCH] - perbaikan validasi hitung capaian presensi dpjp dengan cppt untuk akses komite mutu - perbaikan kondisi batasan capaian di monitoring presensi dpjp - perbaikan kondisi batasan capaian di dashboard pencatatan kinerja --- ...atanPerkembanganPasienTerintegrasiServiceImpl.java | 6 ++++-- .../service/impl/LogbookKinerjaDokterServiceImpl.java | 2 +- .../service/impl/LogbookKinerjaServiceImpl.java | 11 +++++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganPasienTerintegrasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganPasienTerintegrasiServiceImpl.java index 9d204eb5..5aa05c9b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganPasienTerintegrasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganPasienTerintegrasiServiceImpl.java @@ -339,10 +339,12 @@ public class CatatanPerkembanganPasienTerintegrasiServiceImpl extends BaseVoServ 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", new BigDecimal(cpptDokterVo.getDetailCapaian()).setScale(2, RoundingMode.HALF_UP)); - result.put("indikator", cpptDokterVo); } result.put("detail", resultDetail); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDokterServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDokterServiceImpl.java index 1a58aec7..f22b2211 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDokterServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDokterServiceImpl.java @@ -123,7 +123,7 @@ public class LogbookKinerjaDokterServiceImpl extends BaseVoServiceImpl implement Double result = 0.0; for (LogbookKinerjaDokter detailKinerja : listDetailKinerja) { if (Arrays.asList(Master.SatuanIndikator.PERCENTAGE).contains(idSatuan)) { - if (detailKinerja.getDetailCapaian() > detailKinerja.getDetailTarget()) { + if (detailKinerja.getDetailCapaian() >= detailKinerja.getDetailTarget()) { result += detailKinerja.getDetailTarget() / detailKinerja.getDetailTarget() * 100; } else { result += detailKinerja.getDetailCapaian() / detailKinerja.getDetailTarget() * 100; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java index 71a5cc4a..bfa810f2 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java @@ -640,8 +640,15 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Map presensiVisite = cpptService.findPresensiVisiteDokter(idPegawai, bulan); if (CommonUtil.isNotNullOrEmpty(presensiVisite)) { - persenCapaian += Double.valueOf(presensiVisite.get("rataCapaian").toString()) - / Double.valueOf(detail.get("detailTarget").toString()); + if (Double.valueOf(presensiVisite.get("rataCapaian").toString()) >= Double + .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 { // TODO inserted by ITI-14 [Nov 19, 2021,