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

Merge branch 'dev/base' into dev/integrasi/minio

Browse Source
This commit is contained in:
Salman Manoe 2025-03-14 13:40:33 +07:00
commit a805a616b8
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,8 +326,21 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenRemunTerapis = toDoubleSettingFix("persenRemunTerapis", tglAkhir);
double persenRemunVisiteDokterKelompokBudiRahmat = toDoubleSettingFix(
"persenRemunVisiteDokterKelompokBudiRahmat", tglAkhir);
/*
* TMT Tarif baru tahun 2024
*/
long millisTarif2024 = Long.parseLong(getSettingDataFixed("tmtTarif2024"));
Date tmtTarif2024 = new Date(millisTarif2024);
/*
* TMT persentase jasa tahun 2024
*/
long millisPersenJasa2024 = Long.parseLong(getSettingDataFixed("tmtPersenJasa2024"));
Date tmtPersenJasa2024 = new Date(millisPersenJasa2024);
/*
* TMT akhir aturan remun DS
*/
long millisAkhirAturanRemunDS = Long.parseLong(getSettingDataFixed("tmtAkhirAturanRemunDS"));
Date tmtAkhirAturanRemunDS = new Date(millisAkhirAturanRemunDS);
/*
* Persiapan filter logic remunerasi
*/
@ -373,14 +386,6 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
listDetailJenisProdukException = idsRegDJPAdminNonPK;
listDetailJenisProdukException.removeAll(listDetailJenisProduk);
}
/*
* TMT Tarif baru tahun 2024
*/
Date tmtTarif2024 = new Date(millisTarif2024);
/*
* TMT persentase jasa tahun 2024
*/
Date tmtPersenJasa2024 = new Date(millisPersenJasa2024);
/*
* Mendapatkan data mentah pelayanan pasien
*/
@ -986,7 +991,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
List<Map<String, Object>> listPelayananNonJknLuarJamKerja = new ArrayList<>();
double capaianRemun = 0.0;
if (pegawaiDao.getPegawaiByKategoryPegawai(dokterParuhWaktu).contains(idPegawai)
&& !listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)) {
&& !listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)
&& tglAkhir.before(tmtAkhirAturanRemunDS)) {
/*
* Dokter luar hanya mendapatkan ffs
*/