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

Compare commits

base: salmanoe:899fbf85008440377aeb12e3adbc478bebc9a200
Branches Tags
salmanoe:master
salmanoe:dev/integrasi/minio
salmanoe:dev/technical-debt/clean-code
salmanoe:prod/base
salmanoe:prod/no-cron
salmanoe:dev/no-cron
salmanoe:ade/reporting/modifikasi-printout-cuti
salmanoe:dev/base
salmanoe:ade/bug-fixing/hapus-logbook
salmanoe:ade/monitoring-absensi/bug-fixing-absen-tunggal
salmanoe:ade/bug-remun/perbaikan-recursive-fixed-pay
salmanoe:ade/monitoring-absen/shift-pm3
salmanoe:ade/monitor-absen/shift-pm2
salmanoe:ade/monitor-absen/shift-pm
salmanoe:ade/monitoring/check-health4
salmanoe:ade/monitoring/check-health3
salmanoe:ade/monitoring/check-health2
salmanoe:ade/sdm-absensi/realisasi-absensi
salmanoe:ade/logbook-tarif/penyesuainruangan70persen
salmanoe:ade/logbook-tarif/ekslusi-dentalicious
salmanoe:ade/bug-fixing/master-shift-on-cuti
salmanoe:ade/bug-fixing/level-unitkerja-direktur
salmanoe:ade/mastershift-holidayservice-monitoringabsensi
salmanoe:ade/logbook/rekap-logbook-tarif
salmanoe:ade/bug-fixing/intervensi-cuti
salmanoe:dev-ade/sdm/intervensi-cuti
salmanoe:ade/bug-fixing/hak-akses-diskon-total
salmanoe:dev/billing/diskonpegawai
salmanoe:sdm/remunerasi/bug-fixing-pelayan-findPelayananBedah
salmanoe:dev/sdm/remunerasi
salmanoe:dev/remunerasi/bugfixingakumulasipersen
salmanoe:dev/pegawai/ws-example-ade-v2
..
compare: salmanoe:1e92229cee5e51e9069ecf7ba8b70d8aa8ddc3bc
Branches Tags
salmanoe:dev/integrasi/minio
salmanoe:dev/technical-debt/clean-code
salmanoe:master
salmanoe:prod/base
salmanoe:prod/no-cron
salmanoe:dev/no-cron
salmanoe:ade/reporting/modifikasi-printout-cuti
salmanoe:dev/base
salmanoe:ade/bug-fixing/hapus-logbook
salmanoe:ade/monitoring-absensi/bug-fixing-absen-tunggal
salmanoe:ade/bug-remun/perbaikan-recursive-fixed-pay
salmanoe:ade/monitoring-absen/shift-pm3
salmanoe:ade/monitor-absen/shift-pm2
salmanoe:ade/monitor-absen/shift-pm
salmanoe:ade/monitoring/check-health4
salmanoe:ade/monitoring/check-health3
salmanoe:ade/monitoring/check-health2
salmanoe:ade/sdm-absensi/realisasi-absensi
salmanoe:ade/logbook-tarif/penyesuainruangan70persen
salmanoe:ade/logbook-tarif/ekslusi-dentalicious
salmanoe:ade/bug-fixing/master-shift-on-cuti
salmanoe:ade/bug-fixing/level-unitkerja-direktur
salmanoe:ade/mastershift-holidayservice-monitoringabsensi
salmanoe:ade/logbook/rekap-logbook-tarif
salmanoe:ade/bug-fixing/intervensi-cuti
salmanoe:dev-ade/sdm/intervensi-cuti
salmanoe:ade/bug-fixing/hak-akses-diskon-total
salmanoe:dev/billing/diskonpegawai
salmanoe:sdm/remunerasi/bug-fixing-pelayan-findPelayananBedah
salmanoe:dev/sdm/remunerasi
salmanoe:dev/remunerasi/bugfixingakumulasipersen
salmanoe:dev/pegawai/ws-example-ade-v2

No commits in common. "899fbf85008440377aeb12e3adbc478bebc9a200" and "1e92229cee5e51e9069ecf7ba8b70d8aa8ddc3bc" have entirely different histories.
899fbf8500 ... 1e92229cee

1 changed files with 2 additions and 11 deletions
Show Stats Expand all files Collapse all files

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

@ -438,7 +438,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenOperatorAkumulatif = persenOperator;
StatusPersenBedah statusPersenBedah = decidePercentBedah(pelayananBedah, d);
if (CommonUtil.isNotNullOrEmpty(statusPersenBedah) && FULL_OPERATOR.equals(statusPersenBedah)
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& (tglAwal.equals(tmtPersenJasa2024) || tglAwal.after(tmtPersenJasa2024)))
persenOperatorAkumulatif += persenAsisten;
if (paketBukanFixedPay.contains(Integer.parseInt(d.get("idProduk").toString())))
@ -1115,7 +1114,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/*
* Selain dokter-dokter kk pediatrik gawat darurat
*/
//ayam
if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk
.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
@ -1183,7 +1181,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
}
//kodok
} else if (CommonUtil.isNullOrEmpty(listDetailJenisProdukException)
|| (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
&& CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk"))
@ -1274,7 +1271,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|| CATHLAB.equals(next.get("idRuangan")))) {
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
//sapi
} else if ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& idsDokterUmumIGD.contains(Integer.parseInt(next.get("idProduk").toString()))
&& (tglAwal.equals(tmtTarif2024) || tglAwal.after(tmtTarif2024))) {
@ -1405,7 +1401,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
listPelayananRemun.add(next);
capaianRemun += Double.parseDouble(next.get("hargaJasa").toString());
} else if (CommonUtil.isNullOrEmpty(next.get("idJenisProduk"))
//rani
|| (CommonUtil.isNotNullOrEmpty(next.get("idJenisProduk"))
&& !idsJenisProdukNonLogbook.contains(
Integer.parseInt(next.get("idJenisProduk").toString())))) {
@ -1536,9 +1531,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
*/
if (CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) && listDetailJenisProduk
.contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) {
if (
//LUMPING
!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString())) || ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
if (!idsPerawat.contains(Integer.parseInt(next.get("idProduk").toString()))
|| ( (KK_UMUM.equals(idKKDokter) || idPegawai.equals(1249))
&& !idsDokterUmumExclude
.contains(Integer.parseInt(next.get("idProduk").toString()))
&& tglAwal.before(tmtTarif2024))) {
@ -2303,8 +2297,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenOperatorAkumulatif = persenOperator;
StatusPersenBedah statusPersenBedah = decidePercentBedah(pelayananBedah, d);
if (CommonUtil.isNotNullOrEmpty(statusPersenBedah) && FULL_OPERATOR.equals(statusPersenBedah)
//was here
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& (tglAwal.equals(tmtPersenJasa2024) || tglAwal.after(tmtPersenJasa2024)))
persenOperatorAkumulatif += persenAsisten;
double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
@ -2695,7 +2687,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenOperatorAkumulatif = persenOperator;
StatusPersenBedah statusPersenBedah = decidePercentBedah(pelayananBedah, d);
if (CommonUtil.isNotNullOrEmpty(statusPersenBedah) && FULL_OPERATOR.equals(statusPersenBedah)
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& (tglAwal.equals(tmtPersenJasa2024) || tglAwal.after(tmtPersenJasa2024)))
persenOperatorAkumulatif += persenAsisten;
double hargaJual = Double.parseDouble(d.get("hargaJual").toString());