From e56bc216addce3987ca9e8f1cde2517075ecdf87 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 24 Feb 2025 14:35:13 +0700 Subject: [PATCH] Update RemunerasiServiceImpl.java Penerapan filter produk perawat tidak dapat diklaim dokter --- .../medifirst2000/service/impl/BaseVoServiceImpl.java | 4 +++- .../medifirst2000/service/impl/RemunerasiServiceImpl.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java index 82afa7cf..c0dbdb2d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java @@ -134,12 +134,14 @@ public abstract class BaseVoServiceImpl { Type effectiveDateDataFixType = new TypeToken>() { }.getType(); String jsonProdukDokterUmum = getSettingDataFixed(namaField); + if (jsonProdukDokterUmum.isEmpty()) + return result; List dataFixDTOList = gson.fromJson(jsonProdukDokterUmum, effectiveDateDataFixType); Optional first = dataFixDTOList.stream() .sorted(Comparator.comparing(EffectiveDateDataFixDTO::getTmt, Comparator.reverseOrder())) .filter(dto -> dto.getTmt() <= date.getTime()).findFirst(); if (first.isPresent()) { - String[] split = first.get().getNilaiField().split(","); + String[] split = first.get().getNilaiField().replace(" ","").split(","); for (String s : split) result.add(Integer.valueOf(s)); } 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 9df93702..42431138 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 @@ -344,6 +344,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera List idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAkhir); List idsDokterHematoOnko = getNilaiDataFixByTMT("pr_dokter_hematoonko_anak", tglAkhir); List idsDokterEmergic = getNilaiDataFixByTMT("pr_produk_emergic_anak", tglAkhir); + List idsPerawat = getNilaiDataFixByTMT("pr_produk_perawat", tglAkhir); List listIdPegawaiRemunKelompokBudiRahmat = splitDataSettingDatafixed( "listIdPegawaiRemunKelompokBudiRahmat"); List idsMonitoringIntervensi = getNilaiDataFixByTMT("idMonitoringIntervensi", tglAkhir); @@ -383,6 +384,7 @@ 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))