From 61ccbe032e29a63af634c1393acc5768f40d13fa Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe.rsabhk@gmail.com>
Date: Wed, 19 May 2021 21:36:47 +0700
Subject: [PATCH] perbaikan service data mapping jabatan untuk entri pegawai
 baru

---
 .../jasamedika/medifirst2000/constants/Master.java    |  2 +-
 .../service/impl/LogbookKinerjaDetailServiceImpl.java |  4 ++--
 .../impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java | 11 ++++++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
index d1f14cd8..64287d56 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
@@ -271,7 +271,7 @@ public class Master {
 	}
 
 	public static final class SatuanIndikator {
-		public static final Integer[] RATA_RATA = { 11743 };
+		public static final Integer[] PERCENTAGE = { 11743, 13585 };
 	}
 
 	public static final class ShiftKerja {
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java
index ea272da9..4ea2f587 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java
@@ -67,7 +67,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
 		 */
 		if (CommonUtil.isNotNullOrEmpty(resultModel)) {
 			List<Map<String, Object>> dataSatuanRatarata = logbookKinerjaDetailDao.findAvgCapaianByKontrak(
-					vo.getLogbookKinerja().getNoRec(), Arrays.asList(Master.SatuanIndikator.RATA_RATA));
+					vo.getLogbookKinerja().getNoRec(), Arrays.asList(Master.SatuanIndikator.PERCENTAGE));
 			if (CommonUtil.isNotNullOrEmpty(dataSatuanRatarata)) {
 				List<LogbookKinerja> models = new ArrayList<>();
 				for (Map<String, Object> map : dataSatuanRatarata) {
@@ -114,7 +114,7 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
 		 */
 		if (CommonUtil.isNotNullOrEmpty(resultModel)) {
 			List<Map<String, Object>> dataSatuanRatarata = logbookKinerjaDetailDao.findAvgCapaianByKontrak(
-					vo.getLogbookKinerja().getNoRec(), Arrays.asList(Master.SatuanIndikator.RATA_RATA));
+					vo.getLogbookKinerja().getNoRec(), Arrays.asList(Master.SatuanIndikator.PERCENTAGE));
 			if (CommonUtil.isNotNullOrEmpty(dataSatuanRatarata)) {
 				List<LogbookKinerja> models = new ArrayList<>();
 				for (Map<String, Object> map : dataSatuanRatarata) {
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
index 7379af63..82d65252 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
@@ -1063,9 +1063,14 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
 			if (CommonUtil.isNullOrEmpty(pejabatPenilai)) {
 				pejabatPenilai = pegawaiDao.getPegawaiByIdCustom(Master.EMPTY_DATA);
 			}
-			Map<String, Object> kelompokJabatan = nilaiKelompokJabatanDao
-					.getDetailKelompokJabatanById(Integer.valueOf(map.get("gradeId").toString()));
-			if (CommonUtil.isNullOrEmpty(kelompokJabatan)) {
+			Map<String, Object> kelompokJabatan = new HashMap<>();
+			if (CommonUtil.isNotNullOrEmpty(map.get("gradeId"))) {
+				kelompokJabatan = nilaiKelompokJabatanDao
+						.getDetailKelompokJabatanById(Integer.valueOf(map.get("gradeId").toString()));
+				if (CommonUtil.isNullOrEmpty(kelompokJabatan)) {
+					kelompokJabatan = nilaiKelompokJabatanDao.getDetailKelompokJabatanById(Master.EMPTY_DATA);
+				}
+			} else {
 				kelompokJabatan = nilaiKelompokJabatanDao.getDetailKelompokJabatanById(Master.EMPTY_DATA);
 			}
 			Map<String, Object> sumberData = new HashMap<>();