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

Merge branch 'dev/remun/logbook-tarif' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2025-02-27 11:55:39 +07:00
commit 6646f2d221
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -993,7 +993,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/* /*
* Urutan alokasi bpjs sebagai urutan prioritas * 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.isNotNullOrEmpty(next.get("kptl"))) {
if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(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()); 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")) } else if (KK_RADIOLOGI.equals(idKKDokter) && (BEDAH_SENTRAL.equals(next.get("idDepartemen"))
|| CATHLAB.equals(next.get("idRuangan")))) { || CATHLAB.equals(next.get("idRuangan")))) {
listPelayananRemun.add(next); listPelayananRemun.add(next);
@ -1180,7 +1188,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
* Alokasi bagian remunerasi berdasarkan target rupiah * Alokasi bagian remunerasi berdasarkan target rupiah
* sesuai tanggal mulai berlaku * 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.isNotNullOrEmpty(next.get("kptl"))) {
if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(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()); 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")) } else if (KK_RADIOLOGI.equals(idKKDokter) && (BEDAH_SENTRAL.equals(next.get("idDepartemen"))
|| CATHLAB.equals(next.get("idRuangan")))) { || CATHLAB.equals(next.get("idRuangan")))) {
listPelayananRemun.add(next); listPelayananRemun.add(next);
@ -1366,7 +1382,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/* /*
* Alokasi untuk bagian ffs * 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.isNotNullOrEmpty(next.get("kptl"))) {
if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk")) if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
|| (CommonUtil.isNotNullOrEmpty(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")) } else if (KK_RADIOLOGI.equals(idKKDokter) && (BEDAH_SENTRAL.equals(next.get("idDepartemen"))
|| CATHLAB.equals(next.get("idRuangan")))) { || CATHLAB.equals(next.get("idRuangan")))) {
if (Boolean.parseBoolean(next.get("isJamKerja").toString())) { if (Boolean.parseBoolean(next.get("isJamKerja").toString())) {