From a8ac4be519dfd05f0fc3331993e6056311e23e85 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Mon, 3 Feb 2025 11:57:17 +0700
Subject: [PATCH] Update service custom data pegawai

Perbaikan filter kategori non-sdm
---
 .../medifirst2000/dao/custom/PegawaiDaoCustom.java           | 3 ++-
 .../medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java  | 5 +++--
 .../medifirst2000/service/impl/PegawaiServiceImpl.java       | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/PegawaiDaoCustom.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/PegawaiDaoCustom.java
index a6bf653f..98fa2094 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/PegawaiDaoCustom.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/PegawaiDaoCustom.java
@@ -22,7 +22,8 @@ public interface PegawaiDaoCustom extends CoreDao<Pegawai> {
 			List<Integer> listStatusPegawai, List<Integer> listKedudukan);
 
 	List<Map<String, Object>> findPegawaiCustom(String nama, Integer idUnitKerja, Integer idKedudukan,
-			List<Integer> listStatusPegawaiId, String periode, List<Integer> listKedudukanException);
+			List<Integer> listStatusPegawaiId, String periode, List<Integer> listKedudukanException,
+			List<Integer> listStatusPegawaiException);
 
 	List<Map<String, Object>> findPegawaiCustomByKategori(String nama, Integer idUnitKerja, Integer idKedudukan,
 			String periode, List<Integer> listKedudukanException, List<Integer> listIdKategori);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java
index b03a8bc2..024204e0 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java
@@ -273,7 +273,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 
 	@Override
 	public List<Map<String, Object>> findPegawaiCustom(String nama, Integer idUnitKerja, Integer idKedudukan,
-			List<Integer> listStatusPegawaiId, String periode, List<Integer> listKedudukanException) {
+			List<Integer> listStatusPegawaiId, String periode, List<Integer> listKedudukanException,
+			List<Integer> listStatusPegawaiException) {
 		StringBuffer buffer = new StringBuffer();
 		List<Map<String, Object>> list = new ArrayList<>();
 
@@ -397,7 +398,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 		query.setParameter("listAdmin", listAdmin);
 
 		if (CommonUtil.isNullOrEmpty(listStatusPegawaiId)) {
-			query.setParameter("nonSdmKategory", Arrays.asList(Master.KategoryPegawai.NONSDM));
+			query.setParameter("nonSdmKategory", listStatusPegawaiException);
 		}
 
 		if (CommonUtil.isNotNullOrEmpty(idUnitKerja) && CommonUtil.isNotNullOrEmpty(listPegawaiByUnitKerja)
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
index 335f3973..7e61a531 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
@@ -727,10 +727,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 			List<Integer> listStatusPegawaiId, String periode) {
 		Map<String, Object> result = new HashMap<>();
 		List<Map<String, Object>> resultModelWithUsername = new ArrayList<>();
-		if (CommonUtil.isNullOrEmpty(listStatusPegawaiId))
-			listStatusPegawaiId = splitDataSettingDatafixed("listIdKategoryPegawaiNonSdm");
 		List<Map<String, Object>> resultModel = pegawaiDaoCustom.findPegawaiCustom(nama, idUnitKerja, idKedudukan,
-				listStatusPegawaiId, periode, splitDataSettingDatafixed("listDataKedudukanException"));
+				listStatusPegawaiId, periode, splitDataSettingDatafixed("listDataKedudukanException"),
+				splitDataSettingDatafixed("listIdKategoryPegawaiNonSdm"));
 
 		for (Map<String, Object> map : resultModel) {
 			Map<String, Object> usernames = new HashMap<>();