From 6ef697baaa2149b708e573ea25b85d4e83b5470c Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Thu, 13 Mar 2025 09:42:19 +0700
Subject: [PATCH] Update RemunerasiServiceImpl.java

Penerapan tmt akhir aturan DS untuk remun dokter paruh waktu
---
 .../service/impl/RemunerasiServiceImpl.java   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 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 6b26e8fb..7f380855 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
@@ -326,8 +326,21 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		double persenRemunTerapis = toDoubleSettingFix("persenRemunTerapis", tglAkhir);
 		double persenRemunVisiteDokterKelompokBudiRahmat = toDoubleSettingFix(
 				"persenRemunVisiteDokterKelompokBudiRahmat", tglAkhir);
+		/*
+		 * TMT Tarif baru tahun 2024
+		 */
 		long millisTarif2024 = Long.parseLong(getSettingDataFixed("tmtTarif2024"));
+		Date tmtTarif2024 = new Date(millisTarif2024);
+		/*
+		 * TMT persentase jasa tahun 2024
+		 */
 		long millisPersenJasa2024 = Long.parseLong(getSettingDataFixed("tmtPersenJasa2024"));
+		Date tmtPersenJasa2024 = new Date(millisPersenJasa2024);
+		/*
+		 * TMT akhir aturan remun DS
+		 */
+		long millisAkhirAturanRemunDS = Long.parseLong(getSettingDataFixed("tmtAkhirAturanRemunDS"));
+		Date tmtAkhirAturanRemunDS = new Date(millisAkhirAturanRemunDS);
 		/*
 		 * Persiapan filter logic remunerasi
 		 */
@@ -373,14 +386,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 			listDetailJenisProdukException = idsRegDJPAdminNonPK;
 			listDetailJenisProdukException.removeAll(listDetailJenisProduk);
 		}
-		/*
-		 * TMT Tarif baru tahun 2024
-		 */
-		Date tmtTarif2024 = new Date(millisTarif2024);
-		/*
-		 * TMT persentase jasa tahun 2024
-		 */
-		Date tmtPersenJasa2024 = new Date(millisPersenJasa2024);
 		/*
 		 * Mendapatkan data mentah pelayanan pasien
 		 */
@@ -986,7 +991,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 		List<Map<String, Object>> listPelayananNonJknLuarJamKerja = new ArrayList<>();
 		double capaianRemun = 0.0;
 		if (pegawaiDao.getPegawaiByKategoryPegawai(dokterParuhWaktu).contains(idPegawai)
-				&& !listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)) {
+				&& !listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)
+				&& tglAkhir.before(tmtAkhirAturanRemunDS)) {
 			/*
 			 * Dokter luar hanya mendapatkan ffs
 			 */