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-12 11:23:28 +07:00
commit fbe65a8af4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,6 @@ import static com.jasamedika.medifirst2000.constants.Master.Departemen.*;
import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.KONSULTASI; import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.KONSULTASI;
import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.VISIT; import static com.jasamedika.medifirst2000.constants.Master.GolonganProduk.VISIT;
import static com.jasamedika.medifirst2000.constants.Master.JenisPetugasPelaksana.*; import static com.jasamedika.medifirst2000.constants.Master.JenisPetugasPelaksana.*;
import static com.jasamedika.medifirst2000.constants.Master.KategoryPegawai.DOKTER_LUAR;
import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS; import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS;
import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS; import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS;
import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*; import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*;
@ -336,6 +335,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
List<Integer> listDetailJenisProdukException = new ArrayList<>(); List<Integer> listDetailJenisProdukException = new ArrayList<>();
List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
List<Integer> dokterParuhWaktu = toListIntegerSettingFix("kategoriDokterParuhWaktu", tglAkhir);
List<Integer> idsJenisProdukNonLogbook = toListIntegerSettingFix("listJenisProdukNonLogbook", tglAkhir); List<Integer> idsJenisProdukNonLogbook = toListIntegerSettingFix("listJenisProdukNonLogbook", tglAkhir);
List<Integer> idsRegDJPAdminNonPK = toListIntegerSettingFix("admin_nonpk", tglAkhir); List<Integer> idsRegDJPAdminNonPK = toListIntegerSettingFix("admin_nonpk", tglAkhir);
List<Integer> idsRegDJPMedisUtama = toListIntegerSettingFix("medis_utama", tglAkhir); List<Integer> idsRegDJPMedisUtama = toListIntegerSettingFix("medis_utama", tglAkhir);
@ -427,7 +427,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/* /*
* Mapping set awal persentase jasa remunerasi dan harga jasa remunerasi * Mapping set awal persentase jasa remunerasi dan harga jasa remunerasi
*/ */
if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai)) if (pegawaiDao.getPegawaiByKategoryPegawai(dokterParuhWaktu).contains(idPegawai))
persenVisite = persenRemunVisiteDokterKelompokBudiRahmat; persenVisite = persenRemunVisiteDokterKelompokBudiRahmat;
for (Map<String, Object> d : listRatedPay) { for (Map<String, Object> d : listRatedPay) {
double persenOperatorAkumulatif = persenOperator; double persenOperatorAkumulatif = persenOperator;
@ -985,7 +985,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
List<Map<String, Object>> listPelayananFfs = new ArrayList<>(); List<Map<String, Object>> listPelayananFfs = new ArrayList<>();
List<Map<String, Object>> listPelayananNonJknLuarJamKerja = new ArrayList<>(); List<Map<String, Object>> listPelayananNonJknLuarJamKerja = new ArrayList<>();
double capaianRemun = 0.0; double capaianRemun = 0.0;
if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai) if (pegawaiDao.getPegawaiByKategoryPegawai(dokterParuhWaktu).contains(idPegawai)
&& !listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)) { && !listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)) {
/* /*
* Dokter luar hanya mendapatkan ffs * Dokter luar hanya mendapatkan ffs
@ -2242,6 +2242,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/* /*
* Persiapan filter logic remunerasi * Persiapan filter logic remunerasi
*/ */
List<Integer> dokterParuhWaktu = toListIntegerSettingFix("kategoriDokterParuhWaktu", tglAkhir);
List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI); List<Integer> drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI);
List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM); List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA); List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
@ -2269,7 +2270,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/* /*
* Mapping persentase jasa remunerasi * Mapping persentase jasa remunerasi
*/ */
if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai) if (pegawaiDao.getPegawaiByKategoryPegawai(dokterParuhWaktu).contains(idPegawai)
&& listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)) && listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai))
persenVisite = persenRemunVisiteDokterKelompokBudiRahmat; persenVisite = persenRemunVisiteDokterKelompokBudiRahmat;
for (Map<String, Object> d : listData) { for (Map<String, Object> d : listData) {