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 210b5dc6..b941df65 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
@@ -364,9 +364,9 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 			listDetailJenisProdukException.removeAll(listDetailJenisProduk);
 		}
 		/*
-		 * TMT KSM Umum mulai menggunakan pembatasan tindakan
+		 * TMT Tarif baru tahun 2024
 		 */
-		Date tmtTindakanKSMUmum = new Date(1738342800000L);
+		Date tmtTarif2024 = new Date(1738342800000L);
 		/*
 		 * Mendapatkan data mentah pelayanan pasien
 		 */
@@ -1034,9 +1034,17 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 						capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
 					} else if (drKsmUmumList.contains(idPegawai)
 							&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
-							&& (tglAwal.equals(tmtTindakanKSMUmum) || tglAwal.after(tmtTindakanKSMUmum))) {
+							&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
 						/*
-						 * Aturan dokter ksm umum
+						 * Aturan dokter ksm umum tarif 2024
+						 */
+						listPelayananRemun.add(next);
+						capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
+					} else if (drKkPerinatologiList.contains(idPegawai)
+							&& idsDokterPerinatologi.contains(Integer.parseInt(next.get("idProduk").toString()))
+							&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
+						/*
+						 * Aturan dokter kk perinatologi tarif 2024
 						 */
 						listPelayananRemun.add(next);
 						capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
@@ -1048,7 +1056,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 								.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
 							if (!drKsmUmumList.contains(idPegawai) || (!idsDokterUmumExclude
 									.contains(Integer.parseInt(next.get("idProduk").toString()))
-									&& tglAwal.before(tmtTindakanKSMUmum))) {
+									&& tglAwal.before(tmtTarif2024))) {
 								/*
 								 * Dibatasi oleh daftar jenis tindakan tertentu
 								 */
@@ -1077,7 +1085,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 												Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
 								&& IGD.equals(next.get("idDepartemen")) && drKsmUmumList.contains(idPegawai)
 								&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
-								&& tglAwal.before(tmtTindakanKSMUmum)) {
+								&& tglAwal.before(tmtTarif2024)) {
 							/*
 							 * Aturan dokter ksm umum di igd
 							 */
@@ -1088,7 +1096,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 										&& !listDetailJenisProduk.contains(
 												Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
 								&& drKkPerinatologiList.contains(idPegawai)
-								&& idsDokterPerinatologi.contains(Integer.parseInt(next.get("idProduk").toString()))) {
+								&& idsDokterPerinatologi.contains(Integer.parseInt(next.get("idProduk").toString()))
+								&& tglAwal.before(tmtTarif2024)) {
 							/*
 							 * Aturan dokter kk perinatologi dengan pembatasan
 							 * tindakan tertentu
@@ -1118,7 +1127,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 							 */
 							if (!drKsmUmumList.contains(idPegawai) || (!idsDokterUmumExclude
 									.contains(Integer.parseInt(next.get("idProduk").toString()))
-									&& tglAwal.before(tmtTindakanKSMUmum))) {
+									&& tglAwal.before(tmtTarif2024))) {
 								if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
 										&& (idsRegDJPPenunjangPA
 												.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))
@@ -1190,9 +1199,17 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 						capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
 					} else if (drKsmUmumList.contains(idPegawai)
 							&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
-							&& (tglAwal.equals(tmtTindakanKSMUmum) || tglAwal.after(tmtTindakanKSMUmum))) {
+							&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
 						/*
-						 * Aturan dokter ksm umum
+						 * Aturan dokter ksm umum tarif 2024
+						 */
+						listPelayananRemun.add(next);
+						capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
+					} else if (drKkPerinatologiList.contains(idPegawai)
+							&& idsDokterPerinatologi.contains(Integer.parseInt(next.get("idProduk").toString()))
+							&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
+						/*
+						 * Aturan dokter kk perinatologi tarif 2024
 						 */
 						listPelayananRemun.add(next);
 						capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
@@ -1204,7 +1221,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 								.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
 							if (!drKsmUmumList.contains(idPegawai) || (!idsDokterUmumExclude
 									.contains(Integer.parseInt(next.get("idProduk").toString()))
-									&& tglAwal.before(tmtTindakanKSMUmum))) {
+									&& tglAwal.before(tmtTarif2024))) {
 								/*
 								 * Dibatasi oleh daftar jenis tindakan tertentu
 								 */
@@ -1233,7 +1250,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 												Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
 								&& IGD.equals(next.get("idDepartemen")) && drKsmUmumList.contains(idPegawai)
 								&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
-								&& tglAwal.before(tmtTindakanKSMUmum)) {
+								&& tglAwal.before(tmtTarif2024)) {
 							/*
 							 * Aturan dokter ksm umum di igd
 							 */
@@ -1244,7 +1261,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 										&& !listDetailJenisProduk.contains(
 												Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
 								&& drKkPerinatologiList.contains(idPegawai)
-								&& idsDokterPerinatologi.contains(Integer.parseInt(next.get("idProduk").toString()))) {
+								&& idsDokterPerinatologi.contains(Integer.parseInt(next.get("idProduk").toString()))
+								&& tglAwal.before(tmtTarif2024)) {
 							/*
 							 * Aturan dokter kk perinatologi dengan pembatasan
 							 * tindakan tertentu
@@ -1274,7 +1292,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 							 */
 							if (!drKsmUmumList.contains(idPegawai) || (!idsDokterUmumExclude
 									.contains(Integer.parseInt(next.get("idProduk").toString()))
-									&& tglAwal.before(tmtTindakanKSMUmum))) {
+									&& tglAwal.before(tmtTarif2024))) {
 								if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
 										&& (idsRegDJPPenunjangPA
 												.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))
@@ -1357,9 +1375,20 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 						}
 					} else if (drKsmUmumList.contains(idPegawai)
 							&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
-							&& (tglAwal.equals(tmtTindakanKSMUmum) || tglAwal.after(tmtTindakanKSMUmum))) {
+							&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
 						/*
-						 * Aturan dokter ksm umum
+						 * Aturan dokter ksm umum tarif 2024
+						 */
+						if (Boolean.parseBoolean(next.get("isJamKerja").toString())) {
+							listPelayananFfs.add(next);
+						} else {
+							listPelayananNonJknLuarJamKerja.add(next);
+						}
+					} else if (drKkPerinatologiList.contains(idPegawai)
+							&& idsDokterPerinatologi.contains(Integer.parseInt(next.get("idProduk").toString()))
+							&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
+						/*
+						 * Aturan dokter kk perinatologi tarif 2024
 						 */
 						if (Boolean.parseBoolean(next.get("isJamKerja").toString())) {
 							listPelayananFfs.add(next);
@@ -1374,7 +1403,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 								.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
 							if (!drKsmUmumList.contains(idPegawai) || (!idsDokterUmumExclude
 									.contains(Integer.parseInt(next.get("idProduk").toString()))
-									&& tglAwal.before(tmtTindakanKSMUmum))) {
+									&& tglAwal.before(tmtTarif2024))) {
 								/*
 								 * Dibatasi oleh daftar jenis tindakan tertentu
 								 */
@@ -1409,7 +1438,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 												Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
 								&& IGD.equals(next.get("idDepartemen")) && drKsmUmumList.contains(idPegawai)
 								&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
-								&& tglAwal.before(tmtTindakanKSMUmum)) {
+								&& tglAwal.before(tmtTarif2024)) {
 							/*
 							 * Aturan dokter ksm umum di igd
 							 */
@@ -1423,7 +1452,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 										&& !listDetailJenisProduk.contains(
 												Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
 								&& drKkPerinatologiList.contains(idPegawai)
-								&& idsDokterPerinatologi.contains(Integer.parseInt(next.get("idProduk").toString()))) {
+								&& idsDokterPerinatologi.contains(Integer.parseInt(next.get("idProduk").toString()))
+								&& tglAwal.before(tmtTarif2024)) {
 							/*
 							 * Aturan dokter kk perinatologi dengan pembatasan
 							 * tindakan tertentu
@@ -1462,7 +1492,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 							 */
 							if (!drKsmUmumList.contains(idPegawai) || (!idsDokterUmumExclude
 									.contains(Integer.parseInt(next.get("idProduk").toString()))
-									&& tglAwal.before(tmtTindakanKSMUmum))) {
+									&& tglAwal.before(tmtTarif2024))) {
 								if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
 										&& (idsRegDJPPenunjangPA
 												.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))