From fc1f9ea677c4242878b345f41df801318e62cb7f Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Mon, 10 Jan 2022 09:28:13 +0700
Subject: [PATCH] Update LogbookKinerjaService Penerapan parameter tahun untuk
 get target skor dokter di kontrak kinerja

---
 .../service/impl/LogbookKinerjaServiceImpl.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 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 b7fd819e..cc1a6624 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
@@ -412,15 +412,17 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		Map<String, Object> result = new HashMap<>();
 		List<Map<String, Object>> listRes = new ArrayList<>();
 		List<Integer> listIdIndikator = new ArrayList<>();
-		DateFormat df = new SimpleDateFormat("yyyy-MM");
+
+		DateFormat yf = new SimpleDateFormat("yyyy");
+		DateFormat mf = new SimpleDateFormat("yyyy-MM");
 
 		Integer targetHariKerja = hitungTargetHariKerja(new Date(bulan));
 		Double targetJamKerja = targetHariKerja.doubleValue() * Master.MENIT_KERJA_HARIAN;
 
 		List<Map<String, Object>> listMap = logbookKinerjaDao.findIndikatorByJabatan(idJabatan,
-				df.format(new Date(bulan)));
+				mf.format(new Date(bulan)));
 		List<Map<String, Object>> data = logbookKinerjaDao.findKontrakKinerja(idPegawai, idJabatan,
-				df.format(new Date(bulan)));
+				mf.format(new Date(bulan)));
 
 		for (Map<String, Object> map : listMap) {
 			if (!listIdIndikator.contains(map.get("indikatorId"))) {
@@ -431,7 +433,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 				 */
 				if (map.get("indikatorId").equals(Master.IndikatorKinerja.PELAYANAN_MEDIS_JAM_KERJA)) {
 					List<Double> target = targetSkorDokterDetailDao.findTargetByPegawai(idPegawai,
-							df.format(new Date(bulan)));
+							mf.format(new Date(bulan)), yf.format(new Date(bulan)));
 					map.put("target", Math.floor(target.get(0)));
 				}
 
@@ -440,7 +442,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 				 */
 				if (map.get("indikatorId").equals(Master.IndikatorKinerja.KEPATUHAN_PELAYANAN_MEDIS)) {
 					List<Map<String, Object>> detailIndikator2 = logbookKinerjaDokterDao.findDetailLogbookDokter(
-							df.format(new Date(bulan)), idPegawai, idJabatan,
+							mf.format(new Date(bulan)), idPegawai, idJabatan,
 							Integer.valueOf(map.get("indikatorId").toString()));
 					if (CommonUtil.isNotNullOrEmpty(detailIndikator2)) {
 						map.put("detail", detailIndikator2);
@@ -466,7 +468,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						Iterable<LogbookKinerjaDokter> models = logbookKinerjaDokterDao.save(lkds);
 						if (CommonUtil.isNotNullOrEmpty(models)) {
 							List<Map<String, Object>> detailIndikator3 = logbookKinerjaDokterDao
-									.findDetailLogbookDokter(df.format(new Date(bulan)), idPegawai, idJabatan,
+									.findDetailLogbookDokter(mf.format(new Date(bulan)), idPegawai, idJabatan,
 											Integer.valueOf(map.get("indikatorId").toString()));
 							if (CommonUtil.isNotNullOrEmpty(detailIndikator3)) {
 								map.put("detail", detailIndikator3);