salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update RemunerasiServiceImpl.java

Browse Source 
Perbaikan filter tindakan perawat sebagai level filter setelah filter kelompok kerja
This commit is contained in:
Salman Manoe 2025-02-26 14:03:15 +07:00
parent 9b11a5a2d2
commit 96c4b26118
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
View File

@ -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<Integer> allPaketId = mapProdukPaketDao.findProdukEntriId();
List<Integer> 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()))