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

Merge branch 'dev/remunerasi/vinchia' into dev/no-cron

Browse Source
This commit is contained in:
adesyawal 2025-04-09 11:23:05 +07:00
commit 1e92229cee
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1076,7 +1076,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| CATHLAB.equals(next.get("idRuangan")))) { || CATHLAB.equals(next.get("idRuangan")))) {
listPelayananRemun.add(next); listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (KK_UMUM.equals(idKKDokter) } else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249) )
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
/* /*
@ -1117,7 +1117,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk
.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| (KK_UMUM.equals(idKKDokter) || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -1147,7 +1147,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
&& !listDetailJenisProduk.contains( && !listDetailJenisProduk.contains(
Integer.parseInt(next.get("idDetailJenisProduk").toString())))) Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
&& IGD.equals(next.get("idDepartemen")) && KK_UMUM.equals(idKKDokter) && IGD.equals(next.get("idDepartemen")) && (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024)) { && tglAwal.before(tmtTarif2024)) {
/* /*
@ -1190,7 +1190,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
* Diluar pembatasan jenis produk * Diluar pembatasan jenis produk
*/ */
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| (KK_UMUM.equals(idKKDokter) || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -1271,7 +1271,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| CATHLAB.equals(next.get("idRuangan")))) { || CATHLAB.equals(next.get("idRuangan")))) {
listPelayananRemun.add(next); listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (KK_UMUM.equals(idKKDokter) } else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
/* /*
@ -1312,7 +1312,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk
.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| (KK_UMUM.equals(idKKDokter) || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -1342,7 +1342,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
&& !listDetailJenisProduk.contains( && !listDetailJenisProduk.contains(
Integer.parseInt(next.get("idDetailJenisProduk").toString())))) Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
&& IGD.equals(next.get("idDepartemen")) && KK_UMUM.equals(idKKDokter) && IGD.equals(next.get("idDepartemen")) && (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024)) { && tglAwal.before(tmtTarif2024)) {
/* /*
@ -1385,7 +1385,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
* Diluar pembatasan jenis produk * Diluar pembatasan jenis produk
*/ */
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| (KK_UMUM.equals(idKKDokter) || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -1480,7 +1480,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} else { } else {
listPelayananNonJknLuarJamKerja.add(next); listPelayananNonJknLuarJamKerja.add(next);
} }
} else if (KK_UMUM.equals(idKKDokter) } else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) { && (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
/* /*
@ -1532,7 +1532,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk
.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| (KK_UMUM.equals(idKKDokter) || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -1568,7 +1568,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) || (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
&& !listDetailJenisProduk.contains( && !listDetailJenisProduk.contains(
Integer.parseInt(next.get("idDetailJenisProduk").toString())))) Integer.parseInt(next.get("idDetailJenisProduk").toString()))))
&& IGD.equals(next.get("idDepartemen")) && KK_UMUM.equals(idKKDokter) && IGD.equals(next.get("idDepartemen")) && (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString())) && idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024)) { && tglAwal.before(tmtTarif2024)) {
/* /*
@ -1623,7 +1623,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
* Diluar pembatasan jenis produk * Diluar pembatasan jenis produk
*/ */
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| (KK_UMUM.equals(idKKDokter) || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& !idsDokterUmumExclude && !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString())) .contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) { && tglAwal.before(tmtTarif2024))) {
@ -2273,6 +2273,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/* /*
* Filtering tools: pelayanan bedah * Filtering tools: pelayanan bedah
*/ */
List<Integer> dokterAndAsisten = Arrays.asList(DOKTER_PEMERIKSA_AND_ASISTEN); List<Integer> dokterAndAsisten = Arrays.asList(DOKTER_PEMERIKSA_AND_ASISTEN);
List<Integer> listKsm = Arrays.asList(KSM); List<Integer> listKsm = Arrays.asList(KSM);
List<String> idPelayananByDokter = pelayananPasienDao.findIdPelayananByDokter(idPegawai, tglAwal, tglAkhir, List<String> idPelayananByDokter = pelayananPasienDao.findIdPelayananByDokter(idPegawai, tglAwal, tglAkhir,