diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java index e50c5e94..d6f663d3 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java @@ -312,6 +312,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD")); double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika")); double persenRemunTerapis = Double.parseDouble(GetSettingDataFixed("persenRemunTerapis")); + double persenRemunVisiteDokterKelompokBudiRahmat = Double + .parseDouble(GetSettingDataFixed("persenRemunVisiteDokterKelompokBudiRahmat")); /* * Persiapan filter logic remunerasi */ @@ -336,6 +338,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); List idsDokterBPJSffs = splitDataSettingDatafixed("dokterBPJSffs"); List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); + List listIdPegawaiRemunKelompokBudiRahmat = splitDataSettingDatafixed( + "listIdPegawaiRemunKelompokBudiRahmat"); List idsMonitoringIntervensi = splitDataSettingDatafixed("idMonitoringIntervensi"); List idsMonitoringHemodinamikGagalOrgan = splitDataSettingDatafixed( "idMonitoringHemodinamikGagalOrgan"); @@ -391,7 +395,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera * Mapping set awal persentase jasa remunerasi dan harga jasa remunerasi */ if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai)) - persenVisite = 15.0; + persenVisite = persenRemunVisiteDokterKelompokBudiRahmat; for (Map d : listRatedPay) { if (paketBukanFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) d.put("hargaJual", d.get("komponenTotalTarif")); @@ -947,7 +951,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera List> listPelayananNonJknLuarJamKerja = new ArrayList<>(); double capaianRemun = 0.0; if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai) - && idPegawai != 1417) { + && !listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)) { /* * Dokter luar hanya mendapatkan ffs */ @@ -1932,6 +1936,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD")); double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika")); double persenRemunTerapis = Double.parseDouble(GetSettingDataFixed("persenRemunTerapis")); + double persenRemunVisiteDokterKelompokBudiRahmat = Double + .parseDouble(GetSettingDataFixed("persenRemunVisiteDokterKelompokBudiRahmat")); /* * Persiapan filter logic remunerasi */ @@ -1941,6 +1947,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); + List listIdPegawaiRemunKelompokBudiRahmat = splitDataSettingDatafixed( + "listIdPegawaiRemunKelompokBudiRahmat"); /* * Set persen jasa dan harga jasa pasien bpjs di ibs, icu */ @@ -1949,8 +1957,9 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Mapping persentase jasa remunerasi */ - if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai)) - persenVisite = 15.0; + if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai) + && listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)) + persenVisite = persenRemunVisiteDokterKelompokBudiRahmat; for (Map d : listData) { double hargaJual = Double.parseDouble(d.get("hargaJual").toString()); if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {