From 1e505c65e519418c37b29462640f5b9650263905 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Wed, 12 Mar 2025 11:20:44 +0700
Subject: [PATCH] Update RemunerasiServiceImpl.java

Mendefinisikan dokter paruh waktu di logbook menggunakan setting data fix
---
 .../service/impl/RemunerasiServiceImpl.java              | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
index 47a862de..6b26e8fb 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
@@ -32,7 +32,6 @@ import static com.jasamedika.medifirst2000.constants.Master.Departemen.*;
 import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.KONSULTASI;
 import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.VISIT;
 import static com.jasamedika.medifirst2000.constants.Master.JenisPetugasPelaksana.*;
-import static com.jasamedika.medifirst2000.constants.Master.KategoryPegawai.DOKTER_LUAR;
 import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS;
 import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS;
 import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*;
@@ -336,6 +335,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		List<Integer> listDetailJenisProdukException = new ArrayList<>();
 		List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
 		List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
+		List<Integer> dokterParuhWaktu = toListIntegerSettingFix("kategoriDokterParuhWaktu", tglAkhir);
 		List<Integer> idsJenisProdukNonLogbook = toListIntegerSettingFix("listJenisProdukNonLogbook", tglAkhir);
 		List<Integer> idsRegDJPAdminNonPK = toListIntegerSettingFix("admin_nonpk", tglAkhir);
 		List<Integer> idsRegDJPMedisUtama = toListIntegerSettingFix("medis_utama", tglAkhir);
@@ -427,7 +427,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		/*
 		 * Mapping set awal persentase jasa remunerasi dan harga jasa remunerasi
 		 */
-		if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai))
+		if (pegawaiDao.getPegawaiByKategoryPegawai(dokterParuhWaktu).contains(idPegawai))
 			persenVisite = persenRemunVisiteDokterKelompokBudiRahmat;
 		for (Map<String, Object> d : listRatedPay) {
 			double persenOperatorAkumulatif = persenOperator;
@@ -985,7 +985,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		List<Map<String, Object>> listPelayananFfs = new ArrayList<>();
 		List<Map<String, Object>> listPelayananNonJknLuarJamKerja = new ArrayList<>();
 		double capaianRemun = 0.0;
-		if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai)
+		if (pegawaiDao.getPegawaiByKategoryPegawai(dokterParuhWaktu).contains(idPegawai)
 				&& !listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)) {
 			/*
 			 * Dokter luar hanya mendapatkan ffs
@@ -2242,6 +2242,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
+		List<Integer> dokterParuhWaktu = toListIntegerSettingFix("kategoriDokterParuhWaktu", tglAkhir);
 		List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
 		List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
 		List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
@@ -2269,7 +2270,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		/*
 		 * Mapping persentase jasa remunerasi
 		 */
-		if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai)
+		if (pegawaiDao.getPegawaiByKategoryPegawai(dokterParuhWaktu).contains(idPegawai)
 				&& listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai))
 			persenVisite = persenRemunVisiteDokterKelompokBudiRahmat;
 		for (Map<String, Object> d : listData) {