From 96c4b261180b2018eca197cfbb82be5d7a8797e2 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 26 Feb 2025 14:03:15 +0700 Subject: [PATCH] Update RemunerasiServiceImpl.java Perbaikan filter tindakan perawat sebagai level filter setelah filter kelompok kerja --- .../service/impl/RemunerasiServiceImpl.java | 49 ++++++++++++------- 1 file changed, 30 insertions(+), 19 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 42431138..8005f2ef 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 @@ -384,7 +384,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera .collect(Collectors.toList()); listRatedPay = listRatedPay.stream() .filter(d -> !idsKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) - .filter(d -> !idsPerawat.contains(Integer.parseInt(d.get("idProduk").toString()))) .collect(Collectors.toList()); List allPaketId = mapProdukPaketDao.findProdukEntriId(); List revisedPaketId = allPaketId.stream().filter(p -> !paketBukanFixedPay.contains(p)) @@ -1077,9 +1076,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera */ if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { - if (!KK_UMUM.equals(idKKDokter) || (!idsDokterUmumExclude - .contains(Integer.parseInt(next.get("idProduk").toString())) - && tglAwal.before(tmtTarif2024))) { + if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) + || (KK_UMUM.equals(idKKDokter) + && !idsDokterUmumExclude + .contains(Integer.parseInt(next.get("idProduk").toString())) + && tglAwal.before(tmtTarif2024))) { /* * Dibatasi oleh daftar jenis tindakan tertentu */ @@ -1148,9 +1149,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Diluar pembatasan jenis produk */ - if (!KK_UMUM.equals(idKKDokter) || (!idsDokterUmumExclude - .contains(Integer.parseInt(next.get("idProduk").toString())) - && tglAwal.before(tmtTarif2024))) { + if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) + || (KK_UMUM.equals(idKKDokter) + && !idsDokterUmumExclude + .contains(Integer.parseInt(next.get("idProduk").toString())) + && tglAwal.before(tmtTarif2024))) { if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && (idsRegDJPPenunjangPA .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString())) @@ -1260,9 +1263,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera */ if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { - if (!KK_UMUM.equals(idKKDokter) || (!idsDokterUmumExclude - .contains(Integer.parseInt(next.get("idProduk").toString())) - && tglAwal.before(tmtTarif2024))) { + if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) + || (KK_UMUM.equals(idKKDokter) + && !idsDokterUmumExclude + .contains(Integer.parseInt(next.get("idProduk").toString())) + && tglAwal.before(tmtTarif2024))) { /* * Dibatasi oleh daftar jenis tindakan tertentu */ @@ -1331,9 +1336,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Diluar pembatasan jenis produk */ - if (!KK_UMUM.equals(idKKDokter) || (!idsDokterUmumExclude - .contains(Integer.parseInt(next.get("idProduk").toString())) - && tglAwal.before(tmtTarif2024))) { + if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) + || (KK_UMUM.equals(idKKDokter) + && !idsDokterUmumExclude + .contains(Integer.parseInt(next.get("idProduk").toString())) + && tglAwal.before(tmtTarif2024))) { if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && (idsRegDJPPenunjangPA .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString())) @@ -1465,9 +1472,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera */ if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { - if (!KK_UMUM.equals(idKKDokter) || (!idsDokterUmumExclude - .contains(Integer.parseInt(next.get("idProduk").toString())) - && tglAwal.before(tmtTarif2024))) { + if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) + || (KK_UMUM.equals(idKKDokter) + && !idsDokterUmumExclude + .contains(Integer.parseInt(next.get("idProduk").toString())) + && tglAwal.before(tmtTarif2024))) { /* * Dibatasi oleh daftar jenis tindakan tertentu */ @@ -1554,9 +1563,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Diluar pembatasan jenis produk */ - if (!KK_UMUM.equals(idKKDokter) || (!idsDokterUmumExclude - .contains(Integer.parseInt(next.get("idProduk").toString())) - && tglAwal.before(tmtTarif2024))) { + if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) + || (KK_UMUM.equals(idKKDokter) + && !idsDokterUmumExclude + .contains(Integer.parseInt(next.get("idProduk").toString())) + && tglAwal.before(tmtTarif2024))) { if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && (idsRegDJPPenunjangPA .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))