From 3e37a8e3ddfbf4b168c728b5e15bacf84d72f7f0 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Thu, 27 Feb 2025 11:55:28 +0700 Subject: [PATCH] Update RemunerasiServiceImpl.java Penyesuaian data cleansing untuk aturan remun dokter kk eria --- .../service/impl/RemunerasiServiceImpl.java | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 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 8005f2ef..0fb31f31 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 @@ -993,7 +993,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Urutan alokasi bpjs sebagai urutan prioritas */ - if (KK_PEDIATRIK_GD.equals(idKKDokter)) { + if (KK_PEDIATRIK_GD.equals(idKKDokter) && tglAwal.before(tmtTarif2024)) { if (CommonUtil.isNotNullOrEmpty(next.get("kptl"))) { if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) @@ -1032,6 +1032,14 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); } } + } else if (KK_PEDIATRIK_GD.equals(idKKDokter) + && idsDokterPediatrikGD.contains(Integer.parseInt(next.get("idProduk").toString())) + && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { + /* + * Aturan dokter kk eria tarif 2024 + */ + listPelayananRemun.add(next); + capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); } else if (KK_RADIOLOGI.equals(idKKDokter) && (BEDAH_SENTRAL.equals(next.get("idDepartemen")) || CATHLAB.equals(next.get("idRuangan")))) { listPelayananRemun.add(next); @@ -1180,7 +1188,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera * Alokasi bagian remunerasi berdasarkan target rupiah * sesuai tanggal mulai berlaku */ - if (KK_PEDIATRIK_GD.equals(idKKDokter)) { + if (KK_PEDIATRIK_GD.equals(idKKDokter) && tglAwal.before(tmtTarif2024)) { if (CommonUtil.isNotNullOrEmpty(next.get("kptl"))) { if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) @@ -1219,6 +1227,14 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); } } + } else if (KK_PEDIATRIK_GD.equals(idKKDokter) + && idsDokterPediatrikGD.contains(Integer.parseInt(next.get("idProduk").toString())) + && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { + /* + * Aturan dokter kk eria tarif 2024 + */ + listPelayananRemun.add(next); + capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); } else if (KK_RADIOLOGI.equals(idKKDokter) && (BEDAH_SENTRAL.equals(next.get("idDepartemen")) || CATHLAB.equals(next.get("idRuangan")))) { listPelayananRemun.add(next); @@ -1366,7 +1382,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Alokasi untuk bagian ffs */ - if (KK_PEDIATRIK_GD.equals(idKKDokter)) { + if (KK_PEDIATRIK_GD.equals(idKKDokter) && tglAwal.before(tmtTarif2024)) { if (CommonUtil.isNotNullOrEmpty(next.get("kptl"))) { if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk")) @@ -1414,6 +1430,17 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera } } } + } else if (KK_PEDIATRIK_GD.equals(idKKDokter) + && idsDokterPediatrikGD.contains(Integer.parseInt(next.get("idProduk").toString())) + && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { + /* + * Aturan dokter kk eria tarif 2024 + */ + if (Boolean.parseBoolean(next.get("isJamKerja").toString())) { + listPelayananFfs.add(next); + } else { + listPelayananNonJknLuarJamKerja.add(next); + } } else if (KK_RADIOLOGI.equals(idKKDokter) && (BEDAH_SENTRAL.equals(next.get("idDepartemen")) || CATHLAB.equals(next.get("idRuangan")))) { if (Boolean.parseBoolean(next.get("isJamKerja").toString())) {