Merge branch 'dev/remun/logbook-nonjkn-dg-jam' into dev/no-cron

This commit is contained in:
Salman Manoe 2024-05-22 11:01:52 +07:00
commit fb2e8342fd

View File

@ -2047,12 +2047,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI);
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
if (terapisRehabMedik.contains(idPegawai)) {
result.put("data", new ArrayList<>());
result.put("target", target);
result.put("targetFormatted", targetFormatted);
return result;
}
/*
* Set persen jasa dan harga jasa pasien bpjs di ibs, icu
*/
@ -2442,8 +2436,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI);
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
if (terapisRehabMedik.contains(idPegawai))
return new ArrayList<>();
/*
* Mapping persentase jasa remunerasi
*/
@ -2697,7 +2689,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
double persenJasaDokterPA = Double.parseDouble(GetSettingDataFixed("persenJasaDokterPA"));
double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD"));
double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika"));
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaLuarTerapis"));
/*
* Persiapan filter logic remunerasi
*/