From 6ffa4865d2bfeec96fe88077b16ac31639a1f8d5 Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe@live.com>
Date: Fri, 23 Dec 2022 17:51:34 +0700
Subject: [PATCH 1/2] Update LogbookKinerjaServiceImpl.java Clean code

---
 .../medifirst2000/service/impl/LogbookKinerjaServiceImpl.java  | 3 ---
 1 file changed, 3 deletions(-)

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 49219347..287ee8e6 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
@@ -3041,7 +3041,6 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
 		List<Integer> idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk");
 		List<Integer> idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi");
-		List<Integer> idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium");
 
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM);
@@ -3050,8 +3049,6 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		List<Integer> drRadList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_RADIOLOGI);
 		
 		List<Integer> idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd");
-		List<Integer> idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga");
-		List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
 		for (Integer idPegawai : listIdPegawai) {
 			SkorDokterVO skorDokterVO = new SkorDokterVO();
 

From 0800eab1bfb42adab06ae76924d00e16e5ea8531 Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe@live.com>
Date: Wed, 28 Dec 2022 11:12:40 +0700
Subject: [PATCH 2/2] Update LogbookKinerjaDao.java Perbaikan dashboard
 pencatan kinerja duplikat karena rangkap jabatan di unit kerja yang sama

---
 .../com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java
index 9dc2ea0e..0d17b3e0 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java
@@ -81,7 +81,7 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository<LogbookKin
 			+ "inner join lk.indikatorKinerja ik " + "where ik.id = :indikatorId")
 	List<Map<String, Object>> findKontrakKinerja(@Param("indikatorId") Integer idIndikator);
 
-	@Query("select new Map(lk.noRec as noRec," + "pg.id as idPegawai,pg.namaLengkap as namaPegawai,"
+	@Query("select distinct new Map(lk.noRec as noRec," + "pg.id as idPegawai,pg.namaLengkap as namaPegawai,"
 			+ "coalesce(mj.nilaiJabatan,0) as nilaiJabatan," + "jb.id as idJabatan,jb.namaJabatan as namaJabatan,"
 			+ "jb.kelompokJabatanId as kelompokJabatanId," + "ik.jenisIndikator as idJenisIndikator,"
 			+ "(case when ik.jenisIndikator = 1 then 'Kuantitas' " + "when ik.jenisIndikator = 2 then 'Kualitas' "