From 59fc605b596e22d5b0846a39b3ee038d508f90a3 Mon Sep 17 00:00:00 2001
From: adesyawal <52590145+adesyawal@users.noreply.github.com>
Date: Mon, 19 May 2025 13:38:14 +0700
Subject: [PATCH] Bug Fixing Persen Jasa Operator Akumulasi

---
 .../service/impl/RemunerasiServiceImpl.java         | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 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 a5b17676..9abaf6c6 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
@@ -438,6 +438,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 			double persenOperatorAkumulatif = persenOperator;
 			StatusPersenBedah statusPersenBedah = decidePercentBedah(pelayananBedah, d);
 			if (CommonUtil.isNotNullOrEmpty(statusPersenBedah) && FULL_OPERATOR.equals(statusPersenBedah)
+					&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
 					&& (tglAwal.equals(tmtPersenJasa2024) || tglAwal.after(tmtPersenJasa2024)))
 				persenOperatorAkumulatif += persenAsisten;
 			if (paketBukanFixedPay.contains(Integer.parseInt(d.get("idProduk").toString())))
@@ -1114,6 +1115,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 						/*
 						 * Selain dokter-dokter kk pediatrik gawat darurat
 						 */
+						//ayam
 						if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk
 								.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
 							if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
@@ -1181,6 +1183,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 								listPelayananRemun.add(next);
 								capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
 							}
+							//kodok
 						} else if (CommonUtil.isNullOrEmpty(listDetailJenisProdukException)
 								|| (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
 										&& CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
@@ -1271,6 +1274,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 							|| CATHLAB.equals(next.get("idRuangan")))) {
 						listPelayananRemun.add(next);
 						capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
+						//sapi
 					} else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
 							&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
 							&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
@@ -1401,6 +1405,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 									listPelayananRemun.add(next);
 									capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
 								} else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
+								//rani
 										|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
 												&& !idsJenisProdukNonLogbook.contains(
 														Integer.parseInt(next.get("idJenisProduk").toString())))) {
@@ -1531,8 +1536,9 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 						 */
 						if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk
 								.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
-							if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
-									|| ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
+							if (
+								//LUMPING
+								!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
 											&& !idsDokterUmumExclude
 													.contains(Integer.parseInt(next.get("idProduk").toString()))
 											&& tglAwal.before(tmtTarif2024))) {
@@ -2297,6 +2303,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 			double persenOperatorAkumulatif = persenOperator;
 			StatusPersenBedah statusPersenBedah = decidePercentBedah(pelayananBedah, d);
 			if (CommonUtil.isNotNullOrEmpty(statusPersenBedah) && FULL_OPERATOR.equals(statusPersenBedah)
+			//was here
+					&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
 					&& (tglAwal.equals(tmtPersenJasa2024) || tglAwal.after(tmtPersenJasa2024)))
 				persenOperatorAkumulatif += persenAsisten;
 			double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
@@ -2687,6 +2695,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
 			double persenOperatorAkumulatif = persenOperator;
 			StatusPersenBedah statusPersenBedah = decidePercentBedah(pelayananBedah, d);
 			if (CommonUtil.isNotNullOrEmpty(statusPersenBedah) && FULL_OPERATOR.equals(statusPersenBedah)
+					&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
 					&& (tglAwal.equals(tmtPersenJasa2024) || tglAwal.after(tmtPersenJasa2024)))
 				persenOperatorAkumulatif += persenAsisten;
 			double hargaJual = Double.parseDouble(d.get("hargaJual").toString());