diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KonsultasiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KonsultasiDao.java index 7c0d06e1..52fff134 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KonsultasiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KonsultasiDao.java @@ -46,12 +46,11 @@ public interface KonsultasiDao + "inner join apd.ruangan ru " + "left join pd.rekanan rk " + "where pp.tglPelayanan between :tglAwal and :tglAkhir " + "and ru.departemenId not in (:listIdDepartemen) " + "and (pg.id is null or pg.id in (:listIdPegawai)) " - + "and pr.id not in (:listKarcisIdProduk) " + "and djp.jenisProdukId not in (:listIdJenisProduk) " + + "and pr.id not in (:listIdProduk) " + "and djp.jenisProdukId not in (:listIdJenisProduk) " + "and djp.id not in (:listIdDetailJenisProduk) " + "order by dpj.namaLengkap, ru.namaRuangan") List> findAllKonsultasiTindakanKosong(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir, @Param("listIdDepartemen") List listIdDepartemen, - @Param("listIdPegawai") List listIdPegawai, - @Param("listKarcisIdProduk") List listKarcisIdProduk, + @Param("listIdPegawai") List listIdPegawai, @Param("listIdProduk") List idProdukList, @Param("listIdJenisProduk") List listIdJenisProduk, @Param("listIdDetailJenisProduk") List listIdDetailJenisProduk); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/AgamaService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/AgamaService.java index 23bf80bd..5d78e3f1 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/AgamaService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/AgamaService.java @@ -14,7 +14,7 @@ import com.jasamedika.medifirst2000.vo.AgamaVO; * @author Roberto */ public interface AgamaService extends BaseVoService { - String GetSettingDataFixed(String prefix) ; + String getSettingDataFixed(String prefix) ; List findAllAgama(); Agama findByIdAgama(Integer id); // Map upload(TestUploadVO vo) throws IOException; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/KomponenEvaluasiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/KomponenEvaluasiService.java index 79ae019e..ae6f31bf 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/KomponenEvaluasiService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/KomponenEvaluasiService.java @@ -13,7 +13,7 @@ import com.jasamedika.medifirst2000.vo.KomponenEvaluasiVO; * @author Lukman Hakim */ public interface KomponenEvaluasiService { - String GetSettingDataFixed(String prefix) ; + String getSettingDataFixed(String prefix) ; KomponenEvaluasi findByIdKomponenEvaluasi(Integer id); KomponenEvaluasiVO add(KomponenEvaluasiVO vo); KomponenEvaluasiVO update(KomponenEvaluasiVO vo); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdvokasiHukumMedicolegalServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdvokasiHukumMedicolegalServiceImpl.java index 8af4add8..077957bd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdvokasiHukumMedicolegalServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdvokasiHukumMedicolegalServiceImpl.java @@ -88,7 +88,7 @@ private static String SETTING_DATA_FIXED_JENIS="AdvokasiHukumHukor"; String noUsulan, Integer ruanganId) { List> maps = null; List> result= new ArrayList>(); - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); if (CommonUtil.isNotNullOrEmpty(noUsulan)){ maps = UsulanEvaluasiDao.listUsulanEvaluasiByRuanganPembuat(tglAwal, tglAkhir, noUsulan,ruanganId,Integer.parseInt(idJensEvaluasi)); }else{ @@ -107,7 +107,7 @@ private static String SETTING_DATA_FIXED_JENIS="AdvokasiHukumHukor"; Integer ruanganId) { List> maps = null; List> result= new ArrayList>(); - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); if (CommonUtil.isNotNullOrEmpty(noUsulan)){ maps= UsulanEvaluasiDao.listUsulanEvaluasiByRuanganTujuan(tglAwal, tglAkhir, noUsulan,ruanganId); }else{ @@ -148,7 +148,7 @@ private static String SETTING_DATA_FIXED_JENIS="AdvokasiHukumHukor"; LoginUser loginUser = loginUserService.getLoginUser(); //SET JENIS EVALUASI - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); JenisEvaluasi jenisEvaluasi = new JenisEvaluasi(); jenisEvaluasi.setId(Integer.parseInt(idJensEvaluasi));//Set Static dahulu @@ -244,7 +244,7 @@ private static String SETTING_DATA_FIXED_JENIS="AdvokasiHukumHukor"; } private Dokumen saveDokumen(String bodyFile,String fileNameTemp){ // - String idJenisDokumen= GetSettingDataFixed("JenisDokumenAdvokasiHukum"); + String idJenisDokumen= getSettingDataFixed("JenisDokumenAdvokasiHukum"); JenisDokumen jenisDokumen= new JenisDokumen(); jenisDokumen.setId(Integer.parseInt(idJenisDokumen)); Dokumen dokumen = new Dokumen(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java index e7fb7093..82afa7cf 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java @@ -1,14 +1,11 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; - +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.jasamedika.medifirst2000.core.web.WebConstants; +import com.jasamedika.medifirst2000.dao.custom.base.util.QueryOrder; +import com.jasamedika.medifirst2000.dao.custom.base.util.QueryOrderDirection; +import com.jasamedika.medifirst2000.dto.EffectiveDateDataFixDTO; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,9 +14,11 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.dao.custom.base.util.QueryOrder; -import com.jasamedika.medifirst2000.dao.custom.base.util.QueryOrderDirection; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; +import java.lang.reflect.Type; +import java.util.*; /** * Created by Roberto @@ -88,7 +87,7 @@ public abstract class BaseVoServiceImpl { protected EntityManager em; - public String GetSettingDataFixed(String prefix) { + public String getSettingDataFixed(String prefix) { StringBuffer buffer = new StringBuffer(); buffer.append("select model.nilaiField from SettingDataFixed model where model.namaField='"+prefix+"'"); Query query = em.createQuery(buffer.toString()); @@ -97,7 +96,7 @@ public abstract class BaseVoServiceImpl { } public List splitDataSettingDatafixed(String previx) { - String tmpStr = GetSettingDataFixed(previx); + String tmpStr = getSettingDataFixed(previx); String arr[] = tmpStr.split(","); List listStr = new ArrayList(); for (String ar : arr) { @@ -107,7 +106,7 @@ public abstract class BaseVoServiceImpl { } public List stringSplitDataSettingDatafixed(String previx) { - String tmpStr = GetSettingDataFixed(previx); + String tmpStr = getSettingDataFixed(previx); String arr[] = tmpStr.split(","); List listStr = new ArrayList(); for (String ar : arr) { @@ -128,5 +127,23 @@ public abstract class BaseVoServiceImpl { public String getUrlServiceSarPras() { return urlServiceSarPras; } + + public List getNilaiDataFixByTMT(String namaField, Date date) { + List result = new ArrayList<>(); + Gson gson = new Gson(); + Type effectiveDateDataFixType = new TypeToken>() { + }.getType(); + String jsonProdukDokterUmum = getSettingDataFixed(namaField); + List dataFixDTOList = gson.fromJson(jsonProdukDokterUmum, effectiveDateDataFixType); + Optional first = dataFixDTOList.stream() + .sorted(Comparator.comparing(EffectiveDateDataFixDTO::getTmt, Comparator.reverseOrder())) + .filter(dto -> dto.getTmt() <= date.getTime()).findFirst(); + if (first.isPresent()) { + String[] split = first.get().getNilaiField().split(","); + for (String s : split) + result.add(Integer.valueOf(s)); + } + return result; + } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BentukProdukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BentukProdukServiceImpl.java index 819e4f0d..2f26835d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BentukProdukServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BentukProdukServiceImpl.java @@ -103,7 +103,7 @@ public class BentukProdukServiceImpl extends BaseVoServiceImpl implements Bentuk @Override public Map getBentukProduk(String inputKode) { Map result = new HashMap(); - List idBentukGizi = Arrays.asList(GetSettingDataFixed(inputKode).split(",")); + List idBentukGizi = Arrays.asList(getSettingDataFixed(inputKode).split(",")); List id = new ArrayList(); for(String idBentuk : idBentukGizi){ id.add(Integer.parseInt(idBentuk)); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CekListGedungBangunanHeaderServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CekListGedungBangunanHeaderServiceImpl.java index b7c72596..eb25c5fb 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CekListGedungBangunanHeaderServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CekListGedungBangunanHeaderServiceImpl.java @@ -26,11 +26,9 @@ import com.jasamedika.medifirst2000.entities.AsalSukuCadang; import com.jasamedika.medifirst2000.entities.CekListGedungBangunan; import com.jasamedika.medifirst2000.entities.CekListGedungBangunanDetail; import com.jasamedika.medifirst2000.entities.CekListGedungBangunanHeader; -import com.jasamedika.medifirst2000.entities.IpsrsPemeriksaanAlat; import com.jasamedika.medifirst2000.entities.KelompokTransaksi; import com.jasamedika.medifirst2000.entities.OrderPelayanan; import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Pemeriksaan; import com.jasamedika.medifirst2000.entities.PlanningPelayanan; import com.jasamedika.medifirst2000.entities.PlanningPelayananPetugas; import com.jasamedika.medifirst2000.entities.RegistrasiAset; @@ -51,12 +49,8 @@ import com.jasamedika.medifirst2000.vo.CekListGedungBangunanHeaderVO; import com.jasamedika.medifirst2000.vo.CekListGedungBangunanVO; import com.jasamedika.medifirst2000.vo.OrderPelayananVO; import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.PemeliharaanVO; -import com.jasamedika.medifirst2000.vo.PemeriksaanVO; import com.jasamedika.medifirst2000.vo.PenjadwalanDetailVO; -import com.jasamedika.medifirst2000.vo.PenjadwalanHeaderVO; import com.jasamedika.medifirst2000.vo.PlanningPelayananPetugasVO; -import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO; import com.jasamedika.medifirst2000.vo.RekananSkKontrakDetailVO; import com.jasamedika.medifirst2000.vo.RekananSkKontrakVO; import com.jasamedika.medifirst2000.vo.RekananVO; @@ -232,7 +226,7 @@ public class CekListGedungBangunanHeaderServiceImpl extends BaseVoServiceImpl im strukOrder.setKeteranganOrder("Jadwal Kalibrasi"); } KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("kelompokTransaksiPermintaanPerbaikanIpsrs"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("kelompokTransaksiPermintaanPerbaikanIpsrs"))); strukOrder.setKelompokTransaksi(kelompokTransaksi); if(CommonUtil.isNotNullOrEmpty(vo.getRuanganTujuan())){ diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdBmhpServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdBmhpServiceImpl.java index 1850ed0d..83a15e84 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdBmhpServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdBmhpServiceImpl.java @@ -161,10 +161,10 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB public Map produksiBmhp(CssdProduksiBmhpHeaderVO vo) { StrukHistori strukHistori = new StrukHistori(); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransasksiProduksiBmhp"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransasksiProduksiBmhp"))); strukHistori.setKelompokTransaksi(kelompokTransaksi); Ruangan r = new Ruangan(); - r.setId(Integer.parseInt(GetSettingDataFixed("kdRuanganCssd"))); + r.setId(Integer.parseInt(getSettingDataFixed("kdRuanganCssd"))); strukHistori.setRuangan(r); strukHistori.setStatusEnabled(true); strukHistori.setKdProfile((short) 0); @@ -382,7 +382,7 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB stokProdukDetail.setHargaNetto2(hargaNetto2); stokProdukDetail.setPersenDiscount(detail.getPersendiscount()); stokProdukDetail.setProduk(detail.getKdproduk()); - stokProdukDetail.setRuangan(ruanganDao.findById(new Integer(GetSettingDataFixed("kdRuanganCssd")))); + stokProdukDetail.setRuangan(ruanganDao.findById(new Integer(getSettingDataFixed("kdRuanganCssd")))); stokProdukDetailDao.save(stokProdukDetail); return setStokprodukDetail; @@ -414,7 +414,7 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB Double hargaNetto2 = hargaNetto1 - diskon; if (CommonUtil.isNotNullOrEmpty(detail.getKdproduk()) && CommonUtil.isNotNullOrEmpty(detail.getKdasalproduk())) { - Integer id = new Integer(GetSettingDataFixed("kdRuanganCssd")); + Integer id = new Integer(getSettingDataFixed("kdRuanganCssd")); Integer kdProduk = detail.getKdproduk().getId(); List listStokProdukGlobal = stokProdukGlobalDao.findStokWitAsalProduk(kdProduk, id); if (CommonUtil.isNotNullOrEmpty(listStokProdukGlobal)) { @@ -441,7 +441,7 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB stokProdukGlobal.setHargaNetto2(hargaNetto2); stokProdukGlobal.setPersenDiscount(detail.getPersendiscount()); stokProdukGlobal.setProduk(detail.getKdproduk()); - stokProdukGlobal.setRuangan(ruanganDao.findById(new Integer(GetSettingDataFixed("kdRuanganCssd")))); + stokProdukGlobal.setRuangan(ruanganDao.findById(new Integer(getSettingDataFixed("kdRuanganCssd")))); stokProdukGlobal.setNamaExternal(detail.getKdproduk().getNamaProduk()); stokProdukGlobal.setKodeExternal("0"); stokProdukGlobal.setReportDisplay(detail.getKdproduk().getNamaProduk()); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdReturServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdReturServiceImpl.java index c2231a3a..b853206b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdReturServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdReturServiceImpl.java @@ -72,7 +72,7 @@ public class CssdReturServiceImpl extends BaseAngaranServiceImpl implements Cssd strukRetur.setPegawai(getPegawaiByUserLogin()); strukRetur.setKeteranganAlasan(vo.getKeterangan()); KelompokTransaksi kelompokTransaksi = kelompokTransaksiDao - .findById(Integer.parseInt(GetSettingDataFixed("kdReturCssd"))); + .findById(Integer.parseInt(getSettingDataFixed("kdReturCssd"))); strukRetur.setKelompokTransaksi(kelompokTransaksi); List data = new ArrayList(); if (CommonUtil.isNotNullOrEmpty(vo.getReturDetail())) { @@ -167,7 +167,7 @@ public class CssdReturServiceImpl extends BaseAngaranServiceImpl implements Cssd public Map listReturCssd(Integer page, Integer limit, String sort, String dir, String tanggalAwal, String tanggalAhir, Integer produkId, Integer jenisProdukId, Integer kelompokProdukId, Integer supplierId) { - Integer kelompokTransaksi = Integer.parseInt(GetSettingDataFixed("kdReturCssd")); + Integer kelompokTransaksi = Integer.parseInt(getSettingDataFixed("kdReturCssd")); int totalRow = cssdReturDaoCustom.listReturCssdCount(tanggalAwal, tanggalAhir, produkId, jenisProdukId, kelompokProdukId, supplierId, kelompokTransaksi); int totalPages = 0; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdSterilisasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdSterilisasiServiceImpl.java index 7b89d453..8cd56e6f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdSterilisasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CssdSterilisasiServiceImpl.java @@ -31,9 +31,7 @@ import com.jasamedika.medifirst2000.dao.custom.CssdSterilDaoCustom; import com.jasamedika.medifirst2000.dao.custom.CssdSterilisasiDaoCustom; import com.jasamedika.medifirst2000.dao.custom.MapPaketToProdukDaoCustom; import com.jasamedika.medifirst2000.dto.MapPaketToProdukDto; -import com.jasamedika.medifirst2000.dto.ProdukLinenExternalDto; import com.jasamedika.medifirst2000.entities.Alamat; -import com.jasamedika.medifirst2000.entities.Alat; import com.jasamedika.medifirst2000.entities.AsalProduk; import com.jasamedika.medifirst2000.entities.CssdCaraSterilisasi; import com.jasamedika.medifirst2000.entities.CssdMappingCaraSterilisasi; @@ -47,27 +45,22 @@ import com.jasamedika.medifirst2000.entities.Paket; import com.jasamedika.medifirst2000.entities.Pasien; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.Pendidikan; -import com.jasamedika.medifirst2000.entities.PlanningPelayananPetugas; import com.jasamedika.medifirst2000.entities.Produk; import com.jasamedika.medifirst2000.entities.Ruangan; import com.jasamedika.medifirst2000.entities.SatuanStandar; import com.jasamedika.medifirst2000.entities.StatusPerkawinan; import com.jasamedika.medifirst2000.entities.StrukPelayanan; import com.jasamedika.medifirst2000.entities.StrukPelayananDetail; -import com.jasamedika.medifirst2000.entities.StrukPlanning; import com.jasamedika.medifirst2000.service.CssdSterilisasiService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.service.StrukOrderService; import com.jasamedika.medifirst2000.service.StrukturNoCMService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.CssdBmhpHeaderVO; import com.jasamedika.medifirst2000.vo.CssdCaraSterilisasiVO; import com.jasamedika.medifirst2000.vo.CssdProsesSterilisasiVO; import com.jasamedika.medifirst2000.vo.CssdSterilisasiDetailVO; import com.jasamedika.medifirst2000.vo.CssdSterilisasiVO; -import com.jasamedika.medifirst2000.vo.KondisiBarangVO; import com.jasamedika.medifirst2000.vo.PegawaiVO; import com.jasamedika.medifirst2000.vo.RuanganVO; @@ -222,7 +215,7 @@ public class CssdSterilisasiServiceImpl extends BaseAngaranServiceImpl implement strukPelayanan.setKeteranganlainnya("Sterilisasi Cssd"); KelompokTransaksi kt=new KelompokTransaksi(); - kt.setId(Integer.parseInt(GetSettingDataFixed("kdSterilisasiCssd"))); + kt.setId(Integer.parseInt(getSettingDataFixed("kdSterilisasiCssd"))); strukPelayanan.setKdkelompoktransaksi(kt); strukPelayanan.setMenerima(getPegawaiByUserLogin()); @@ -428,7 +421,7 @@ public class CssdSterilisasiServiceImpl extends BaseAngaranServiceImpl implement @Override public Map listSterilisasi(Integer page, Integer limit, String sort, String dir, String tanggalAwal, String tanggalAhir, String noOrder,String jenisCustomer) { - KelompokTransaksi kelompokTransaksi=kelompokTransaksiDao.findById(Integer.parseInt(GetSettingDataFixed("kdSterilisasiCssd"))); + KelompokTransaksi kelompokTransaksi=kelompokTransaksiDao.findById(Integer.parseInt(getSettingDataFixed("kdSterilisasiCssd"))); int totalRow = cssdSterilisasiDaoCustom.countSterilisasi(tanggalAwal,tanggalAhir,kelompokTransaksi.getId(),noOrder,jenisCustomer); int totalPages = 0; int pageRequested = page; @@ -729,7 +722,7 @@ public class CssdSterilisasiServiceImpl extends BaseAngaranServiceImpl implement //Date tglTerima = DateUtil.toDate(dto.getTglTerima()); //strukPelayanan.setTglterimakiriman(tglTerima); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("kdSterilisasiCssd"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("kdSterilisasiCssd"))); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); //strukPelayanan.setKdpegawaipenerima(loginUserService.getLoginUser().getPegawai()); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarPenerimaanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarPenerimaanServiceImpl.java index 8f10058f..365d4d9b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarPenerimaanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarPenerimaanServiceImpl.java @@ -102,7 +102,7 @@ public class DaftarPenerimaanServiceImpl extends BaseVoServiceImpl implements Da KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); kelompokTransaksi - .setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiVerifikasiSetoranKasir"))); + .setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiVerifikasiSetoranKasir"))); // set kelompok transaksi setoran kasir strukVerifikasi.setKelompokTransaksi(kelompokTransaksi); @@ -231,7 +231,7 @@ public class DaftarPenerimaanServiceImpl extends BaseVoServiceImpl implements Da KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); kelompokTransaksi - .setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiVerifikasiSetoranKasir"))); + .setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiVerifikasiSetoranKasir"))); // set kelompok transaksi setoran kasir strukClosing.setKelompokTransaksi(kelompokTransaksi); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DistribusiAsetServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DistribusiAsetServiceImpl.java index a2ca742f..7d256eec 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DistribusiAsetServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DistribusiAsetServiceImpl.java @@ -3,10 +3,8 @@ package com.jasamedika.medifirst2000.service.impl; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,10 +20,7 @@ import com.jasamedika.medifirst2000.dao.StrukKirimDao; import com.jasamedika.medifirst2000.dao.StrukKonfirmasiDao; import com.jasamedika.medifirst2000.dao.StrukOrderDao; import com.jasamedika.medifirst2000.dao.custom.RegistrasiAsetDaoCustom; -import com.jasamedika.medifirst2000.entities.AsalProduk; -import com.jasamedika.medifirst2000.entities.JenisPermintaan; import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.KirimProduk; import com.jasamedika.medifirst2000.entities.KirimProdukAset; import com.jasamedika.medifirst2000.entities.OrderPelayanan; import com.jasamedika.medifirst2000.entities.Produk; @@ -48,8 +43,6 @@ import com.jasamedika.medifirst2000.vo.KirimProdukAsetVO; import com.jasamedika.medifirst2000.vo.KonfirmasiAsetVO; import com.jasamedika.medifirst2000.vo.ProdukVO; import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO; -import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganDetailVO; -import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganVO; import com.jasamedika.medifirst2000.vo.RuanganVO; /** @@ -125,7 +118,7 @@ public class DistribusiAsetServiceImpl extends BaseAngaranServiceImpl implements strukOrder.setIsDelivered((byte) 1); strukOrder.setKeteranganOrder("Permintaan Barang Dari Ruangan (Aset)"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiOrderBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiOrderBarang"))); strukOrder.setKelompokTransaksi(kelompokTransaksi); if(CommonUtil.isNotNullOrEmpty(vo.getRuanganTujuan())){ strukOrder.setRuanganTujuan(ruanganConverter.transferVOToModel(vo.getRuanganTujuan(),new Ruangan())); @@ -194,7 +187,7 @@ public class DistribusiAsetServiceImpl extends BaseAngaranServiceImpl implements strukKirim.setKeteranganlainnyakirim("Pengiriman Barang Ke Ruangan"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKirimBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKirimBarang"))); strukKirim.setKelompokTransaksi(kelompokTransaksi); if(CommonUtil.isNotNullOrEmpty(strukOrder.getRuanganTujuan())){ strukKirim.setKdruangantujuan(strukOrder.getRuanganTujuan()); @@ -253,7 +246,7 @@ public class DistribusiAsetServiceImpl extends BaseAngaranServiceImpl implements listKirimProdukAset=kirimProdukAsetDao.findByStrukKirim(vo.getStrukKirimVO().getNoRec()); } KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKonfirmasiBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKonfirmasiBarang"))); StrukKonfirmasi strukKonfirmasi = new StrukKonfirmasi(); strukKonfirmasi.setTglKonfirmasi(new Date()); strukKonfirmasi.setRuangan(getRuanganByUserLogin()); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DokumenRekamMedisServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DokumenRekamMedisServiceImpl.java index 08fcc32e..9504ecbe 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DokumenRekamMedisServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DokumenRekamMedisServiceImpl.java @@ -7,10 +7,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.UUID; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.jpa.JpaSystemException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,14 +26,11 @@ import com.jasamedika.medifirst2000.entities.StrukPelayanan; import com.jasamedika.medifirst2000.entities.Dokumen; import com.jasamedika.medifirst2000.entities.Ruangan; import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.SatuanWaktuKesling; -import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.DokumenRekamMedisService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.StringUtil; import com.jasamedika.medifirst2000.entities.DokumenRekamMedis; -import com.jasamedika.medifirst2000.entities.JenisLimbahB3Masuk; import com.jasamedika.medifirst2000.entities.KelompokTransaksi; import com.jasamedika.medifirst2000.entities.MappingKirimDokumenPasien; import com.jasamedika.medifirst2000.vo.DokumenRekamMedisVO; @@ -178,7 +173,7 @@ private String getRunningNumber(String kegunaan) { StrukPelayanan strukPelayananDetail = new StrukPelayanan(); strukPelayananConverter.setUseGson(true); - strukPelayananDetail.setKdkelompoktransaksi(kelompokTransaksiDao.findById(Integer.parseInt((String) this.GetSettingDataFixed("KdKelompokTransaksiDokumenRekamMedis")))); + strukPelayananDetail.setKdkelompoktransaksi(kelompokTransaksiDao.findById(Integer.parseInt((String) this.getSettingDataFixed("KdKelompokTransaksiDokumenRekamMedis")))); Ruangan kdruangan = new Ruangan(); strukPelayananDetail.setNostruk(getRunningNumber("DokumenRekamMedis")); @@ -234,7 +229,7 @@ private String getRunningNumber(String kegunaan) { strukKirim.setKeteranganlainnyakirim("Pengiriman dokumen rekammedis"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiDokumenRekamMedis"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiDokumenRekamMedis"))); strukKirim.setKelompokTransaksi(kelompokTransaksi); strukKirim.setKdruanganasal(ruanganConverter.transferVOToModel(asal, new Ruangan())); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EvaluasiRekananServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EvaluasiRekananServiceImpl.java index 92e5e3da..880b22df 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EvaluasiRekananServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EvaluasiRekananServiceImpl.java @@ -79,7 +79,7 @@ public class EvaluasiRekananServiceImpl extends BaseVoServiceImpl implements Eva String noUsulan, Integer ruanganId) { List> maps = null; List> result= new ArrayList>(); - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); if (CommonUtil.isNotNullOrEmpty(noUsulan)){ maps = UsulanEvaluasiDao.listUsulanEvaluasiByRuanganPembuat(tglAwal, tglAkhir, noUsulan,ruanganId,Integer.parseInt(idJensEvaluasi)); }else{ @@ -98,7 +98,7 @@ public class EvaluasiRekananServiceImpl extends BaseVoServiceImpl implements Eva Integer ruanganId) { List> maps = null; List> result= new ArrayList>(); - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); if (CommonUtil.isNotNullOrEmpty(noUsulan)){ maps= UsulanEvaluasiDao.listUsulanEvaluasiByRuanganTujuan(tglAwal, tglAkhir, noUsulan,ruanganId); }else{ @@ -139,7 +139,7 @@ public class EvaluasiRekananServiceImpl extends BaseVoServiceImpl implements Eva LoginUser loginUser = loginUserService.getLoginUser(); //SET JENIS EVALUASI - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); JenisEvaluasi jenisEvaluasi = new JenisEvaluasi(); jenisEvaluasi.setId(Integer.parseInt(idJensEvaluasi));//Set Static dahulu diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/GajiPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/GajiPegawaiServiceImpl.java index b1b6b66f..c1d23ca5 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/GajiPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/GajiPegawaiServiceImpl.java @@ -226,14 +226,14 @@ public class GajiPegawaiServiceImpl extends BaseVoServiceImpl implements GajiPeg new StrukBuktiPengeluaran()); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiOutPayroll"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiOutPayroll"))); // set kelompok transaksi payroll sbp.setKelompokTransaksi(kelompokTransaksi); // set pegawai pembayar sbp.setPegawaiPembayar(loginUserService.getLoginUser()); Ruangan ruangan = new Ruangan(); - ruangan.setId(Integer.parseInt(GetSettingDataFixed("KdRuanganKeuangan"))); + ruangan.setId(Integer.parseInt(getSettingDataFixed("KdRuanganKeuangan"))); // set ruangan sbp.setRuangan(ruangan); @@ -336,7 +336,7 @@ public class GajiPegawaiServiceImpl extends BaseVoServiceImpl implements GajiPeg sbp.setPegawaiPembayar(loginUserService.getLoginUser()); Ruangan ruangan = new Ruangan(); - ruangan.setId(Integer.parseInt(GetSettingDataFixed("KdRuanganKeuangan"))); + ruangan.setId(Integer.parseInt(getSettingDataFixed("KdRuanganKeuangan"))); // set ruangan sbp.setRuangan(ruangan); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java index 020f211d..f5998f35 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java @@ -1,5 +1,25 @@ package com.jasamedika.medifirst2000.service.impl; +import com.jasamedika.medifirst2000.constants.Master; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.IkiDanRemunerasiService; +import com.jasamedika.medifirst2000.service.LogbookKinerjaService; +import com.jasamedika.medifirst2000.service.TargetSkorDokterService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.CurrencyUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.util.StringUtil; +import com.jasamedika.medifirst2000.vo.*; +import com.jasamedika.medifirst2000.vo.custom.TargetLayananJamKerjaDetailVO; +import com.jasamedika.medifirst2000.vo.custom.TargetLayananJamKerjaVO; +import com.jasamedika.medifirst2000.vo.custom.TargetLayananLuarJamKerjaDetailVO; +import com.jasamedika.medifirst2000.vo.custom.TargetLayananLuarJamKerjaVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; @@ -7,86 +27,9 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.jasamedika.medifirst2000.constants.Master; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.IkiDanRemunerasiDao; -import com.jasamedika.medifirst2000.dao.IndeksKinerjaDokterDao; -import com.jasamedika.medifirst2000.dao.IndikatorKinerjaDetailDao; -import com.jasamedika.medifirst2000.dao.JabatanDao; -import com.jasamedika.medifirst2000.dao.LogbookKinerjaDokterDao; -import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaDao; -import com.jasamedika.medifirst2000.dao.MapPegawaiLaboratRadiologiDao; -import com.jasamedika.medifirst2000.dao.MonitoringAbsenDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; -import com.jasamedika.medifirst2000.dao.RunningNumberDao; -import com.jasamedika.medifirst2000.dao.SettingPirSdmDao; -import com.jasamedika.medifirst2000.dao.ShiftKerjaDao; -import com.jasamedika.medifirst2000.dao.SkoringTindakanMedisDao; -import com.jasamedika.medifirst2000.dao.StrukHistoriDao; -import com.jasamedika.medifirst2000.dao.StrukPelayananDao; -import com.jasamedika.medifirst2000.dao.SubUnitKerjaDao; -import com.jasamedika.medifirst2000.dao.TargetLayananDao; -import com.jasamedika.medifirst2000.entities.EvaluasiJabatan; -import com.jasamedika.medifirst2000.entities.IkiDanRemunerasi; -import com.jasamedika.medifirst2000.entities.IndeksKinerjaDokter; -import com.jasamedika.medifirst2000.entities.IndikatorKinerjaDetail; -import com.jasamedika.medifirst2000.entities.Jabatan; -import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.LogbookKinerjaDokter; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekap; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.SettingPirSdm; -import com.jasamedika.medifirst2000.entities.StrukHistori; -import com.jasamedika.medifirst2000.entities.StrukPelayanan; -import com.jasamedika.medifirst2000.entities.SubUnitKerjaPegawai; -import com.jasamedika.medifirst2000.entities.SuratKeputusan; -import com.jasamedika.medifirst2000.entities.TargetLayanan; -import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai; -import com.jasamedika.medifirst2000.service.IkiDanRemunerasiService; -import com.jasamedika.medifirst2000.service.LogbookKinerjaService; -import com.jasamedika.medifirst2000.service.TargetSkorDokterService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.CurrencyUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.EvaluasiJabatanVO; -import com.jasamedika.medifirst2000.vo.IkiDanRemunerasiVO; -import com.jasamedika.medifirst2000.vo.IndikatorKinerjaDetailVO; -import com.jasamedika.medifirst2000.vo.JabatanVO; -import com.jasamedika.medifirst2000.vo.KelompokTransaksiVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.SettingPirSdmVO; -import com.jasamedika.medifirst2000.vo.SkorDokterVO; -import com.jasamedika.medifirst2000.vo.StrukHistoriVO; -import com.jasamedika.medifirst2000.vo.SubUnitKerjaPegawaiVO; -import com.jasamedika.medifirst2000.vo.SuratKeputusanVO; -import com.jasamedika.medifirst2000.vo.TargetSkorDokterVO; -import com.jasamedika.medifirst2000.vo.UnitKerjaPegawaiVO; -import com.jasamedika.medifirst2000.vo.custom.TargetLayananJamKerjaDetailVO; -import com.jasamedika.medifirst2000.vo.custom.TargetLayananJamKerjaVO; -import com.jasamedika.medifirst2000.vo.custom.TargetLayananLuarJamKerjaDetailVO; -import com.jasamedika.medifirst2000.vo.custom.TargetLayananLuarJamKerjaVO; - @Service("IkiDanRemunerasiService") public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements IkiDanRemunerasiService { @@ -640,7 +583,8 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik calTglAwal.set(Calendar.MINUTE, 0); calTglAwal.set(Calendar.SECOND, 0); calTglAwal.set(Calendar.DAY_OF_MONTH, 1); - calTglAwal.add(Calendar.MONTH, -Integer.valueOf(GetSettingDataFixed("jmlBlnHitungTargetMedis"))); + calTglAwal.add(Calendar.MONTH, -Integer.valueOf(getSettingDataFixed("jmlBlnHitungTargetMedis"))); + Date tglAwal = calTglAwal.getTime(); // get_this_period Calendar bulan = Calendar.getInstance(); @@ -651,7 +595,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik bulan.set(Calendar.DAY_OF_MONTH, bulan.getActualMaximum(Calendar.DAY_OF_MONTH)); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); Date pssbAwal = Date.from(PSBBDate.atZone(ZoneId.systemDefault()).toInstant()); Date pssbAkhir = Date.from(PSBBEnd.atZone(ZoneId.systemDefault()).toInstant()); @@ -666,29 +610,27 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik List listIdDokterKsmUmum = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List listIdDokterLabPA = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI); - List listIdDJPLabPA = splitDataSettingDatafixed("penunjang_pa"); + List listIdDJPLabPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); List listIdDokterLabPK = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_KLINIK); - List listIdDJPLabPK = splitDataSettingDatafixed("penunjang_pk"); + List listIdDJPLabPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); List listIdDokterRad = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_RADIOLOGI); - List listIdDJPRad = splitDataSettingDatafixed("penunjang_radiologi"); + List listIdDJPRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); - List listIdDJPUtama = splitDataSettingDatafixed("medis_utama"); + List listIdDJPUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); List listIdLaboranRadiolog = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List listIdDJPAdmPK = splitDataSettingDatafixed("admin_nonpk"); + List listIdDJPAdmPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); - List> dataRaw = ikiDanRemunerasiDao.getDataLayananJamKerja(calTglAwal.getTime(), - bulan.getTime(), pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, + List> dataRaw = ikiDanRemunerasiDao.getDataLayananJamKerja(tglAwal, bulan.getTime(), + pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL), Arrays.asList(Master.KategoryPegawai.REMUN), Arrays.asList(Master.KedudukanPegawai.INACTIVE_LOGIN), Arrays.asList(Master.UnitKerja.KSM), Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.Produk.KARCIS); - - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); // filter detail jenis produk for (Map map : dataRaw) { @@ -749,8 +691,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik listIdTempUtama.addAll(listIdTempAdmPK); } } - if (!listIdTempUtama.contains(map.get("djpId")) - && idsDokterUmumIGD.contains(map.get("idTindakan")) + if (!listIdTempUtama.contains(map.get("djpId")) && idsDokterUmumIGD.contains(map.get("idTindakan")) && listIdDokterKsmUmum.contains(map.get("pegawaiId")) && Master.Departemen.IGD.equals(map.get("idDepartemen"))) { dataLayananRaw.add(map); @@ -1159,7 +1100,8 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik calTglAwal.set(Calendar.MINUTE, 0); calTglAwal.set(Calendar.SECOND, 0); calTglAwal.set(Calendar.DAY_OF_MONTH, 1); - calTglAwal.add(Calendar.MONTH, -Integer.valueOf(GetSettingDataFixed("jmlBlnHitungTargetMedis"))); + calTglAwal.add(Calendar.MONTH, -Integer.valueOf(getSettingDataFixed("jmlBlnHitungTargetMedis"))); + Date tglAwal = calTglAwal.getTime(); // get_this_period Calendar bulan = Calendar.getInstance(); @@ -1170,7 +1112,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik bulan.set(Calendar.DAY_OF_MONTH, bulan.getActualMaximum(Calendar.DAY_OF_MONTH)); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); Date pssbAwal = Date.from(PSBBDate.atZone(ZoneId.systemDefault()).toInstant()); Date pssbAkhir = Date.from(PSBBEnd.atZone(ZoneId.systemDefault()).toInstant()); @@ -1186,29 +1128,27 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik List listIdDokterKsmUmum = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List listIdDokterLabPA = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI); - List listIdDJPLabPA = splitDataSettingDatafixed("penunjang_pa"); + List listIdDJPLabPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); List listIdDokterLabPK = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_KLINIK); - List listIdDJPLabPK = splitDataSettingDatafixed("penunjang_pk"); + List listIdDJPLabPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); List listIdDokterRad = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_RADIOLOGI); - List listIdDJPRad = splitDataSettingDatafixed("penunjang_radiologi"); + List listIdDJPRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); - List listIdDJPUtama = splitDataSettingDatafixed("medis_utama"); + List listIdDJPUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); List listIdLaboranRadiolog = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List listIdDJPAdmPK = splitDataSettingDatafixed("admin_nonpk"); + List listIdDJPAdmPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); - List> dataRaw = ikiDanRemunerasiDao.getDataLayananLuarJamKerja(calTglAwal.getTime(), - bulan.getTime(), pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, + List> dataRaw = ikiDanRemunerasiDao.getDataLayananLuarJamKerja(tglAwal, bulan.getTime(), + pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, Arrays.asList(Master.KedudukanPegawai.INACTIVE_LOGIN), Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL), Arrays.asList(Master.UnitKerja.KSM), Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.Produk.KARCIS); - - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); // filter detail jenis produk for (Map map : dataRaw) { @@ -1269,8 +1209,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik listIdTempUtama.addAll(listIdTempAdmPK); } } - if (!listIdTempUtama.contains(map.get("djpId")) - && idsDokterUmumIGD.contains(map.get("idTindakan")) + if (!listIdTempUtama.contains(map.get("djpId")) && idsDokterUmumIGD.contains(map.get("idTindakan")) && listIdDokterKsmUmum.contains(map.get("pegawaiId")) && Master.Departemen.IGD.equals(map.get("idDepartemen"))) { dataLayananRaw.add(map); @@ -1677,7 +1616,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik calTglAwal.set(Calendar.MINUTE, 0); calTglAwal.set(Calendar.SECOND, 0); calTglAwal.set(Calendar.DAY_OF_MONTH, 1); - calTglAwal.add(Calendar.MONTH, -Integer.valueOf(GetSettingDataFixed("jmlBlnHitungTargetMedis"))); + calTglAwal.add(Calendar.MONTH, -Integer.valueOf(getSettingDataFixed("jmlBlnHitungTargetMedis"))); // get_this_period Calendar bulan = Calendar.getInstance(); @@ -1783,7 +1722,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik calTglAwal.set(Calendar.MINUTE, 0); calTglAwal.set(Calendar.SECOND, 0); calTglAwal.set(Calendar.DAY_OF_MONTH, 1); - calTglAwal.add(Calendar.MONTH, -Integer.valueOf(GetSettingDataFixed("jmlBlnHitungTargetMedis"))); + calTglAwal.add(Calendar.MONTH, -Integer.valueOf(getSettingDataFixed("jmlBlnHitungTargetMedis"))); // get_this_period Calendar bulan = Calendar.getInstance(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java index 9a739bf3..9a5e0c6d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java @@ -2311,7 +2311,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK public Date batasAkhirTarifLama() { DateFormat dateFormat = new SimpleDateFormat("yyyy-MM"); try { - return dateFormat.parse(GetSettingDataFixed("batasAkhirTarif2017")); + return dateFormat.parse(getSettingDataFixed("batasAkhirTarif2017")); } catch (ParseException e) { return null; } @@ -2359,7 +2359,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); @@ -2367,11 +2367,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -2391,13 +2392,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List> listData = revIndekKinerjaDao.getAllTindakanDokter(Master.Kelas.KELAS_SATU, idPegawai, Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode); - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); - List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); - Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); - Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); - Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAwal); + List idsDokterPerinatologi = getNilaiDataFixByTMT("pr_dokter_perinatologi", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); + Double komponenDasar = Double.parseDouble(getSettingDataFixed("ld_komponen_dasar")); + Double persenOperator = Double.parseDouble(getSettingDataFixed("ld_persen_operator")); + Double persenCooperator = Double.parseDouble(getSettingDataFixed("ld_persen_cooperator")); if (datePeriode.before(dateAkhirTarifLama) || datePeriode.equals(dateAkhirTarifLama)) { komponenDasar = 45_000.0; persenOperator = 30.0; @@ -3324,7 +3325,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); @@ -3332,11 +3333,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -3356,13 +3358,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List> listData = revIndekKinerjaDao.getAllTindakanDokter(Master.Kelas.KELAS_SATU, idPegawai, Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode); - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); - List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); - Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); - double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); - double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAwal); + List idsDokterPerinatologi = getNilaiDataFixByTMT("pr_dokter_perinatologi", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); + Double komponenDasar = Double.parseDouble(getSettingDataFixed("ld_komponen_dasar")); + double persenOperator = Double.parseDouble(getSettingDataFixed("ld_persen_operator")); + double persenCooperator = Double.parseDouble(getSettingDataFixed("ld_persen_cooperator")); // LOGIC_RULES_REMUN if (CommonUtil.isNotNullOrEmpty(listData)) { @@ -4017,7 +4019,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); double harga; Double point; @@ -4044,11 +4046,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -4068,13 +4071,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List> listData = revIndekKinerjaDao.getAllTindakanDokter(Master.Kelas.KELAS_SATU, idPegawai, Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode); - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); - List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); - Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); - Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); - Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAwal); + List idsDokterPerinatologi = getNilaiDataFixByTMT("pr_dokter_perinatologi", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); + Double komponenDasar = Double.parseDouble(getSettingDataFixed("ld_komponen_dasar")); + Double persenOperator = Double.parseDouble(getSettingDataFixed("ld_persen_operator")); + Double persenCooperator = Double.parseDouble(getSettingDataFixed("ld_persen_cooperator")); if (datePeriode.before(dateAkhirTarifLama) || datePeriode.equals(dateAkhirTarifLama)) { komponenDasar = 45_000.0; persenOperator = 30.0; @@ -4916,17 +4919,18 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -4946,11 +4950,11 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List> listData = revIndekKinerjaDao.getAllTindakanDokter(Master.Kelas.KELAS_SATU, idPegawai, Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode); - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); - Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); - double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); - double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); + Double komponenDasar = Double.parseDouble(getSettingDataFixed("ld_komponen_dasar")); + double persenOperator = Double.parseDouble(getSettingDataFixed("ld_persen_operator")); + double persenCooperator = Double.parseDouble(getSettingDataFixed("ld_persen_cooperator")); // LOGIC_RULES_FFS if (CommonUtil.isNotNullOrEmpty(listData)) { @@ -5376,7 +5380,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); @@ -5384,12 +5388,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + Date tglAwal = DateUtil.startMonth(month); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -5414,9 +5419,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK idProduk, idKelompokPasien, Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, tgl); } - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); - List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAwal); + List idsDokterPerinatologi = getNilaiDataFixByTMT("pr_dokter_perinatologi", tglAwal); if (!ffs) { if (CommonUtil.isNotNullOrEmpty(listData)) { @@ -7081,7 +7086,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); @@ -7089,11 +7094,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -7113,10 +7119,10 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List> listData = revIndekKinerjaDao.getAllTindakanDokterCetak(Master.Kelas.KELAS_SATU, idPegawai, Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode); - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); - List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAwal); + List idsDokterPerinatologi = getNilaiDataFixByTMT("pr_dokter_perinatologi", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); if (CommonUtil.isNotNullOrEmpty(listData)) { for (Map map : listData) { @@ -7690,16 +7696,17 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -8489,18 +8496,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List dokterLuar = pegawaiDao .getPegawaiByKategoryPegawai(Arrays.asList(Master.KategoryPegawai.DOKTER_LUAR)); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -8520,7 +8528,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List> listData = revIndekKinerjaDao.getAllTindakanDokter(Master.Kelas.KELAS_SATU, idPegawai, Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode); - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); if (CommonUtil.isNotNullOrEmpty(listData)) { @@ -9805,7 +9813,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); @@ -9813,11 +9821,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK List drKkPerinatologiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PERINATOLOGI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(month); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -9842,10 +9851,10 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, tgl); } - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); - List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAwal); + List idsDokterPerinatologi = getNilaiDataFixByTMT("pr_dokter_perinatologi", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); if (!ffs) { if (CommonUtil.isNotNullOrEmpty(listData)) { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InputKantongDarahServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InputKantongDarahServiceImpl.java index 1f277140..fbed5139 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InputKantongDarahServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InputKantongDarahServiceImpl.java @@ -69,7 +69,7 @@ public class InputKantongDarahServiceImpl extends BaseVoServiceImpl implements I StrukPelayananVO strukPelayanan =vo.getStrukPelayanan(); KelompokTransaksiVO kdkelompoktransaksi= new KelompokTransaksiVO(); - kdkelompoktransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiPenerimaanBankDarah"))); + kdkelompoktransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiPenerimaanBankDarah"))); strukPelayanan.setKdkelompoktransaksi(kdkelompoktransaksi); StrukPelayanan resultStrukPelayanan = strukPelayananService.saveStrukPelayananService(strukPelayanan); String norecStrukPelayanan = (String) resultStrukPelayanan.getNostruk(); @@ -137,7 +137,7 @@ private BaseConverterImpl orderPelayananConver newsubModel.setPasienDaftar(antrianPasienDiPeriksa); newsubModel.setProduk(data.getProduk()); KelompokTransaksi kelompokTransaksi= new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KelompokTransaksiBankDarah"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KelompokTransaksiBankDarah"))); newsubModel.setKelompokTransaksi(kelompokTransaksi); newsubModel.setStock(0.0); StrukPelayananDNoBatch noBatch=strukPelayananDNoBatchDao.findOne(model.getNoRec()); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KategoriPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KategoriPegawaiServiceImpl.java index 2b89f59d..6b9a2cb9 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KategoriPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KategoriPegawaiServiceImpl.java @@ -24,7 +24,7 @@ public class KategoriPegawaiServiceImpl extends BaseVoServiceImpl implements Kat private KategoriPegawaiDao kategoriPegawaiDao; List getListStatus() { - String meninggalPensiunPindah = GetSettingDataFixed("outsourcingListStatusPegawai"); + String meninggalPensiunPindah = getSettingDataFixed("outsourcingListStatusPegawai"); String arr[] = meninggalPensiunPindah.split(","); List listKedudukan = new ArrayList(); for (String ar : arr) { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KategoryProdukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KategoryProdukServiceImpl.java index 05c68eb6..413d6a23 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KategoryProdukServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KategoryProdukServiceImpl.java @@ -55,7 +55,7 @@ public class KategoryProdukServiceImpl extends BaseVoServiceImpl implements Kate @Override public Map getKategoryProdukGizi() { Map result = new HashMap(); - List idKategoryProdukGizi = Arrays.asList(GetSettingDataFixed("idKategoryProduk").split(",")); + List idKategoryProdukGizi = Arrays.asList(getSettingDataFixed("idKategoryProduk").split(",")); List id = new ArrayList(); for(String idKategory : idKategoryProdukGizi){ id.add(Integer.parseInt(idKategory)); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KirimDokumenPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KirimDokumenPasienServiceImpl.java index f6f1573a..af76e19d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KirimDokumenPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KirimDokumenPasienServiceImpl.java @@ -165,7 +165,7 @@ public class KirimDokumenPasienServiceImpl extends BaseVoServiceImpl implements //---------------------------------------------------------------------------------------------------- KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiDokumenRekamMedis"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiDokumenRekamMedis"))); strukKirim.setKelompokTransaksi(kelompokTransaksi); StrukKirim resultStrukKirim = daoStrukKirim.save(strukKirim); @@ -237,7 +237,7 @@ public class KirimDokumenPasienServiceImpl extends BaseVoServiceImpl implements .transferVOToModel(vo.getDokumenRekamMedis(), new DokumenRekamMedis()); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksiDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdKelompokTransaksiDokumenRekamMedis")))); + Integer.parseInt((String) this.getSettingDataFixed("KdKelompokTransaksiDokumenRekamMedis")))); strukPelayanan.setNostruk(getRunningNumber("DokumenRekamMedis")); strukPelayanan.setTglstruk(DateUtil.getShortDate()); strukPelayanan.setTglterimakiriman(DateUtil.getShortDate()); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KonsultasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KonsultasiServiceImpl.java index 8a77711c..af977a89 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KonsultasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KonsultasiServiceImpl.java @@ -364,9 +364,9 @@ public class KonsultasiServiceImpl extends BaseVoServiceImpl implements Konsulta excJenisProduk.add(Master.JenisProduk.LAB_KLINIK); List idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium"); - List listKarcisIdProduk = splitDataSettingDatafixed("listKarcisIdProduk"); + List idsKarcis = getNilaiDataFixByTMT("listKarcisIdProduk", tglAwal); return konsultasiDao.findAllKonsultasiTindakanKosong(tglAwal, tglAkhir, inapDanLab, - Arrays.asList(Master.Pegawai.ADMINISTRATOR), listKarcisIdProduk, excJenisProduk, idsRegDJPPenunjangLab); + Arrays.asList(Master.Pegawai.ADMINISTRATOR), idsKarcis, excJenisProduk, idsRegDJPPenunjangLab); } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LaundryServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LaundryServiceImpl.java index 34db8ee5..4dcc4c52 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LaundryServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LaundryServiceImpl.java @@ -2154,7 +2154,7 @@ public class LaundryServiceImpl extends BaseAngaranServiceImpl implements Laundr Date tglTerima = DateUtil.toDate(dto.getTglTerima()); strukPelayanan.setTglterimakiriman(tglTerima); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiLaundry"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiLaundry"))); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); strukPelayanan.setMenyerahkan(loginUserService.getLoginUser().getPegawai()); strukPelayanan = this.strukPelayananDao.save(strukPelayanan); @@ -2209,7 +2209,7 @@ public class LaundryServiceImpl extends BaseAngaranServiceImpl implements Laundr Date tglTerima = DateUtil.toDate(dto.getTglTerima()); strukPelayanan.setTglterimakiriman(tglTerima); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiLaundry"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiLaundry"))); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); strukPelayanan.setKdpegawaipenerima(loginUserService.getLoginUser().getPegawai()); Pegawai pegawaiOrder = new Pegawai(); @@ -2270,7 +2270,7 @@ public class LaundryServiceImpl extends BaseAngaranServiceImpl implements Laundr Date tglTerima = DateUtil.toDate(dto.getTglTerima()); //strukPelayanan.setTglterimakiriman(tglTerima); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiLaundry"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiLaundry"))); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); strukPelayanan.setKdpegawaipenerima(loginUserService.getLoginUser().getPegawai()); Pegawai pegawaiOrder = new Pegawai(); @@ -2314,7 +2314,7 @@ public class LaundryServiceImpl extends BaseAngaranServiceImpl implements Laundr Date tglTerima = DateUtil.toDate(dto.getTglTerima()); //strukPelayanan.setTglterimakiriman(tglTerima); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiLaundry"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiLaundry"))); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); strukPelayanan.setKdpegawaipenerima(loginUserService.getLoginUser().getPegawai()); Pegawai pegawaiOrder = new Pegawai(); @@ -2452,7 +2452,7 @@ public class LaundryServiceImpl extends BaseAngaranServiceImpl implements Laundr strukPelayanan.setTglstruk(tanggal); strukPelayanan.setTglterimakiriman(tanggal); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiLaundry"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiLaundry"))); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); //strukPelayanan.setMenyerahkan(loginUserService.getLoginUser().getPegawai()); strukPelayanan = this.strukPelayananDao.save(strukPelayanan); @@ -3407,7 +3407,7 @@ public class LaundryServiceImpl extends BaseAngaranServiceImpl implements Laundr strukPelayanan.setQtyproduk(0.0); strukPelayanan.setTglstruk(dto.getTglOrder()); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiLaundry"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiLaundry"))); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); Pegawai pegawaiPenerima = new Pegawai(); pegawaiPenerima.setId(dto.getPegawaiOrderId()); //pegawaipenerima @@ -3650,7 +3650,7 @@ public class LaundryServiceImpl extends BaseAngaranServiceImpl implements Laundr //strukPelayanan.setTglstruk(tanggal); //strukPelayanan.setTglterimakiriman(tanggal); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiLaundry"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiLaundry"))); //strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); //strukPelayanan.setMenyerahkan(loginUserService.getLoginUser().getPegawai()); //strukPelayanan = this.strukPelayananDao.save(strukPelayanan); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java index ab351504..72dbaed8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java @@ -155,7 +155,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb public LogbookKinerjaVO update(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException { DateFormat mf = new SimpleDateFormat("yyyy-MM"); - double menitKerjaHarian = Double.parseDouble(GetSettingDataFixed("menitKerjaHarian")); + double menitKerjaHarian = Double.parseDouble(getSettingDataFixed("menitKerjaHarian")); LogbookKinerja logbookKinerjaLama = logbookKinerjaDao.findOne(vo.getNoRec()); Pegawai pegawai = pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai()); @@ -412,8 +412,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Date start = DateUtil.startMonth(bulan); Date end = DateUtil.endMonth(bulan); - double menitKerjaHarian = Double.parseDouble(GetSettingDataFixed("menitKerjaHarian")); - double menitKerjaRamadhan = Double.parseDouble(GetSettingDataFixed("menitKerjaRamadhan")); + double menitKerjaHarian = Double.parseDouble(getSettingDataFixed("menitKerjaHarian")); + double menitKerjaRamadhan = Double.parseDouble(getSettingDataFixed("menitKerjaRamadhan")); List targetPresensi = kalenderDao.getTargetKerja(start, end); int jumlahHariKerjaHarian = 0; int jumlahHariKerjaRamadhan = 0; @@ -997,7 +997,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb decf.setRoundingMode(RoundingMode.HALF_UP); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); Date pssbAwal = Date.from(PSBBDate.atZone(ZoneId.systemDefault()).toInstant()); Date pssbAkhir = Date.from(PSBBEnd.atZone(ZoneId.systemDefault()).toInstant()); @@ -1007,31 +1007,32 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); + Date tglAwal = DateUtil.startMonth(new Date(bulan)); List listIdNonjadwal = shiftKerjaDao.findListNonjadwal(); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_pa"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_pa", tglAwal); } else if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_KLINIK).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_pk"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_pk", tglAwal); } else if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_RADIOLOGI).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_radiologi"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); } else { - listDetailJenisProduk = splitDataSettingDatafixed("medis_utama"); + listDetailJenisProduk = getNilaiDataFixByTMT("medis_utama", tglAwal); } if (laboranRadiologList.contains(idPegawai)) { - listDetailJenisProdukException = splitDataSettingDatafixed("admin_nonpk"); + listDetailJenisProdukException = getNilaiDataFixByTMT("admin_nonpk", tglAwal); listDetailJenisProdukException.removeAll(listDetailJenisProduk); listDetailJenisProduk.addAll(listDetailJenisProdukException); } - List> dataLayanan = ikiDanRemunerasiDao.getDataLogbookJamKerjaDokter( - mf.format(new Date(bulan)), pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, - Collections.singletonList(idPegawai), Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL), - listDetailJenisProduk, splitDataSettingDatafixed("pr_dokter_umum_igd"), drKsmUmumList, - Master.Departemen.IGD, Arrays.asList(Master.JenisProduk.NONTINDAKAN), - Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.Produk.KARCIS); + List> dataLayanan = ikiDanRemunerasiDao.getDataLogbookJamKerjaDokter(mf.format(tglAwal), + pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, Collections.singletonList(idPegawai), + Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL), listDetailJenisProduk, + getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal), drKsmUmumList, Master.Departemen.IGD, + Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), + Master.Produk.KARCIS); // Menghitung skor asa dokter anestesi List listIdPelayananAnestesi = new ArrayList<>(); @@ -1362,7 +1363,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb decf.setRoundingMode(RoundingMode.HALF_UP); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); Date pssbAwal = Date.from(PSBBDate.atZone(ZoneId.systemDefault()).toInstant()); Date pssbAkhir = Date.from(PSBBEnd.atZone(ZoneId.systemDefault()).toInstant()); @@ -1372,29 +1373,30 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); + Date tglAwal = DateUtil.startMonth(new Date(bulan)); List listIdNonjadwal = shiftKerjaDao.findListNonjadwal(); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_pa"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_pa", tglAwal); } else if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_KLINIK).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_pk"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_pk", tglAwal); } else if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_RADIOLOGI).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_radiologi"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); } else { - listDetailJenisProduk = splitDataSettingDatafixed("medis_utama"); + listDetailJenisProduk = getNilaiDataFixByTMT("medis_utama", tglAwal); } if (laboranRadiologList.contains(idPegawai)) { - listDetailJenisProdukException = splitDataSettingDatafixed("admin_nonpk"); + listDetailJenisProdukException = getNilaiDataFixByTMT("admin_nonpk", tglAwal); listDetailJenisProdukException.removeAll(listDetailJenisProduk); listDetailJenisProduk.addAll(listDetailJenisProdukException); } - List> dataLayanan = ikiDanRemunerasiDao.getDataLogbookLuarJamKerjaDokter( - mf.format(new Date(bulan)), pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, idPegawai, + List> dataLayanan = ikiDanRemunerasiDao.getDataLogbookLuarJamKerjaDokter(mf.format(tglAwal), + pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, idPegawai, Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL), listDetailJenisProduk, - splitDataSettingDatafixed("pr_dokter_umum_igd"), drKsmUmumList, Master.Departemen.IGD, + getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal), drKsmUmumList, Master.Departemen.IGD, Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.Produk.KARCIS); @@ -1691,7 +1693,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); Date pssbAwal = Date.from(PSBBDate.atZone(ZoneId.systemDefault()).toInstant()); Date pssbAkhir = Date.from(PSBBEnd.atZone(ZoneId.systemDefault()).toInstant()); @@ -1704,20 +1706,21 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); + Date tglAwal = DateUtil.startMonth(bulan); List listIdNonjadwal = shiftKerjaDao.findListNonjadwal(); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_pa"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_pa", tglAwal); } else if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_KLINIK).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_pk"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_pk", tglAwal); } else if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_RADIOLOGI).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_radiologi"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); } else { - listDetailJenisProduk = splitDataSettingDatafixed("medis_utama"); + listDetailJenisProduk = getNilaiDataFixByTMT("medis_utama", tglAwal); } if (laboranRadiologList.contains(idPegawai)) { - listDetailJenisProdukException = splitDataSettingDatafixed("admin_nonpk"); + listDetailJenisProdukException = getNilaiDataFixByTMT("admin_nonpk", tglAwal); listDetailJenisProdukException.removeAll(listDetailJenisProduk); listDetailJenisProduk.addAll(listDetailJenisProdukException); @@ -1726,7 +1729,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List> dataLayanan = ikiDanRemunerasiDao.findDetailPasienLogbookJamKerjaDokter(idProduk, tglPelayanan, pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, idPegawai, Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL), listDetailJenisProduk, - splitDataSettingDatafixed("pr_dokter_umum_igd"), drKsmUmumList, Master.Departemen.IGD, + getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal), drKsmUmumList, Master.Departemen.IGD, Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.Produk.KARCIS); @@ -2235,7 +2238,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); Date pssbAwal = Date.from(PSBBDate.atZone(ZoneId.systemDefault()).toInstant()); Date pssbAkhir = Date.from(PSBBEnd.atZone(ZoneId.systemDefault()).toInstant()); @@ -2245,20 +2248,21 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); + Date tglAwal = DateUtil.startMonth(tglPelayanan.substring(0, 7)); List listIdNonjadwal = shiftKerjaDao.findListNonjadwal(); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_pa"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_pa", tglAwal); } else if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_KLINIK).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_pk"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_pk", tglAwal); } else if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_RADIOLOGI).contains(idPegawai)) { - listDetailJenisProduk = splitDataSettingDatafixed("penunjang_radiologi"); + listDetailJenisProduk = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); } else { - listDetailJenisProduk = splitDataSettingDatafixed("medis_utama"); + listDetailJenisProduk = getNilaiDataFixByTMT("medis_utama", tglAwal); } if (laboranRadiologList.contains(idPegawai)) { - listDetailJenisProdukException = splitDataSettingDatafixed("admin_nonpk"); + listDetailJenisProdukException = getNilaiDataFixByTMT("admin_nonpk", tglAwal); listDetailJenisProdukException.removeAll(listDetailJenisProduk); listDetailJenisProduk.addAll(listDetailJenisProdukException); @@ -2267,7 +2271,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List> dataLayanan = ikiDanRemunerasiDao.findDetailPasienLogbookLuarJamKerjaDokter(idProduk, tglPelayanan, pssbAwal, pssbAkhir, listIdNonjadwal, Master.JenisPegawai.DOKTER, idPegawai, Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN_ALL), listDetailJenisProduk, - splitDataSettingDatafixed("pr_dokter_umum_igd"), drKsmUmumList, Master.Departemen.IGD, + getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal), drKsmUmumList, Master.Departemen.IGD, Arrays.asList(Master.JenisProduk.NONTINDAKAN), Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS), Master.Produk.KARCIS); @@ -2936,7 +2940,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb decf.setRoundingMode(RoundingMode.HALF_UP); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); Date pssbAwal = Date.from(PSBBDate.atZone(ZoneId.systemDefault()).toInstant()); Date pssbAkhir = Date.from(PSBBEnd.atZone(ZoneId.systemDefault()).toInstant()); @@ -3015,11 +3019,11 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", start); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", start); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", start); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", start); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", start); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); @@ -3027,7 +3031,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb List drLabPKList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_KLINIK); List drRadList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_RADIOLOGI); - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", start); for (Integer idPegawai : listIdPegawai) { SkorDokterVO skorDokterVO = new SkorDokterVO(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java index b5ff274c..071c8a48 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java @@ -571,7 +571,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon LoginUser loginuser; KelompokTransaksi kelompokTransaksi = kelompokTransaksiDao - .findById(Integer.parseInt(GetSettingDataFixed("kelompokTransasiLemburAbsensi"))); + .findById(Integer.parseInt(getSettingDataFixed("kelompokTransasiLemburAbsensi"))); if (CommonUtil.isNotNullOrEmpty(vo)) { for (MonitoringAbsenVO temp : vo.getMonitoringAbsen()) { @@ -2609,8 +2609,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon public Map rekapitulasiIndeksKehadiranByPegawai(Integer idPegawai, String startDate, String endDate) { Map result = this.rekapitulasiKehadiranByPegawai(idPegawai, startDate, endDate); - String batasjamLembur = GetSettingDataFixed("batasjamLembur"); - String shift = GetSettingDataFixed("idKelompokshiftShift"); + String batasjamLembur = getSettingDataFixed("batasjamLembur"); + String shift = getSettingDataFixed("idKelompokshiftShift"); Double total; if (CommonUtil.isNotNullOrEmpty(result)) { @@ -2977,7 +2977,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon public Map saveMonitoringVerifikasiSDM(MonitoringAbsenCustomVO vo) { Map result = new HashMap<>(); LoginUser loginuser; - String kelompokTransaksiId = GetSettingDataFixed("kelompokTransasiLemburAbsensi"); + String kelompokTransaksiId = getSettingDataFixed("kelompokTransasiLemburAbsensi"); // set buat lembur KelompokTransaksi kelompokTransaksi = kelompokTransaksiDao.findById(Integer.parseInt(kelompokTransaksiId)); @@ -3296,7 +3296,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon @Override public Map saveLemburVerifikasiSdm(InputLemburSdmCustomVO vo) { Map result = new HashMap<>(); - String kelompokTransaksiId = GetSettingDataFixed("kelompokTransasiLemburAbsensi"); + String kelompokTransaksiId = getSettingDataFixed("kelompokTransasiLemburAbsensi"); // set buat lembur KelompokTransaksi kelompokTransaksi = kelompokTransaksiDao.findById(Integer.parseInt(kelompokTransaksiId)); LoginUser loginuser; @@ -3371,8 +3371,8 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon @Transactional public List> findJumlahLembur(String period) { // set_buat_lembur - String komponenHargaId = GetSettingDataFixed("komponenHargaId"); - String komponenHargaUangMakanId = GetSettingDataFixed("komponenHargaUangMakanId"); + String komponenHargaId = getSettingDataFixed("komponenHargaId"); + String komponenHargaUangMakanId = getSettingDataFixed("komponenHargaUangMakanId"); KomponenHarga komponenHarga = komponenHargaDao.findById(Integer.parseInt(komponenHargaId));// Tarif_Lembur KomponenHarga komponenHargaUangMakan = komponenHargaDao.findById(Integer.parseInt(komponenHargaUangMakanId));// Uang_makan_55 @@ -3457,12 +3457,12 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon Map kalender = monitoringAbsenDao.findPeriodeKalenderS(Short.parseShort(splitPeriode[1]), splitPeriode[0]); Ruangan ruanganSdm = ruanganDao.findById(106);// bagian SDM - String kelompokTransaksiId = GetSettingDataFixed("kelompokTransasiLemburAbsensi"); + String kelompokTransaksiId = getSettingDataFixed("kelompokTransasiLemburAbsensi"); // set buat lembur KelompokTransaksi kelompokTransaksi = kelompokTransaksiDao.findById(Integer.parseInt(kelompokTransaksiId)); - String komponenHargaId = GetSettingDataFixed("komponenHargaId"); - String komponenIndexId = GetSettingDataFixed("komponenIndexId"); - String komponenHargaUangMakanId = GetSettingDataFixed("komponenHargaUangMakanId"); + String komponenHargaId = getSettingDataFixed("komponenHargaId"); + String komponenIndexId = getSettingDataFixed("komponenIndexId"); + String komponenHargaUangMakanId = getSettingDataFixed("komponenHargaUangMakanId"); // Tarif Lembur 82 KomponenHarga komponenHarga = komponenHargaDao.findById(Integer.parseInt(komponenHargaId)); // Lembur 14 diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringEvaluasiPerundanganServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringEvaluasiPerundanganServiceImpl.java index 53e5dd0c..c805f2e2 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringEvaluasiPerundanganServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringEvaluasiPerundanganServiceImpl.java @@ -35,7 +35,6 @@ import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.StringUtil; import com.jasamedika.medifirst2000.vo.PegawaiVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; import com.jasamedika.medifirst2000.vo.UsulanEvaluasiKomponenVO; import com.jasamedika.medifirst2000.vo.UsulanEvaluasiVO; @@ -88,7 +87,7 @@ public class MonitoringEvaluasiPerundanganServiceImpl extends BaseVoServiceImpl String noUsulan, Integer ruanganId) { List> maps = null; List> result= new ArrayList>(); - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); System.out.println("Jenis :"+idJensEvaluasi); if (CommonUtil.isNotNullOrEmpty(noUsulan)){ maps = UsulanEvaluasiDao.listUsulanEvaluasiByRuanganPembuat(tglAwal, tglAkhir, noUsulan,ruanganId,Integer.parseInt(idJensEvaluasi)); @@ -109,7 +108,7 @@ public class MonitoringEvaluasiPerundanganServiceImpl extends BaseVoServiceImpl Integer ruanganId) { List> maps = null; List> result= new ArrayList>(); - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); if (CommonUtil.isNotNullOrEmpty(noUsulan)){ maps= UsulanEvaluasiDao.listUsulanEvaluasiByRuanganTujuan(tglAwal, tglAkhir, noUsulan,ruanganId); }else{ @@ -152,7 +151,7 @@ public class MonitoringEvaluasiPerundanganServiceImpl extends BaseVoServiceImpl LoginUser loginUser = loginUserService.getLoginUser(); //SET JENIS EVALUASI - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); JenisEvaluasi jenisEvaluasi = new JenisEvaluasi(); jenisEvaluasi.setId(Integer.parseInt(idJensEvaluasi));//Set Static dahulu diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderAmbulanceServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderAmbulanceServiceImpl.java index 5208bf34..ec635d3a 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderAmbulanceServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderAmbulanceServiceImpl.java @@ -96,7 +96,7 @@ public class OrderAmbulanceServiceImpl extends BaseVoServiceImpl implements Orde strukOrder.setKelompokTransaksi(kelompokTransaksiConverter .transferVOToModel(vo.getStrukOrder().getKelompokTransaksi(), new KelompokTransaksi())); strukOrder.setKelompokTransaksi(kelompokTransaksiDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdKelompokTransaksiAmbulance")))); + Integer.parseInt((String) this.getSettingDataFixed("KdKelompokTransaksiAmbulance")))); } // get supir if (CommonUtil.isNotNullOrEmpty(vo.getStrukOrder().getPetugas())) { @@ -140,9 +140,9 @@ public class OrderAmbulanceServiceImpl extends BaseVoServiceImpl implements Orde orderPelayanan.setRuangan(listOrderPelayanan.get(i).getRuangan()); orderPelayanan.setRuanganTujuan(listOrderPelayanan.get(i).getRuanganTujuan()); orderPelayanan.setRuangan(ruanganDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdRuanganAsetAmbulance")))); + Integer.parseInt((String) this.getSettingDataFixed("KdRuanganAsetAmbulance")))); orderPelayanan.setRuanganTujuan(ruanganDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdRuanganTujuanAmbulance")))); + Integer.parseInt((String) this.getSettingDataFixed("KdRuanganTujuanAmbulance")))); orderPelayanan.setIsCito(listOrderPelayanan.get(i).getIsCito()); orderPelayanan.setQtyProduk(listOrderPelayanan.get(i).getQtyProduk()); orderPelayanan.setQtyProdukRetur(listOrderPelayanan.get(i).getQtyProdukRetur()); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderGiziServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderGiziServiceImpl.java index 8de20ac2..3c91c989 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderGiziServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderGiziServiceImpl.java @@ -11,72 +11,44 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.converter.PasienConverter; -import com.jasamedika.medifirst2000.converter.PasienDaftarConverter; import com.jasamedika.medifirst2000.converter.ProdukConverter; import com.jasamedika.medifirst2000.converter.RuanganConverter; -import com.jasamedika.medifirst2000.converter.SatuanStandarConverter; import com.jasamedika.medifirst2000.converter.base.BaseVoConverter; -import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; -import com.jasamedika.medifirst2000.dao.AsalRujukanDao; -import com.jasamedika.medifirst2000.dao.DetailRadiologiDao; import com.jasamedika.medifirst2000.dao.MapProdukMenuToBahanDao; -import com.jasamedika.medifirst2000.dao.MapRuanganToProdukDao; import com.jasamedika.medifirst2000.dao.OrderPelayananDao; import com.jasamedika.medifirst2000.dao.OrderProdukDao; import com.jasamedika.medifirst2000.dao.PasienDaftarDao; import com.jasamedika.medifirst2000.dao.ProdukDao; -import com.jasamedika.medifirst2000.dao.RuanganDao; import com.jasamedika.medifirst2000.dao.RunningNumberDao; import com.jasamedika.medifirst2000.dao.SatuanStandarDao; -import com.jasamedika.medifirst2000.dao.SiklusGiziDao; import com.jasamedika.medifirst2000.dao.StokProdukGlobalDao; import com.jasamedika.medifirst2000.dao.StrukOrderDao; import com.jasamedika.medifirst2000.dao.custom.SiklusGiziDaoCustom; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.BentukProduk; -import com.jasamedika.medifirst2000.entities.DetailOrderTindakan; -import com.jasamedika.medifirst2000.entities.DetailRadiologi; -import com.jasamedika.medifirst2000.entities.JenisDiet; import com.jasamedika.medifirst2000.entities.JenisPermintaan; -import com.jasamedika.medifirst2000.entities.JenisWaktu; import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.MapRuanganToProduk; import com.jasamedika.medifirst2000.entities.OrderPelayanan; -import com.jasamedika.medifirst2000.entities.OrderProduk; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.PasienDaftar; import com.jasamedika.medifirst2000.entities.Produk; import com.jasamedika.medifirst2000.entities.Ruangan; import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.SatuanStandar; import com.jasamedika.medifirst2000.entities.StokProdukGlobal; import com.jasamedika.medifirst2000.entities.StrukOrder; -import com.jasamedika.medifirst2000.enums.StatusAntrianEnum; import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.AntrianPasienDiPeriksaService; import com.jasamedika.medifirst2000.service.KartuStokService; import com.jasamedika.medifirst2000.service.LoginUserService; import com.jasamedika.medifirst2000.service.OrderGiziService; import com.jasamedika.medifirst2000.service.OrderProdukService; -import com.jasamedika.medifirst2000.service.ProdukService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.StringUtil; import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; -import com.jasamedika.medifirst2000.vo.BentukProdukVO; import com.jasamedika.medifirst2000.vo.DetailOrderTindakanVO; -import com.jasamedika.medifirst2000.vo.DetailRadiologiVO; import com.jasamedika.medifirst2000.vo.GiziProduksiOrderVO; import com.jasamedika.medifirst2000.vo.JenisDietVO; import com.jasamedika.medifirst2000.vo.JenisPermintaanVO; import com.jasamedika.medifirst2000.vo.JenisWaktuVO; import com.jasamedika.medifirst2000.vo.MapProdukMenuToBahanVO; import com.jasamedika.medifirst2000.vo.OrderProdukVO; -import com.jasamedika.medifirst2000.vo.PasienDaftarVO; import com.jasamedika.medifirst2000.vo.PasienVO; import com.jasamedika.medifirst2000.vo.PegawaiVO; import com.jasamedika.medifirst2000.vo.ProdukVO; @@ -163,7 +135,7 @@ public class OrderGiziServiceImpl extends BaseVoServiceImpl implements OrderGizi model.put("bahanProduk", produkDao.findById((Integer) model.get("bahanId"))); model.put("satuanStandar", satuanStandarDao.findById((Integer) model.get("satuanId"))); List listStok = stokDao.findStok((Integer) model.get("bahanId"), - Integer.parseInt(GetSettingDataFixed("idRuanganGizi"))); + Integer.parseInt(getSettingDataFixed("idRuanganGizi"))); if (CommonUtil.isNotNullOrEmpty(listStok)) { model.put("stok", listStok.get(0).getQtyProduk()); } else { @@ -200,7 +172,7 @@ public class OrderGiziServiceImpl extends BaseVoServiceImpl implements OrderGizi strukOrder.setIsDelivered((byte) 1); strukOrder.setKeteranganOrder("Permintaan Barang Dari Ruangan"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiOrderBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiOrderBarang"))); strukOrder.setKelompokTransaksi(kelompokTransaksi); // if(CommonUtil.isNotNullOrEmpty(vo.getJenisPermintaanVO())){ // strukOrder.setJenisPermintaan(jenisPermintaanConverter.transferVOToModel(vo.getJenisPermintaanVO(), diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderKendaraanDinasServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderKendaraanDinasServiceImpl.java index 1142f746..567ad84d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderKendaraanDinasServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderKendaraanDinasServiceImpl.java @@ -164,15 +164,15 @@ public class OrderKendaraanDinasServiceImpl extends BaseVoServiceImpl implements orderPelayanan.setRuanganTujuan(ruanganConverter .transferVOToModel(vo.getOrderPelayanan().getRuanganTujuan(), new Ruangan())); orderPelayanan.setRuangan(ruanganDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdRuanganKendaraanDinas")))); + Integer.parseInt((String) this.getSettingDataFixed("KdRuanganKendaraanDinas")))); orderPelayanan.setRuanganTujuan(ruanganDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdRuanganTujuanKendaraanDinas")))); + Integer.parseInt((String) this.getSettingDataFixed("KdRuanganTujuanKendaraanDinas")))); } if (CommonUtil.isNotNullOrEmpty(vo.getOrderPelayanan().getProduk())) { orderPelayanan.setProduk( produkConverter.transferVOToModel(vo.getOrderPelayanan().getProduk(), new Produk())); orderPelayanan.setProduk(produkDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdProdukKendaraanDinas")))); + Integer.parseInt((String) this.getSettingDataFixed("KdProdukKendaraanDinas")))); orderPelayanan.getProduk().setNilaiNormal((short) 1); orderPelayanan.getProduk().setQProduk(1); orderPelayanan.getProduk().setQtyJualTerkecil(1.0); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPemakaianRuangRapatServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPemakaianRuangRapatServiceImpl.java index 8c73099a..c244ee29 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPemakaianRuangRapatServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderPemakaianRuangRapatServiceImpl.java @@ -216,12 +216,12 @@ public class OrderPemakaianRuangRapatServiceImpl extends BaseVoServiceImpl imple orderPelayanan.setRuanganTujuan(ruanganConverter .transferVOToModel(vo.getOrderPelayanan().getRuanganTujuan(), new Ruangan())); orderPelayanan.setRuanganTujuan(ruanganDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdRuanganRapat")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdRuanganRapat")))); if (CommonUtil.isNotNullOrEmpty(vo.getOrderPelayanan().getProduk())) { orderPelayanan.setProduk(produkConverter .transferVOToModel(vo.getOrderPelayanan().getProduk(), new Produk())); orderPelayanan.setProduk(produkDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdProdukRuangRapat")))); + Integer.parseInt((String) this.getSettingDataFixed("KdProdukRuangRapat")))); orderPelayanan.getProduk().setNilaiNormal((short) 1); orderPelayanan.getProduk().setQProduk(1); orderPelayanan.getProduk().setQtyJualTerkecil(1.0); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderProdukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderProdukServiceImpl.java index fbca4e8a..cff01cfc 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderProdukServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderProdukServiceImpl.java @@ -279,7 +279,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr } else { if (CommonUtil.isNotNullOrEmpty(vo.getDetailRadiologi())) { ruanganTujuan = (ruanganDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdRuanganRadiologi")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdRuanganRadiologi")))); noOrderIntern = "R" + getRunningNumber("Radiologi"); listRuangan.put(ruanganTujuan.getNamaRuangan(), ruanganTujuan); for (DetailOrderTindakanVO subModel : vo.getOrderTindakan()) { @@ -306,7 +306,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr } } ruanganTujuan = (ruanganDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdRuanganLaboratorium")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdRuanganLaboratorium")))); if (listRuangan.size() == 0) { for (DetailOrderTindakanVO subModel : vo.getOrderTindakan()) { RuanganVO ruanganVo = new RuanganVO(); @@ -374,7 +374,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr model.setStrukOrder(strukOrder); antrianPasienDiPeriksa.setAsalRujukan(asalRujukanDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdAsalRujukanPoliklinik")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdAsalRujukanPoliklinik")))); antrianPasienDiPeriksa.setTglRegistrasi(strukOrder.getTglOrder()); @@ -1186,7 +1186,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr @Transactional(readOnly = false) public Map saveOrderPelayananGizi(OrderProdukGiziVO vo) { Map result = new HashMap(); - String idRuanganGizi = GetSettingDataFixed("idRuanganGizi"); + String idRuanganGizi = getSettingDataFixed("idRuanganGizi"); Ruangan ruangan = new Ruangan(); ruangan.setId(Integer.valueOf(idRuanganGizi)); AntrianPasienDiPeriksa antrian = antrianPasienDiPeriksaDao.findOne(vo.getAntrianPasienDiPeriksa().getNoRec()); @@ -1390,7 +1390,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr @Override public Map getOrderPelayananGizi() { Map result = new HashMap(); - String idRuanganGizi = GetSettingDataFixed("idRuanganGizi"); + String idRuanganGizi = getSettingDataFixed("idRuanganGizi"); List> list = new ArrayList>(); List> listOrder = orderPelayananDao.findOrderPelayananGizi(Integer.valueOf(idRuanganGizi)); for (Map abc : listOrder) { @@ -1414,7 +1414,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr public Map getOrderPelayananGiziMakanan(Integer ruanganAsalId, Integer jenisWaktuId, Date startDate, Date endDate) { Map result = new HashMap(); - String idRuanganGizi = GetSettingDataFixed("idRuanganGizi"); + String idRuanganGizi = getSettingDataFixed("idRuanganGizi"); List> list = new ArrayList>(); List> listOrder; List> listOrder2; @@ -1475,7 +1475,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr Map map = new HashMap(); String noRecPasienDaftar = (String) abc.get("noRecPasienDaftar"); PasienDaftar pasienDaftar = pasienDaftarDao.findByNoRec(noRecPasienDaftar); - String idRuanganGizi = GetSettingDataFixed("idRuanganGizi"); + String idRuanganGizi = getSettingDataFixed("idRuanganGizi"); List antrian = antrianPasienDiPeriksaDao.findByPasienDaftarAndStrukOrderNull(noRecPasienDaftar); if(!antrian.isEmpty()){ String dokter=""; @@ -1494,7 +1494,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr public Map getOrderPelayananGiziMinuman(Integer ruanganAsalId, Integer jenisWaktuId, Date startDate, Date endDate) { Map result = new HashMap(); - String idRuanganGizi = GetSettingDataFixed("idRuanganGizi"); + String idRuanganGizi = getSettingDataFixed("idRuanganGizi"); List> list = new ArrayList>(); List> listOrder; if (ruanganAsalId != null) { @@ -1674,7 +1674,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr strukHistori.setNonHistori(getRunningNumber("Struk Histori")); strukHistori.setTglHistori(new Date()); Ruangan ruangan = new Ruangan(); - ruangan.setId(Integer.valueOf(GetSettingDataFixed("idRuanganGizi"))); + ruangan.setId(Integer.valueOf(getSettingDataFixed("idRuanganGizi"))); strukHistori.setRuangan(ruangan); strukHistori.setTglAwal(new Date()); strukHistori.setTglAhir(new Date()); @@ -1822,7 +1822,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr @Override public Map getOrderPelayananKirimMenuGiziMakanan(Integer ruanganAsalId) { Map result = new HashMap(); - String idRuanganGizi = GetSettingDataFixed("idRuanganGizi"); + String idRuanganGizi = getSettingDataFixed("idRuanganGizi"); List> list = new ArrayList>(); List> listOrder; List> listOrder2; @@ -1952,7 +1952,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr @Override public Map getOrderPelayananKirimMenuGiziMinuman(Integer ruanganAsalId) { Map result = new HashMap(); - String idRuanganGizi = GetSettingDataFixed("idRuanganGizi"); + String idRuanganGizi = getSettingDataFixed("idRuanganGizi"); List> list = new ArrayList>(); List> listOrder; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PayRollPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PayRollPegawaiServiceImpl.java index 2b3e184a..d8377894 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PayRollPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PayRollPegawaiServiceImpl.java @@ -18,7 +18,6 @@ import java.util.Set; import java.util.UUID; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.time.DateUtils; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; @@ -1124,7 +1123,7 @@ public class PayRollPegawaiServiceImpl extends BaseVoServiceImpl implements PayR @Override public List> findRekananPenjaminPasien() { - String idJenisRekanan=GetSettingDataFixed("kdJenisRekananPenjaminPasien"); + String idJenisRekanan= getSettingDataFixed("kdJenisRekananPenjaminPasien"); return rekananDao.findByJenisRekanan(Integer.valueOf(idJenisRekanan)); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java index 7e61a531..851d7869 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java @@ -1734,7 +1734,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ @Override public Map findKepalaPegawai(String fieldDataFix) { - String valueFix = GetSettingDataFixed(fieldDataFix); + String valueFix = getSettingDataFixed(fieldDataFix); return pegawaiDao.getKepalaPegawai(Integer.valueOf(valueFix)); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java index 72200fec..e0c5d2d7 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java @@ -376,8 +376,8 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay URL url; try { - String location =GetSettingDataFixed("UrlKeuangan").toString() + "/service/transaksi/akuntansi/jurnal-otomatis"; - url = new URL(GetSettingDataFixed("UrlKeuangan").toString() + "/service/transaksi/akuntansi/jurnal-otomatis"); + String location = getSettingDataFixed("UrlKeuangan").toString() + "/service/transaksi/akuntansi/jurnal-otomatis"; + url = new URL(getSettingDataFixed("UrlKeuangan").toString() + "/service/transaksi/akuntansi/jurnal-otomatis"); HttpURLConnection myURLConnection = (HttpURLConnection) url.openConnection(); myURLConnection.setRequestMethod("POST"); @@ -400,14 +400,14 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay if(antrianDiperiksas.size()!=0) { - kdInstalasi= GetSettingDataFixed("KdDepartemenInstalasiRawatJalan"); + kdInstalasi= getSettingDataFixed("KdDepartemenInstalasiRawatJalan"); } else - kdInstalasi = GetSettingDataFixed("KdDepartemenInstalasiRawatInap"); + kdInstalasi = getSettingDataFixed("KdDepartemenInstalasiRawatInap"); if(pemakaianAsuransi !=null) { - kdRekanan =Integer.parseInt( GetSettingDataFixed("KdRekananBpjs")); + kdRekanan =Integer.parseInt( getSettingDataFixed("KdRekananBpjs")); } @@ -567,7 +567,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay new PelayananPasien()); if (subModel.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); - produk.setId(Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + produk.setId(Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); subModel.setProduk(produk); } Double harga = stokProdukGlobalDao.TakeHarga(subModel.getProduk().getId(), @@ -614,7 +614,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay if (racikanDetailVO.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); produk.setId( - Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); racikanDetailVO.setProduk(produk); } racikanDetail.setProduk(produkConverter @@ -789,7 +789,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay new PelayananPasien()); if (subModel.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); - produk.setId(Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + produk.setId(Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); subModel.setProduk(produk); } Double harga = stokProdukGlobalDao.TakeHarga(subModel.getProduk().getId(), @@ -836,7 +836,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay if (racikanDetailVO.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); produk.setId( - Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); racikanDetailVO.setProduk(produk); } racikanDetail.setProduk(produkConverter @@ -1123,7 +1123,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay pelayananPasienDao.save(detail); strukOrder = detail.getStrukOrder(); Produk p=produkDao.findOne(pelayananPasienDetailVO.getProduk().getId()); - Ruangan r=ruanganDao.findOne(new Integer(GetSettingDataFixed("KdRuanganFarmasi"))); + Ruangan r=ruanganDao.findOne(new Integer(getSettingDataFixed("KdRuanganFarmasi"))); kartuStokService.saveKartuStok(pelayananPasienDetailVO.getJumlahPembulatan(), p, r, "penjualan ke pasien ", false, new Date()); stokProdukGlobalService.updateStokPembelianPasien(p, pelayananPasienDetailVO.getJumlahPembulatan(), r); @@ -1448,7 +1448,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay new PelayananPasien()); if (subModel.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); - produk.setId(Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + produk.setId(Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); subModel.setProduk(produk); } //Double harga = stokProdukGlobalDao.TakeHarga(subModel.getProduk().getId(), @@ -1522,7 +1522,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay if (racikanDetailVO.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); produk.setId( - Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); racikanDetailVO.setProduk(produk); } racikanDetail.setProduk(produkConverter @@ -1719,7 +1719,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay new PelayananPasien()); if (subModel.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); - produk.setId(Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + produk.setId(Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); subModel.setProduk(produk); } //Double harga = stokProdukGlobalDao.TakeHarga(subModel.getProduk().getId(), @@ -1792,7 +1792,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay if (racikanDetailVO.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); produk.setId( - Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); racikanDetailVO.setProduk(produk); } racikanDetail.setProduk(produkConverter @@ -1970,7 +1970,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay pelayananPasienDao.save(detail); strukOrder = detail.getStrukOrder(); Produk p=produkDao.findOne(pelayananPasienDetailVO.getProduk().getId()); - Ruangan r=ruanganDao.findOne(new Integer(GetSettingDataFixed("KdRuanganFarmasi"))); + Ruangan r=ruanganDao.findOne(new Integer(getSettingDataFixed("KdRuanganFarmasi"))); kartuStokService.saveKartuStok(pelayananPasienDetailVO.getJumlahPembulatan(), p, r, "penjualan ke pasien ", false, new Date()); stokProdukGlobalService.updateStokPembelianPasien(p, pelayananPasienDetailVO.getJumlahPembulatan(), r); @@ -2084,7 +2084,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay OrderPelayanan orderPelayanan=new OrderPelayanan(); if (subModel.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); - produk.setId(Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + produk.setId(Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); subModel.setProduk(produk); } //Double harga = stokProdukGlobalDao.TakeHarga(subModel.getProduk().getId(), @@ -2164,7 +2164,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay if (racikanDetailVO.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); produk.setId( - Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); racikanDetailVO.setProduk(produk); } //racikanDetail.setProduk(produkConverter @@ -2317,7 +2317,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay OrderPelayanan orderPelayanan=new OrderPelayanan(); if (subModel.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); - produk.setId(Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + produk.setId(Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); subModel.setProduk(produk); } //Double harga = stokProdukGlobalDao.TakeHarga(subModel.getProduk().getId(), @@ -2488,7 +2488,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay Map result = new HashMap<>(); Ruangan ruangan = ruanganDao.findOne - (new Integer(GetSettingDataFixed("KdRuanganFarmasi"))); + (new Integer(getSettingDataFixed("KdRuanganFarmasi"))); if(CommonUtil.isNotNullOrEmpty(vo)){ StrukOrder strukOrder = null; @@ -2935,7 +2935,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay strukPelayanan.setTotalhargasatuan(strukPelayananVO.getTotalharusdibayar()); strukPelayanan.setTotalharusdibayar(strukPelayananVO.getTotalharusdibayar()); } - String kelompokTransaksiId = GetSettingDataFixed("KdKelompokTransaksiPenjualanBebas"); + String kelompokTransaksiId = getSettingDataFixed("KdKelompokTransaksiPenjualanBebas"); if(CommonUtil.isNotNullOrEmpty(kelompokTransaksiId)){ KelompokTransaksi kelompokTransaksi= kelompokTransaksiDao.findOne(Integer.parseInt(kelompokTransaksiId)); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); @@ -3096,7 +3096,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay strukPelayanan.setNocm(hasilPasien); strukPelayanan.setNoorder(strukOrder); strukPelayanan.setTglstruk(detail.getTglPelayanan()); - String kelompokTransaksiId=GetSettingDataFixed("KdKelompokTransaksiObatAlkes"); + String kelompokTransaksiId= getSettingDataFixed("KdKelompokTransaksiObatAlkes"); KelompokTransaksi kelompokTransaksi=new KelompokTransaksi(); kelompokTransaksi.setId(Integer.valueOf(kelompokTransaksiId)); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); @@ -3125,7 +3125,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay StrukPelayananDetail hasilStrukPelayananDetail=strukPelayananDetailDao.save(strukPelayananDetail); Produk p=produkDao.findOne(pelayananPasienDetailVO.getProduk().getId()); - Ruangan r=ruanganDao.findOne(new Integer(GetSettingDataFixed("KdRuanganFarmasi"))); + Ruangan r=ruanganDao.findOne(new Integer(getSettingDataFixed("KdRuanganFarmasi"))); kartuStokService.saveKartuStok(pelayananPasienDetailVO.getJumlahPembulatan(), p, r, "penjualan ke pasien ", false, new Date()); stokProdukGlobalService.updateStokPembelianPasien(p, pelayananPasienDetailVO.getJumlahPembulatan(), r); @@ -3398,7 +3398,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay strukOrder.setTotalPph(0.0); strukOrder.setTotalPpn(0.0); strukOrder.setStatusOrder((byte)0); - String idDefaultApotik=GetSettingDataFixed("kdDefaultRuangApotik"); + String idDefaultApotik= getSettingDataFixed("kdDefaultRuangApotik"); Ruangan ruangan = new Ruangan(); ruangan.setId(Integer.valueOf(idDefaultApotik)); strukOrder.setRuanganTujuan(ruangan); @@ -3453,7 +3453,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay OrderPelayanan orderPelayanan=new OrderPelayanan(); if (subModel.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); - produk.setId(Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + produk.setId(Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); subModel.setProduk(produk); } //Double harga = stokProdukGlobalDao.TakeHarga(subModel.getProduk().getId(), @@ -3529,7 +3529,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay if (racikanDetailVO.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); produk.setId( - Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); racikanDetailVO.setProduk(produk); } //racikanDetail.setProduk(produkConverter @@ -3687,7 +3687,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay OrderPelayanan orderPelayanan=new OrderPelayanan(); if (subModel.getStatusOrder() == -1) { ProdukVO produk = new ProdukVO(); - produk.setId(Integer.parseInt(GetSettingDataFixed("KdProdukDefault").toString())); + produk.setId(Integer.parseInt(getSettingDataFixed("KdProdukDefault").toString())); subModel.setProduk(produk); } //Double harga = stokProdukGlobalDao.TakeHarga(subModel.getProduk().getId(), diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java index eaf393b5..46c75cc6 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java @@ -649,7 +649,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel Date dateLine; try { date = df.parse(bulan); - dateLine = df.parse(GetSettingDataFixed("berlakuTargetJasaRemunDokter")); + dateLine = df.parse(getSettingDataFixed("berlakuTargetJasaRemunDokter")); } catch (ParseException e) { System.out.println(e.getMessage()); return null; @@ -665,7 +665,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel * Mendapatkan nominal target remunerasi untuk simulasi */ Double targetRemun = 0.0; - String sdTarget = GetSettingDataFixed("targetRemunJasaDokter"); + String sdTarget = getSettingDataFixed("targetRemunJasaDokter"); if (CommonUtil.isNotNullOrEmpty(sdTarget)) targetRemun = Double.parseDouble(sdTarget); /* @@ -677,21 +677,21 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel /* * Mendapatkan persentase jasa */ - double persenOperator = Double.parseDouble(GetSettingDataFixed("persenRemunOperatorIBS")); - double persenAsistenIBS = Double.parseDouble(GetSettingDataFixed("persenRemunAsistenIBS")); - double persenAnestesi = Double.parseDouble(GetSettingDataFixed("persenRemunAnestesiIBS")); - double persenRadiologi = Double.parseDouble(GetSettingDataFixed("persenRemunRadiologi")); - double persenLaboratorium = Double.parseDouble(GetSettingDataFixed("persenRemunLaboratorium")); - double persenRehabMedik = Double.parseDouble(GetSettingDataFixed("persenRemunRehabMedik")); - double persenKonsultasi = Double.parseDouble(GetSettingDataFixed("persenRemunKonsultasiDokter")); - double persenVisite = Double.parseDouble(GetSettingDataFixed("persenRemunVisiteDokter")); - double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenRemunTindakanDokter")); - double persenTarifJasaBedah = Double.parseDouble(GetSettingDataFixed("persenTarifJasaBedah")); - double persenTarifJasaICU = Double.parseDouble(GetSettingDataFixed("persenTarifJasaICU")); - double persenRemunDokterPA = Double.parseDouble(GetSettingDataFixed("persenRemunDokterPA")); - double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD")); - double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika")); - double persenRemunTerapis = Double.parseDouble(GetSettingDataFixed("persenRemunTerapis")); + double persenOperator = Double.parseDouble(getSettingDataFixed("persenRemunOperatorIBS")); + double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenRemunAsistenIBS")); + double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenRemunAnestesiIBS")); + double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenRemunRadiologi")); + double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenRemunLaboratorium")); + double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenRemunRehabMedik")); + double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenRemunKonsultasiDokter")); + double persenVisite = Double.parseDouble(getSettingDataFixed("persenRemunVisiteDokter")); + double persenTindakan = Double.parseDouble(getSettingDataFixed("persenRemunTindakanDokter")); + double persenTarifJasaBedah = Double.parseDouble(getSettingDataFixed("persenTarifJasaBedah")); + double persenTarifJasaICU = Double.parseDouble(getSettingDataFixed("persenTarifJasaICU")); + double persenRemunDokterPA = Double.parseDouble(getSettingDataFixed("persenRemunDokterPA")); + double persenRemunDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenRemunDokterUmumHD")); + double persenRemunLabGenetika = Double.parseDouble(getSettingDataFixed("persenRemunLabGenetika")); + double persenRemunTerapis = Double.parseDouble(getSettingDataFixed("persenRemunTerapis")); /* * Persiapan filter logic remunerasi */ @@ -706,23 +706,23 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List drKkRadiologi = pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsDokterPerinatologi = getNilaiDataFixByTMT("pr_dokter_perinatologi", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); List idsDokterBPJSffs = splitDataSettingDatafixed("dokterBPJSffs"); - List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); - List idsMonitoringIntervensi = splitDataSettingDatafixed("idMonitoringIntervensi"); - List idsMonitoringHemodinamikGagalOrgan = splitDataSettingDatafixed( - "idMonitoringHemodinamikGagalOrgan"); - List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); - List idProdukKepalaPaketFixedPay = splitDataSettingDatafixed("idProdukKepalaPaketFixedPay"); - List paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay"); - List idsKarcis = splitDataSettingDatafixed("listKarcisIdProduk"); + List idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAwal); + List idsMonitoringIntervensi = getNilaiDataFixByTMT("idMonitoringIntervensi", tglAwal); + List idsMonitoringHemodinamikGagalOrgan = getNilaiDataFixByTMT("idMonitoringHemodinamikGagalOrgan", + tglAwal); + List idsLabGenetikaLuarRuangan = getNilaiDataFixByTMT("idProdukLabGenetikaLuarRuangan", tglAwal); + List idsKepalaPaketFixedPay = getNilaiDataFixByTMT("idProdukKepalaPaketFixedPay", tglAwal); + List paketBukanFixedPay = getNilaiDataFixByTMT("produkPaketBukanFixedPay", tglAwal); + List idsKarcis = getNilaiDataFixByTMT("listKarcisIdProduk", tglAwal); if (drKkPatologiAnatomiList.contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; } else if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_KLINIK).contains(idPegawai)) { @@ -745,10 +745,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel * Pemisahan produk kepala paket untuk fixed pay */ List> listKepalaPaketFixedPay = listRatedPay.stream() - .filter(d -> idProdukKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) + .filter(d -> idsKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) .collect(Collectors.toList()); listRatedPay = listRatedPay.stream() - .filter(d -> !idProdukKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) + .filter(d -> !idsKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) .collect(Collectors.toList()); List allPaketId = mapProdukPaketDao.findProdukEntriId(); List revisedPaketId = allPaketId.stream().filter(p -> !paketBukanFixedPay.contains(p)) @@ -876,7 +876,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, false); d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) - && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) + && idsLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { /* * A rule for claimed <= Jul 31th 2023 @@ -2201,30 +2201,31 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel /* * Mendapatkan persentase jasa */ - double persenOperator = Double.parseDouble(GetSettingDataFixed("persenRemunOperatorIBS")); - double persenAsistenIBS = Double.parseDouble(GetSettingDataFixed("persenRemunAsistenIBS")); - double persenAnestesi = Double.parseDouble(GetSettingDataFixed("persenRemunAnestesiIBS")); - double persenRadiologi = Double.parseDouble(GetSettingDataFixed("persenRemunRadiologi")); - double persenLaboratorium = Double.parseDouble(GetSettingDataFixed("persenRemunLaboratorium")); - double persenRehabMedik = Double.parseDouble(GetSettingDataFixed("persenRemunRehabMedik")); - double persenKonsultasi = Double.parseDouble(GetSettingDataFixed("persenRemunKonsultasiDokter")); - double persenVisite = Double.parseDouble(GetSettingDataFixed("persenRemunVisiteDokter")); - double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenRemunTindakanDokter")); - double persenTarifJasaBedah = Double.parseDouble(GetSettingDataFixed("persenTarifJasaBedah")); - double persenTarifJasaICU = Double.parseDouble(GetSettingDataFixed("persenTarifJasaICU")); - double persenRemunDokterPA = Double.parseDouble(GetSettingDataFixed("persenRemunDokterPA")); - double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD")); - double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika")); - double persenRemunTerapis = Double.parseDouble(GetSettingDataFixed("persenRemunTerapis")); + double persenOperator = Double.parseDouble(getSettingDataFixed("persenRemunOperatorIBS")); + double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenRemunAsistenIBS")); + double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenRemunAnestesiIBS")); + double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenRemunRadiologi")); + double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenRemunLaboratorium")); + double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenRemunRehabMedik")); + double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenRemunKonsultasiDokter")); + double persenVisite = Double.parseDouble(getSettingDataFixed("persenRemunVisiteDokter")); + double persenTindakan = Double.parseDouble(getSettingDataFixed("persenRemunTindakanDokter")); + double persenTarifJasaBedah = Double.parseDouble(getSettingDataFixed("persenTarifJasaBedah")); + double persenTarifJasaICU = Double.parseDouble(getSettingDataFixed("persenTarifJasaICU")); + double persenRemunDokterPA = Double.parseDouble(getSettingDataFixed("persenRemunDokterPA")); + double persenRemunDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenRemunDokterUmumHD")); + double persenRemunLabGenetika = Double.parseDouble(getSettingDataFixed("persenRemunLabGenetika")); + double persenRemunTerapis = Double.parseDouble(getSettingDataFixed("persenRemunTerapis")); /* * Persiapan filter logic remunerasi */ + Date tglAwal = DateUtil.startMonth(bulan); List drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM); List drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); - List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); + List idsLabGenetikaLuarRuangan = getNilaiDataFixByTMT("idProdukLabGenetikaLuarRuangan", tglAwal); /* * Set persen jasa dan harga jasa pasien bpjs di ibs, icu */ @@ -2375,7 +2376,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("keterangan", hargaJasa.getKeterangan()); d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) - && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) + && idsLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d, true); d.put("persenJasa", persenRemunLabGenetika + "%"); @@ -2595,29 +2596,30 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel /* * Mendapatkan persentase jasa */ - double persenBPJS = Double.parseDouble(GetSettingDataFixed("persenJasaBPJS")); - double persenOperator = Double.parseDouble(GetSettingDataFixed("persenJasaOperatorIBS")); - double persenAsistenIBS = Double.parseDouble(GetSettingDataFixed("persenJasaAsistenIBS")); - double persenAnestesi = Double.parseDouble(GetSettingDataFixed("persenJasaAnestesiIBS")); - double persenRadiologi = Double.parseDouble(GetSettingDataFixed("persenJasaRadiologi")); - double persenLaboratorium = Double.parseDouble(GetSettingDataFixed("persenJasaLaboratorium")); - double persenRehabMedik = Double.parseDouble(GetSettingDataFixed("persenJasaRehabMedik")); - double persenKonsultasi = Double.parseDouble(GetSettingDataFixed("persenJasaKonsultasiDokter")); - double persenVisite = Double.parseDouble(GetSettingDataFixed("persenJasaVisiteDokter")); - double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenJasaTindakanDokter")); - 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 persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS")); + double persenOperator = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS")); + double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS")); + double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS")); + double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi")); + double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium")); + double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik")); + double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter")); + double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter")); + double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter")); + double persenJasaDokterPA = Double.parseDouble(getSettingDataFixed("persenJasaDokterPA")); + double persenJasaDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenJasaDokterUmumHD")); + double persenJasaLabGenetika = Double.parseDouble(getSettingDataFixed("persenJasaLabGenetika")); + double persenJasaTerapis = Double.parseDouble(getSettingDataFixed("persenJasaTerapis")); /* * Persiapan filter logic remunerasi */ + Date tglAwal = DateUtil.startMonth(bulan); List drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM); List drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); - List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); + List idsLabGenetikaLuarRuangan = getNilaiDataFixByTMT("idProdukLabGenetikaLuarRuangan", tglAwal); /* * Mapping persentase jasa remunerasi */ @@ -2744,7 +2746,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("keterangan", hargaJasa.getKeterangan()); d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) - && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) + && idsLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true); d.put("persenJasa", persenJasaLabGenetika + "%"); @@ -2863,30 +2865,31 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel /* * Mendapatkan persentase jasa */ - double persenBPJS = Double.parseDouble(GetSettingDataFixed("persenJasaBPJS")); - double persenOperator = Double.parseDouble(GetSettingDataFixed("persenJasaOperatorIBS")); - double persenAsistenIBS = Double.parseDouble(GetSettingDataFixed("persenJasaAsistenIBS")); - double persenAnestesi = Double.parseDouble(GetSettingDataFixed("persenJasaAnestesiIBS")); - double persenRadiologi = Double.parseDouble(GetSettingDataFixed("persenJasaRadiologi")); - double persenLaboratorium = Double.parseDouble(GetSettingDataFixed("persenJasaLaboratorium")); - double persenRehabMedik = Double.parseDouble(GetSettingDataFixed("persenJasaRehabMedik")); - double persenKonsultasi = Double.parseDouble(GetSettingDataFixed("persenJasaKonsultasiDokter")); - double persenVisite = Double.parseDouble(GetSettingDataFixed("persenJasaVisiteDokter")); - double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenJasaTindakanDokter")); - 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 persenJasaLuarTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaLuarTerapis")); + double persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS")); + double persenOperator = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS")); + double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS")); + double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS")); + double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi")); + double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium")); + double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik")); + double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter")); + double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter")); + double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter")); + 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 persenJasaLuarTerapis = Double.parseDouble(getSettingDataFixed("persenJasaLuarTerapis")); /* * Persiapan filter logic remunerasi */ + Date tglAwal = DateUtil.startMonth(bulan); List drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM); List drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); - List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); + List idsLabGenetikaLuarRuangan = getNilaiDataFixByTMT("idProdukLabGenetikaLuarRuangan", tglAwal); /* * Mapping persentase jasa remunerasi */ @@ -3019,7 +3022,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("keterangan", hargaJasa.getKeterangan()); d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) - && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) + && idsLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true); d.put("persenJasa", persenJasaLabGenetika + "%"); @@ -3231,29 +3234,30 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel /* * Mendapatkan persentase jasa */ - double persenBPJS = Double.parseDouble(GetSettingDataFixed("persenJasaBPJS")); - double persenOperatorIBS = Double.parseDouble(GetSettingDataFixed("persenJasaOperatorIBS")); - double persenAsistenIBS = Double.parseDouble(GetSettingDataFixed("persenJasaAsistenIBS")); - double persenAnestesi = Double.parseDouble(GetSettingDataFixed("persenJasaAnestesiIBS")); - double persenRadiologi = Double.parseDouble(GetSettingDataFixed("persenJasaRadiologi")); - double persenLaboratorium = Double.parseDouble(GetSettingDataFixed("persenJasaLaboratorium")); - double persenRehabMedik = Double.parseDouble(GetSettingDataFixed("persenJasaRehabMedik")); - double persenKonsultasi = Double.parseDouble(GetSettingDataFixed("persenJasaKonsultasiDokter")); - double persenVisite = Double.parseDouble(GetSettingDataFixed("persenJasaVisiteDokter")); - double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenJasaTindakanDokter")); - 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 persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS")); + double persenOperatorIBS = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS")); + double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS")); + double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS")); + double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi")); + double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium")); + double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik")); + double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter")); + double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter")); + double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter")); + double persenJasaDokterPA = Double.parseDouble(getSettingDataFixed("persenJasaDokterPA")); + double persenJasaDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenJasaDokterUmumHD")); + double persenJasaLabGenetika = Double.parseDouble(getSettingDataFixed("persenJasaLabGenetika")); + double persenJasaTerapis = Double.parseDouble(getSettingDataFixed("persenJasaTerapis")); /* * Persiapan filter logic remunerasi */ + Date tglAwal = DateUtil.startMonth(bulan); List drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM); List drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); - List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); + List idsLabGenetikaLuarRuangan = getNilaiDataFixByTMT("idProdukLabGenetikaLuarRuangan", tglAwal); if (terapisRehabMedik.contains(idPegawai)) return new ArrayList<>(); /* @@ -3383,7 +3387,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel d.put("keterangan", hargaJasa.getKeterangan()); d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) - && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) + && idsLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true); d.put("persenJasa", persenJasaLabGenetika + "%"); @@ -3582,7 +3586,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel @Override public List> detailLogbookTarifDokter(Integer idPegawai, List norecs) { - List paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay"); + List paketBukanFixedPay = getNilaiDataFixByTMT("produkPaketBukanFixedPay", new Date()); List> result = pelayananPasienDao.findPelayananPasienByPetugasAndPelayananPasien(idPegawai, norecs); List listIdPelayananPaketBukanFixedPay = result.stream() @@ -3673,8 +3677,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel .collect(Collectors.toList()); List byNorecPelayanan = pelayananPasienDao.findAll(norecPelayanan); { - Optional pendaftaran = byNorecPelayanan.stream().map(p -> p.getPasienDaftar().getPasienDaftar()) - .findFirst(); + Optional pendaftaran = byNorecPelayanan.stream() + .map(p -> p.getPasienDaftar().getPasienDaftar()).findFirst(); pendaftaran.ifPresent(p -> { Integer pasienId = p.getPasien().getId(); String ibuNoCm = p.getPasien().getReportDisplay(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java index 7cfa258e..2c8df4d4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemulasaraanJenazahServiceImpl.java @@ -120,15 +120,15 @@ public class PemulasaraanJenazahServiceImpl extends BaseVoServiceImpl implements for (int i = 0; i < listOrderPelayanan.size(); i++) { orderPelayanan.setProduk(listOrderPelayanan.get(i).getProduk()); orderPelayanan.setProduk(produkDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdProdukPemulasaraanJenazah")))); + Integer.parseInt((String) this.getSettingDataFixed("KdProdukPemulasaraanJenazah")))); orderPelayanan.setNoOrder(listOrderPelayanan.get(i).getNoOrder()); orderPelayanan.setStrukOrder(listOrderPelayanan.get(i).getStrukOrder()); orderPelayanan.setRuangan(listOrderPelayanan.get(i).getRuangan()); orderPelayanan.setRuangan(ruanganDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdRuanganPemulasaraanJenazah")))); + Integer.parseInt((String) this.getSettingDataFixed("KdRuanganPemulasaraanJenazah")))); orderPelayanan.setRuanganTujuan(listOrderPelayanan.get(i).getRuanganTujuan()); orderPelayanan.setRuanganTujuan(ruanganDao.findById(Integer - .parseInt((String) this.GetSettingDataFixed("KdRuanganTujuanPemulasaraanJenazah")))); + .parseInt((String) this.getSettingDataFixed("KdRuanganTujuanPemulasaraanJenazah")))); orderPelayanan.setIsCito(listOrderPelayanan.get(i).getIsCito()); orderPelayanan.setQtyProduk(listOrderPelayanan.get(i).getQtyProduk()); orderPelayanan.setQtyProdukRetur(listOrderPelayanan.get(i).getQtyProdukRetur()); @@ -295,7 +295,7 @@ public class PemulasaraanJenazahServiceImpl extends BaseVoServiceImpl implements strukPelayanan.setQtyproduk(0.0); strukPelayanan.setTglstruk(vo.getTglStruk()); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiPemulasaraanJenazah"))); // set + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiPemulasaraanJenazah"))); // set // nilaifield // =99 strukPelayanan.setKdkelompoktransaksi(kelompokTransaksi); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemusnahanBarangServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemusnahanBarangServiceImpl.java index b5252595..e256cb73 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemusnahanBarangServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemusnahanBarangServiceImpl.java @@ -1,6 +1,5 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -15,24 +14,15 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.JenisTransaksiDao; import com.jasamedika.medifirst2000.dao.KelompokProdukDao; -import com.jasamedika.medifirst2000.dao.KirimProdukDao; import com.jasamedika.medifirst2000.dao.ProdukDao; import com.jasamedika.medifirst2000.dao.RunningNumberDao; -import com.jasamedika.medifirst2000.dao.SatuanStandarDao; -import com.jasamedika.medifirst2000.dao.StokProdukDetailDao; -import com.jasamedika.medifirst2000.dao.StokProdukGlobalDao; import com.jasamedika.medifirst2000.dao.StrukHistoriDao; import com.jasamedika.medifirst2000.dao.StrukKirimDao; -import com.jasamedika.medifirst2000.dao.StrukKonfirmasiDao; import com.jasamedika.medifirst2000.dao.StrukOrderDao; import com.jasamedika.medifirst2000.dao.StrukPelayananDao; import com.jasamedika.medifirst2000.dao.custom.DestroyProdukDetailDaoCustom; -import com.jasamedika.medifirst2000.dao.custom.StokProdukDetailDaoCustom; import com.jasamedika.medifirst2000.dao.custom.StokProdukGlobalDaoCustom; -import com.jasamedika.medifirst2000.dao.custom.StrukKirimDaoCustom; -import com.jasamedika.medifirst2000.dao.custom.StrukOrderDaoCustom; import com.jasamedika.medifirst2000.entities.AsalProduk; import com.jasamedika.medifirst2000.entities.DestroyProduk; import com.jasamedika.medifirst2000.entities.DestroyProdukDetail; @@ -44,7 +34,6 @@ import com.jasamedika.medifirst2000.entities.OrderPelayanan; import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.Produk; import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.RunningNumber; import com.jasamedika.medifirst2000.entities.SatuanStandar; import com.jasamedika.medifirst2000.entities.StrukHistori; import com.jasamedika.medifirst2000.entities.StrukKirim; @@ -56,7 +45,6 @@ import com.jasamedika.medifirst2000.service.PemusnahanBarangService; import com.jasamedika.medifirst2000.service.StokProdukGlobalService; import com.jasamedika.medifirst2000.service.StrukOrderService; import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.StringUtil; import com.jasamedika.medifirst2000.vo.AsalProdukVO; import com.jasamedika.medifirst2000.vo.DestroyProdukVO; @@ -169,7 +157,7 @@ public class PemusnahanBarangServiceImpl extends BaseAngaranServiceImpl implemen strukOrder.setIsDelivered((byte) 1); strukOrder.setKeteranganOrder("Permintaan Barang Dari Ruangan (Pemusnahan)"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiOrderBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiOrderBarang"))); strukOrder.setKelompokTransaksi(kelompokTransaksi); if(CommonUtil.isNotNullOrEmpty(vo.getJenisPermintaanVO())){ strukOrder.setJenisPermintaan(jenisPermintaanConverter.transferVOToModel(vo.getJenisPermintaanVO(), new JenisPermintaan())); @@ -271,7 +259,7 @@ public class PemusnahanBarangServiceImpl extends BaseAngaranServiceImpl implemen strukKirim.setKeteranganlainnyakirim("Pengiriman Barang Ke Ruangan"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKirimBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKirimBarang"))); strukKirim.setKelompokTransaksi(kelompokTransaksi); if(CommonUtil.isNotNullOrEmpty(vo.getJenisPermintaanVO())){ strukKirim.setJenisPermintaan(jenisPermintaanConverter.transferVOToModel(vo.getJenisPermintaanVO(), new JenisPermintaan())); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java index c1718b03..302a0271 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java @@ -1,35 +1,25 @@ package com.jasamedika.medifirst2000.service.impl; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.text.SimpleDateFormat; -import java.time.DayOfWeek; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.joda.time.Chronology; -import org.joda.time.chrono.ISOChronology; -import org.joda.time.chrono.IslamicChronology; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.dao.MapPegawaiLaboratRadiologiDao; import com.jasamedika.medifirst2000.dao.PegawaiDao; import com.jasamedika.medifirst2000.dao.PendapatanDao; import com.jasamedika.medifirst2000.service.PendapatanService; import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import org.joda.time.Chronology; +import org.joda.time.chrono.ISOChronology; +import org.joda.time.chrono.IslamicChronology; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.text.SimpleDateFormat; +import java.time.*; +import java.time.format.DateTimeFormatter; +import java.util.*; /** * @author salmanoe @@ -67,7 +57,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat Double count) { Map result = new HashMap<>(); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", new Date()); if (listDrAnastesi.contains(idPegawai)) { if (idsPenunjangBukanAnestesi.contains(idProduk) && idJenisPetugasPelaksana.equals(Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) @@ -111,7 +101,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat Map result = new HashMap<>(); List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", new Date()); if (listDrAnastesi.contains(idPegawai)) { if (idsPenunjangBukanAnestesi.contains(idProduk)) { @@ -270,17 +260,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -301,12 +292,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat Arrays.asList(Master.KomponenHarga.JASA_MEDIS), Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode); - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); - Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); - Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); - Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); + Double komponenDasar = Double.parseDouble(getSettingDataFixed("ld_komponen_dasar")); + Double persenOperator = Double.parseDouble(getSettingDataFixed("ld_persen_operator")); + Double persenCooperator = Double.parseDouble(getSettingDataFixed("ld_persen_cooperator")); // RULES_NOTE_SK_FFS_2015_DI_2019 if (CommonUtil.isNotNullOrEmpty(data)) { @@ -1380,17 +1371,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(tgl.substring(0, 7)); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -1444,7 +1436,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat } List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); // RULES_SK_FFS_2015 if (CommonUtil.isNotNullOrEmpty(rawData)) { @@ -2902,17 +2894,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -2967,10 +2960,10 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat } List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); - Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); - Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); - Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); + Double komponenDasar = Double.parseDouble(getSettingDataFixed("ld_komponen_dasar")); + Double persenOperator = Double.parseDouble(getSettingDataFixed("ld_persen_operator")); + Double persenCooperator = Double.parseDouble(getSettingDataFixed("ld_persen_cooperator")); // RULES_SK_FFS_2015 if (CommonUtil.isNotNullOrEmpty(rawData)) { @@ -3988,17 +3981,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(bln); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -4051,9 +4045,9 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat } } - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); // RULES_SK_FFS_2015 if (CommonUtil.isNotNullOrEmpty(rawData)) { @@ -4974,7 +4968,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); Double harga = 0.0; Double point = 0.0; @@ -5005,11 +4999,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode); } - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (drLabPatologiAnatomi.contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -5026,11 +5021,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat listDetailJenisProdukException.removeAll(listDetailJenisProduk); } - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); - Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); - Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); - Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); + Double komponenDasar = Double.parseDouble(getSettingDataFixed("ld_komponen_dasar")); + Double persenOperator = Double.parseDouble(getSettingDataFixed("ld_persen_operator")); + Double persenCooperator = Double.parseDouble(getSettingDataFixed("ld_persen_cooperator")); if (CommonUtil.isNotNullOrEmpty(data)) { if (drParuhWaktu.contains(idPegawai)) { @@ -5784,7 +5779,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); @@ -5806,11 +5801,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat periode); } - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -5826,7 +5822,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat listDetailJenisProdukException = idsRegDJPAdminNonPK; } - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); if (CommonUtil.isNotNullOrEmpty(data)) { if (drParuhWaktu.contains(idPegawai)) { @@ -6697,7 +6693,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); Double harga = 0.0; Double point = 0.0; @@ -6726,11 +6722,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode); } - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (drLabPatologiAnatomi.contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -6747,11 +6744,11 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat listDetailJenisProdukException.removeAll(listDetailJenisProduk); } - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); - Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); - Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); - Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); + Double komponenDasar = Double.parseDouble(getSettingDataFixed("ld_komponen_dasar")); + Double persenOperator = Double.parseDouble(getSettingDataFixed("ld_persen_operator")); + Double persenCooperator = Double.parseDouble(getSettingDataFixed("ld_persen_cooperator")); // GET_JASA_MEDIS if (CommonUtil.isNotNullOrEmpty(data)) { @@ -7229,7 +7226,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); @@ -7249,11 +7246,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat bln); } - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(bln); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -7270,8 +7268,8 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat listDetailJenisProdukException.removeAll(listDetailJenisProduk); } - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); // GET_JASA_MEDIS if (CommonUtil.isNotNullOrEmpty(data)) { @@ -7651,7 +7649,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); Double harga = 0.0; Double point = 0.0; @@ -7682,11 +7680,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat Master.JenisPetugasPelaksana.PETUGAS_PELAKSANA, periode); } - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(periode); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (drLabPatologiAnatomi.contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -7736,12 +7735,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat } } - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); - Double komponenDasar = Double.parseDouble(GetSettingDataFixed("ld_komponen_dasar")); - Double persenOperator = Double.parseDouble(GetSettingDataFixed("ld_persen_operator")); - Double persenCooperator = Double.parseDouble(GetSettingDataFixed("ld_persen_cooperator")); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); + Double komponenDasar = Double.parseDouble(getSettingDataFixed("ld_komponen_dasar")); + Double persenOperator = Double.parseDouble(getSettingDataFixed("ld_persen_operator")); + Double persenCooperator = Double.parseDouble(getSettingDataFixed("ld_persen_cooperator")); // RULES_SK_FFS_2015 if (CommonUtil.isNotNullOrEmpty(rawData)) { @@ -8638,7 +8637,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime PSBBDate = LocalDateTime.of(2020, 9, 14, 0, 0, 0); - LocalDateTime PSBBEnd = LocalDateTime.parse(GetSettingDataFixed("psbbperiod"), dtf); + LocalDateTime PSBBEnd = LocalDateTime.parse(getSettingDataFixed("psbbperiod"), dtf); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_ANESTESI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_UMUM); @@ -8658,11 +8657,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat bln); } - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date tglAwal = DateUtil.startMonth(bln); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); if (pegawaiDao.getDokterByKelompokKerja(Master.SubUnitKerja.KK_PATOLOGI_ANATOMI).contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; @@ -8712,9 +8712,9 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat } } - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); List idsKonsultasiDokterJaga = splitDataSettingDatafixed("pr_konsultasi_dokter_jaga"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); // RULES_SK_FFS_2015 if (CommonUtil.isNotNullOrEmpty(rawData)) { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenyuluhanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenyuluhanServiceImpl.java index c2876ba8..18b0fc0b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenyuluhanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PenyuluhanServiceImpl.java @@ -185,7 +185,7 @@ public class PenyuluhanServiceImpl extends BaseVoServiceImpl implements Penyuluh } - String KodeKelompokTransaksi = GetSettingDataFixed("idKelompokTransaksiDiseminasi"); + String KodeKelompokTransaksi = getSettingDataFixed("idKelompokTransaksiDiseminasi"); KelompokTransaksi kelompokTransaksi = kelompokTransaksiDao.findById(Integer.parseInt(KodeKelompokTransaksi)); if (CommonUtil.isNotNullOrEmpty(kelompokTransaksi)) { strukPlanning.setKdkelompoktransaksi(kelompokTransaksi); @@ -607,7 +607,7 @@ public class PenyuluhanServiceImpl extends BaseVoServiceImpl implements Penyuluh @Override public List> getPesertaRegistrasiByNoPlanning(String noPlanning) { - String jenisPesertaId = GetSettingDataFixed("HukorGetJenisPetugasPelaksanaPeserta"); + String jenisPesertaId = getSettingDataFixed("HukorGetJenisPetugasPelaksanaPeserta"); List> pesertas = planningDiklatHumasMarketPesertaDao .getListPlanningDHMPesertaHukorByNoPlanning(noPlanning, Integer.parseInt(jenisPesertaId)); List> biayas = planningDiklatHumasMarketBiayaDao @@ -641,7 +641,7 @@ public class PenyuluhanServiceImpl extends BaseVoServiceImpl implements Penyuluh // Simpan peserta baru if (CommonUtil.isNotNullOrEmpty(vo.getSavePesertaDHM())) { // Jenis Petugas Pelaksana (Set sebagai peserta) - String jenisPesertaId = GetSettingDataFixed("HukorGetJenisPetugasPelaksanaPeserta"); + String jenisPesertaId = getSettingDataFixed("HukorGetJenisPetugasPelaksanaPeserta"); JenisPetugasPelaksana jenisPetugasPelaksana = new JenisPetugasPelaksana(); jenisPetugasPelaksana.setId(Integer.parseInt(jenisPesertaId)); @@ -667,7 +667,7 @@ public class PenyuluhanServiceImpl extends BaseVoServiceImpl implements Penyuluh } else { // Apabila peserta baru maka simpan kedalam table pegawai - String kdJenisPegawai = GetSettingDataFixed("JenisPegawaiPesertaHukor"); + String kdJenisPegawai = getSettingDataFixed("JenisPegawaiPesertaHukor"); JenisPegawai jenisPegawai = new JenisPegawai(); jenisPegawai.setId(Integer.parseInt(kdJenisPegawai)); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PersetujuanUmumServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PersetujuanUmumServiceImpl.java index 054af1ef..c408dd86 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PersetujuanUmumServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PersetujuanUmumServiceImpl.java @@ -88,7 +88,7 @@ public class PersetujuanUmumServiceImpl extends BaseVoServiceImpl implements Per model.setRuanganTujuan(model.getPasienDaftar().getRuangan()); if(model.getRuanganTujuan()==null) { - model.setRuanganTujuan( ruanganDao.findById(Integer.parseInt(GetSettingDataFixed("KdRuanganLaboratorium")))); + model.setRuanganTujuan( ruanganDao.findById(Integer.parseInt(getSettingDataFixed("KdRuanganLaboratorium")))); } } if (CommonUtil.isNotNullOrEmpty(vo.getKelasPerawatan())) { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PphpServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PphpServiceImpl.java index 12f6fbb0..ee4768c8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PphpServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PphpServiceImpl.java @@ -167,7 +167,7 @@ public class PphpServiceImpl extends BaseAngaranServiceImpl implements PphpServi StrukPelayanan strukPelayanan=new StrukPelayanan(); strukPelayanan.setTglstruk(new Date()); strukPelayanan.setNostruk("Pphp"+getRunningNumber("Pphp")); - strukPelayanan.setKdkelompoktransaksi(kelompokTransaksiDao.findById(Integer.parseInt((String) this.GetSettingDataFixed("kdKelompokTransaksiPphp")))); + strukPelayanan.setKdkelompoktransaksi(kelompokTransaksiDao.findById(Integer.parseInt((String) this.getSettingDataFixed("kdKelompokTransaksiPphp")))); if(CommonUtil.isNotNullOrEmpty(vo.getSupplier())){ strukPelayanan.setKdrekanan(rekananConverter.transferVOToModel(vo.getSupplier(), new Rekanan())); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PsrsPermintaanPerbaikanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PsrsPermintaanPerbaikanServiceImpl.java index 8f76c6e2..18ec3948 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PsrsPermintaanPerbaikanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PsrsPermintaanPerbaikanServiceImpl.java @@ -206,7 +206,7 @@ public class PsrsPermintaanPerbaikanServiceImpl extends BaseAngaranServiceImpl strukOrder.setKeteranganLainnya(vo.getKeteranganOrder()); strukOrder.setKeteranganOrder("Permintaan Perbaikan"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("kelompokTransaksiPermintaanPerbaikanIpsrs"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("kelompokTransaksiPermintaanPerbaikanIpsrs"))); strukOrder.setKelompokTransaksi(kelompokTransaksi); if (CommonUtil.isNotNullOrEmpty(vo.getRuanganTujuan())) { @@ -295,7 +295,7 @@ public class PsrsPermintaanPerbaikanServiceImpl extends BaseAngaranServiceImpl strukKirim.setKeteranganlainnyakirim("Kirim Teknisi Ke ruangan"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKirimBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKirimBarang"))); strukKirim.setKelompokTransaksi(kelompokTransaksi); if (CommonUtil.isNotNullOrEmpty(strukOrder.getRuanganTujuan())) { strukKirim.setKdruangantujuan(strukOrder.getRuanganTujuan()); @@ -408,7 +408,7 @@ public class PsrsPermintaanPerbaikanServiceImpl extends BaseAngaranServiceImpl @Transactional(readOnly = false) public Map konfirmasiPerbaikan(KirimPerbaikanVO vo) { KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKonfirmasiBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKonfirmasiBarang"))); StrukKonfirmasi strukKonfirmasi = new StrukKonfirmasi(); strukKonfirmasi.setTglKonfirmasi(new Date()); strukKonfirmasi.setRuangan(getRuanganByUserLogin()); @@ -431,7 +431,7 @@ public class PsrsPermintaanPerbaikanServiceImpl extends BaseAngaranServiceImpl @Transactional(readOnly = false) public Map saveVerifikasiPerbaikan(KirimPerbaikanVO vo) { KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKonfirmasiBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKonfirmasiBarang"))); StrukKonfirmasi strukKonfirmasi = new StrukKonfirmasi(); strukKonfirmasi.setTglKonfirmasi(new Date()); strukKonfirmasi.setRuangan(getRuanganByUserLogin()); @@ -480,7 +480,7 @@ public class PsrsPermintaanPerbaikanServiceImpl extends BaseAngaranServiceImpl } KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); kelompokTransaksi - .setId(Integer.parseInt(GetSettingDataFixed("kelompokTransaksiPermintaanPerbaikanIpsrs"))); + .setId(Integer.parseInt(getSettingDataFixed("kelompokTransaksiPermintaanPerbaikanIpsrs"))); strukOrder.setKelompokTransaksi(kelompokTransaksi); if (CommonUtil.isNotNullOrEmpty(vo.getRuanganTujuan())) { @@ -617,7 +617,7 @@ public class PsrsPermintaanPerbaikanServiceImpl extends BaseAngaranServiceImpl @Override public Ruangan getRuanganTujuan() { - Ruangan r = ruanganDao.findById(Integer.parseInt((String) this.GetSettingDataFixed("kdRuanganIpsrs"))); + Ruangan r = ruanganDao.findById(Integer.parseInt((String) this.getSettingDataFixed("kdRuanganIpsrs"))); return r; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienOnlineServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienOnlineServiceImpl.java index c453b8f3..11632584 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienOnlineServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienOnlineServiceImpl.java @@ -20,22 +20,18 @@ import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.converter.GolonganDarahConverter; import com.jasamedika.medifirst2000.converter.JenisKelaminConverter; import com.jasamedika.medifirst2000.converter.KelompokPasienConverter; -import com.jasamedika.medifirst2000.converter.LoginUserConverter; import com.jasamedika.medifirst2000.converter.PegawaiConverter; import com.jasamedika.medifirst2000.converter.PekerjaanConverter; import com.jasamedika.medifirst2000.converter.PendidikanConverter; -import com.jasamedika.medifirst2000.converter.RegistrasiPasienConverter; import com.jasamedika.medifirst2000.converter.RuanganConverter; import com.jasamedika.medifirst2000.converter.StatusPerkawinanConverter; import com.jasamedika.medifirst2000.converter.TitlePasienConverter; -import com.jasamedika.medifirst2000.dao.AgamaDao; import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; import com.jasamedika.medifirst2000.dao.AntrianPasienRegistrasiDao; import com.jasamedika.medifirst2000.dao.JadwalDokterDao; import com.jasamedika.medifirst2000.dao.KelompokPasienDao; import com.jasamedika.medifirst2000.dao.PasienDaftarDao; import com.jasamedika.medifirst2000.dao.PasienDao; -import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao; import com.jasamedika.medifirst2000.dao.custom.AntrianPasienRegistrasiDaoCustom; import com.jasamedika.medifirst2000.entities.Agama; import com.jasamedika.medifirst2000.entities.Alamat; @@ -62,7 +58,6 @@ import com.jasamedika.medifirst2000.enums.TipePasienEnum; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.AntrianPasienDiPeriksaService; import com.jasamedika.medifirst2000.service.AntrianPasienRegistrasiService; -import com.jasamedika.medifirst2000.service.KelompokPasienService; import com.jasamedika.medifirst2000.service.PasienDaftarService; import com.jasamedika.medifirst2000.service.PasienService; import com.jasamedika.medifirst2000.service.RegistrasiPasienOnlineService; @@ -182,10 +177,10 @@ public class RegistrasiPasienOnlineServiceImpl extends BaseVoServiceImpl if (vo.getJenisPasien() == null) { if (vo.getState() == null || vo.getState().equals("UMUM")) model.setJenisPasien( - kelompokPasienDao.findOne(Integer.parseInt(GetSettingDataFixed("KdKelompokPasienUmum")))); + kelompokPasienDao.findOne(Integer.parseInt(getSettingDataFixed("KdKelompokPasienUmum")))); else if (vo.getState().equals("NONUMUM")) model.setJenisPasien( - kelompokPasienDao.findOne(Integer.parseInt(GetSettingDataFixed("KdKelompokPasienAsuransi")))); + kelompokPasienDao.findOne(Integer.parseInt(getSettingDataFixed("KdKelompokPasienAsuransi")))); } model = antrianPasienRegistrasiConverter.transferVOToModel(vo, model); @@ -274,7 +269,7 @@ public class RegistrasiPasienOnlineServiceImpl extends BaseVoServiceImpl // UUID noReservasi = UUID.randomUUID(); model.setNamaIbu(vo.getNamaIbu()); - if (vo.getPoliTujuan().getId() == (Integer.parseInt(GetSettingDataFixed("KdRuanganPendaftaran").toString()))) + if (vo.getPoliTujuan().getId() == (Integer.parseInt(getSettingDataFixed("KdRuanganPendaftaran").toString()))) model.setNoReservasi("-"); else model.setNoReservasi(noReservasi.toString().substring(1, 8)); @@ -939,7 +934,7 @@ public class RegistrasiPasienOnlineServiceImpl extends BaseVoServiceImpl @Override public Map saveRegistrasiPasienTouchScreen(AntrianPasienRegistrasiVO vo) { RuanganVO ruanganVo = new RuanganVO(); - ruanganVo.setId(Integer.parseInt(GetSettingDataFixed("KdRuanganPendaftaran").toString())); + ruanganVo.setId(Integer.parseInt(getSettingDataFixed("KdRuanganPendaftaran").toString())); vo.setPoliTujuan(ruanganVo); return saveRegistrasiPasienOnline(vo); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java index 725b3904..8eff0ebb 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java @@ -1330,7 +1330,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl strukKirim.setKeteranganlainnyakirim("Pengiriman dokumen rekammedis"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); kelompokTransaksi.setId( - Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiDokumenRekamMedis"))); + Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiDokumenRekamMedis"))); strukKirim.setKelompokTransaksi(kelompokTransaksi); if (CommonUtil.isNotNullOrEmpty(pegawai)) { @@ -1342,7 +1342,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl } if (CommonUtil.isNotNullOrEmpty(vo.getRuangan())) { ruanganAsal = ruanganConverter.transferVOToModel(vo.getRuangan(), new Ruangan()); - ruanganAsal.setId(Integer.parseInt(GetSettingDataFixed("KdRuanganRekamMedis"))); + ruanganAsal.setId(Integer.parseInt(getSettingDataFixed("KdRuanganRekamMedis"))); strukKirim.setKdruanganasal(ruanganAsal); strukKirim.setKdruangan(ruanganAsal); } @@ -1496,7 +1496,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl } // --------------------------------------------------------------------- } - Integer kelompokPasienId = Integer.parseInt(GetSettingDataFixed("KdKelompokPasienUmum").toString()); + Integer kelompokPasienId = Integer.parseInt(getSettingDataFixed("KdKelompokPasienUmum").toString()); if (CommonUtil.isNotNullOrEmpty(kelompokPasienId)) { KelompokPasien kelompokPasien = new KelompokPasien(); kelompokPasien.setId(kelompokPasienId); @@ -1512,7 +1512,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl if (CommonUtil.isNotNullOrEmpty(vo.getPasien())) { pasienDaftar.setPasien(pasienConverter.transferVOToModel(vo.getPasien(), new Pasien())); } - Pegawai pegawai = pegawaiDao.findOne(Integer.parseInt(GetSettingDataFixed("KdPegawaiPJLaboratorium"))); + Pegawai pegawai = pegawaiDao.findOne(Integer.parseInt(getSettingDataFixed("KdPegawaiPJLaboratorium"))); if (CommonUtil.isNotNullOrEmpty(pegawai)) { pasienDaftar.setDokterPenanggungJawab(pegawai); } @@ -1918,7 +1918,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl public Map savePasienTouchScreen(RegistrasiPelayananVO vo) { vo.setKasusPenyakit(kasusPenyakitConverter.transferModelToVO( - kasusPenyakitDao.findOne(Integer.parseInt(GetSettingDataFixed("KdKasusPenyakitUmum"))), + kasusPenyakitDao.findOne(Integer.parseInt(getSettingDataFixed("KdKasusPenyakitUmum"))), new KasusPenyakitVO())); // vo.setKelompokPasien(kelompokPasienConverter.transferModelToVO(KelompokPasienDao.findOne(Integer.parseInt(GetSettingDataFixed("KdKasusPenyakitUmum")), @@ -1932,7 +1932,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl vo.setIsOnSiteService((byte) 0); vo.setIsRegistrasiLengkap((byte) 0); vo.setAsalRujukan(asalRujukanConverter.transferModelToVO( - asalRujukanDao.findById(Integer.parseInt(GetSettingDataFixed("KdAsalRujukanDefault"))), + asalRujukanDao.findById(Integer.parseInt(getSettingDataFixed("KdAsalRujukanDefault"))), new AsalRujukanVO())); return savePasienDafar(vo); } @@ -2666,7 +2666,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl try { maps.put("pelayanan", JsonUtil.ToMaps(pelayananPasienDao.findByStrukOrderNoOrderAndKelompokTransaksiId(noOrder, - Integer.parseInt(GetSettingDataFixed("KelompokTransaksiBankDarah"))))); + Integer.parseInt(getSettingDataFixed("KelompokTransaksiBankDarah"))))); } catch (IllegalArgumentException | IllegalAccessException e) { e.printStackTrace(); } @@ -4015,7 +4015,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl @Override public List> getRuanganIGD() { - String idField = GetSettingDataFixed("KdDepartemenInstalasiGawatDarurat"); + String idField = getSettingDataFixed("KdDepartemenInstalasiGawatDarurat"); List> result = ruanganDao.getRuanganIGD(Integer.valueOf(idField)); return result; } 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 27b4cda7..65c4bb27 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 @@ -13,7 +13,10 @@ import com.jasamedika.medifirst2000.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.*; +import java.text.DateFormat; +import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -269,7 +272,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera Date dateLine; try { date = df.parse(bulan); - dateLine = df.parse(GetSettingDataFixed("berlakuTargetJasaRemunDokter")); + dateLine = df.parse(getSettingDataFixed("berlakuTargetJasaRemunDokter")); } catch (ParseException e) { return null; } @@ -284,7 +287,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera * Mendapatkan nominal target remunerasi untuk simulasi */ Double targetRemun = 0.0; - String sdTarget = GetSettingDataFixed("targetRemunJasaDokter"); + String sdTarget = getSettingDataFixed("targetRemunJasaDokter"); if (CommonUtil.isNotNullOrEmpty(sdTarget)) targetRemun = Double.parseDouble(sdTarget); /* @@ -296,23 +299,23 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Mendapatkan persentase jasa */ - double persenOperator = Double.parseDouble(GetSettingDataFixed("persenRemunOperatorIBS")); - double persenAsistenIBS = Double.parseDouble(GetSettingDataFixed("persenRemunAsistenIBS")); - double persenAnestesi = Double.parseDouble(GetSettingDataFixed("persenRemunAnestesiIBS")); - double persenRadiologi = Double.parseDouble(GetSettingDataFixed("persenRemunRadiologi")); - double persenLaboratorium = Double.parseDouble(GetSettingDataFixed("persenRemunLaboratorium")); - double persenRehabMedik = Double.parseDouble(GetSettingDataFixed("persenRemunRehabMedik")); - double persenKonsultasi = Double.parseDouble(GetSettingDataFixed("persenRemunKonsultasiDokter")); - double persenVisite = Double.parseDouble(GetSettingDataFixed("persenRemunVisiteDokter")); - double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenRemunTindakanDokter")); - double persenTarifJasaBedah = Double.parseDouble(GetSettingDataFixed("persenTarifJasaBedah")); - double persenTarifJasaICU = Double.parseDouble(GetSettingDataFixed("persenTarifJasaICU")); - double persenRemunDokterPA = Double.parseDouble(GetSettingDataFixed("persenRemunDokterPA")); - double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD")); - double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika")); - double persenRemunTerapis = Double.parseDouble(GetSettingDataFixed("persenRemunTerapis")); + double persenOperator = Double.parseDouble(getSettingDataFixed("persenRemunOperatorIBS")); + double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenRemunAsistenIBS")); + double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenRemunAnestesiIBS")); + double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenRemunRadiologi")); + double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenRemunLaboratorium")); + double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenRemunRehabMedik")); + double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenRemunKonsultasiDokter")); + double persenVisite = Double.parseDouble(getSettingDataFixed("persenRemunVisiteDokter")); + double persenTindakan = Double.parseDouble(getSettingDataFixed("persenRemunTindakanDokter")); + double persenTarifJasaBedah = Double.parseDouble(getSettingDataFixed("persenTarifJasaBedah")); + double persenTarifJasaICU = Double.parseDouble(getSettingDataFixed("persenTarifJasaICU")); + double persenRemunDokterPA = Double.parseDouble(getSettingDataFixed("persenRemunDokterPA")); + double persenRemunDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenRemunDokterUmumHD")); + double persenRemunLabGenetika = Double.parseDouble(getSettingDataFixed("persenRemunLabGenetika")); + double persenRemunTerapis = Double.parseDouble(getSettingDataFixed("persenRemunTerapis")); double persenRemunVisiteDokterKelompokBudiRahmat = Double - .parseDouble(GetSettingDataFixed("persenRemunVisiteDokterKelompokBudiRahmat")); + .parseDouble(getSettingDataFixed("persenRemunVisiteDokterKelompokBudiRahmat")); /* * Persiapan filter logic remunerasi */ @@ -327,26 +330,26 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera List drKkRadiologi = pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI); List laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog(); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); - List idsDokterUmumIGD = splitDataSettingDatafixed("pr_dokter_umum_igd"); - List idsDokterUmumExclude = splitDataSettingDatafixed("pr_dokter_umum_exclude"); - List idsDokterPerinatologi = splitDataSettingDatafixed("pr_dokter_perinatologi"); - List idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi"); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", tglAwal); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", tglAwal); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", tglAwal); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", tglAwal); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", tglAwal); + List idsDokterUmumIGD = getNilaiDataFixByTMT("pr_dokter_umum_igd", tglAwal); + List idsDokterUmumExclude = getNilaiDataFixByTMT("pr_dokter_umum_exclude", tglAwal); + List idsDokterPerinatologi = getNilaiDataFixByTMT("pr_dokter_perinatologi", tglAwal); + List idsPenunjangBukanAnestesi = getNilaiDataFixByTMT("pr_penunjang_nonanestesi", tglAwal); List idsDokterBPJSffs = splitDataSettingDatafixed("dokterBPJSffs"); - List idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd"); + List idsDokterPediatrikGD = getNilaiDataFixByTMT("pr_dokter_pediatrik_gd", tglAwal); List listIdPegawaiRemunKelompokBudiRahmat = splitDataSettingDatafixed( "listIdPegawaiRemunKelompokBudiRahmat"); - List idsMonitoringIntervensi = splitDataSettingDatafixed("idMonitoringIntervensi"); - List idsMonitoringHemodinamikGagalOrgan = splitDataSettingDatafixed( - "idMonitoringHemodinamikGagalOrgan"); - List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); - List idProdukKepalaPaketFixedPay = splitDataSettingDatafixed("idProdukKepalaPaketFixedPay"); - List paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay"); - List idsKarcis = splitDataSettingDatafixed("listKarcisIdProduk"); + List idsMonitoringIntervensi = getNilaiDataFixByTMT("idMonitoringIntervensi", tglAwal); + List idsMonitoringHemodinamikGagalOrgan = getNilaiDataFixByTMT("idMonitoringHemodinamikGagalOrgan", + tglAwal); + List idsLabGenetikaLuarRuangan = getNilaiDataFixByTMT("idProdukLabGenetikaLuarRuangan", tglAwal); + List idsKepalaPaketFixedPay = getNilaiDataFixByTMT("idProdukKepalaPaketFixedPay", tglAwal); + List paketBukanFixedPay = getNilaiDataFixByTMT("produkPaketBukanFixedPay", tglAwal); + List idsKarcis = getNilaiDataFixByTMT("listKarcisIdProduk", tglAwal); if (drKkPatologiAnatomiList.contains(idPegawai)) { listDetailJenisProduk = idsRegDJPPenunjangPA; } else if (pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_KLINIK).contains(idPegawai)) { @@ -369,10 +372,10 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera * Pemisahan produk kepala paket untuk fixed pay */ List> listKepalaPaketFixedPay = listRatedPay.stream() - .filter(d -> idProdukKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) + .filter(d -> idsKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) .collect(Collectors.toList()); listRatedPay = listRatedPay.stream() - .filter(d -> !idProdukKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) + .filter(d -> !idsKepalaPaketFixedPay.contains(Integer.parseInt(d.get("idProduk").toString()))) .collect(Collectors.toList()); List allPaketId = mapProdukPaketDao.findProdukEntriId(); List revisedPaketId = allPaketId.stream().filter(p -> !paketBukanFixedPay.contains(p)) @@ -497,7 +500,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d); d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) - && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) + && idsLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { /* * A rule for claimed <= Jul 31th 2023 @@ -1989,32 +1992,33 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Mendapatkan persentase jasa */ - double persenOperator = Double.parseDouble(GetSettingDataFixed("persenRemunOperatorIBS")); - double persenAsistenIBS = Double.parseDouble(GetSettingDataFixed("persenRemunAsistenIBS")); - double persenAnestesi = Double.parseDouble(GetSettingDataFixed("persenRemunAnestesiIBS")); - double persenRadiologi = Double.parseDouble(GetSettingDataFixed("persenRemunRadiologi")); - double persenLaboratorium = Double.parseDouble(GetSettingDataFixed("persenRemunLaboratorium")); - double persenRehabMedik = Double.parseDouble(GetSettingDataFixed("persenRemunRehabMedik")); - double persenKonsultasi = Double.parseDouble(GetSettingDataFixed("persenRemunKonsultasiDokter")); - double persenVisite = Double.parseDouble(GetSettingDataFixed("persenRemunVisiteDokter")); - double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenRemunTindakanDokter")); - double persenTarifJasaBedah = Double.parseDouble(GetSettingDataFixed("persenTarifJasaBedah")); - double persenTarifJasaICU = Double.parseDouble(GetSettingDataFixed("persenTarifJasaICU")); - double persenRemunDokterPA = Double.parseDouble(GetSettingDataFixed("persenRemunDokterPA")); - double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD")); - double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika")); - double persenRemunTerapis = Double.parseDouble(GetSettingDataFixed("persenRemunTerapis")); + double persenOperator = Double.parseDouble(getSettingDataFixed("persenRemunOperatorIBS")); + double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenRemunAsistenIBS")); + double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenRemunAnestesiIBS")); + double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenRemunRadiologi")); + double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenRemunLaboratorium")); + double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenRemunRehabMedik")); + double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenRemunKonsultasiDokter")); + double persenVisite = Double.parseDouble(getSettingDataFixed("persenRemunVisiteDokter")); + double persenTindakan = Double.parseDouble(getSettingDataFixed("persenRemunTindakanDokter")); + double persenTarifJasaBedah = Double.parseDouble(getSettingDataFixed("persenTarifJasaBedah")); + double persenTarifJasaICU = Double.parseDouble(getSettingDataFixed("persenTarifJasaICU")); + double persenRemunDokterPA = Double.parseDouble(getSettingDataFixed("persenRemunDokterPA")); + double persenRemunDokterUmumHD = Double.parseDouble(getSettingDataFixed("persenRemunDokterUmumHD")); + double persenRemunLabGenetika = Double.parseDouble(getSettingDataFixed("persenRemunLabGenetika")); + double persenRemunTerapis = Double.parseDouble(getSettingDataFixed("persenRemunTerapis")); double persenRemunVisiteDokterKelompokBudiRahmat = Double - .parseDouble(GetSettingDataFixed("persenRemunVisiteDokterKelompokBudiRahmat")); + .parseDouble(getSettingDataFixed("persenRemunVisiteDokterKelompokBudiRahmat")); /* * Persiapan filter logic remunerasi */ + Date tglAwal = DateUtil.startMonth(bulan); List drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM); List drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); - List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); + List idsLabGenetikaLuarRuangan = getNilaiDataFixByTMT("idProdukLabGenetikaLuarRuangan", tglAwal); List listIdPegawaiRemunKelompokBudiRahmat = splitDataSettingDatafixed( "listIdPegawaiRemunKelompokBudiRahmat"); /* @@ -2149,7 +2153,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera d.put("keterangan", hargaJasa.getKeterangan()); d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) - && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) + && idsLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d); d.put("persenJasa", persenRemunLabGenetika + "%"); @@ -2366,32 +2370,33 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Mendapatkan persentase jasa */ - double persenBPJS = Double.parseDouble(GetSettingDataFixed("persenJasaBPJS")); - double persenOperator = Double.parseDouble(GetSettingDataFixed("persenJasaOperatorIBS")); - double persenAsistenIBS = Double.parseDouble(GetSettingDataFixed("persenJasaAsistenIBS")); - double persenAnestesi = Double.parseDouble(GetSettingDataFixed("persenJasaAnestesiIBS")); - double persenRadiologi = Double.parseDouble(GetSettingDataFixed("persenJasaRadiologi")); - double persenLaboratorium = Double.parseDouble(GetSettingDataFixed("persenJasaLaboratorium")); - double persenRehabMedik = Double.parseDouble(GetSettingDataFixed("persenJasaRehabMedik")); - double persenKonsultasi = Double.parseDouble(GetSettingDataFixed("persenJasaKonsultasiDokter")); - double persenVisite = Double.parseDouble(GetSettingDataFixed("persenJasaVisiteDokter")); - double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenJasaTindakanDokter")); - 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 persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24")); + double persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS")); + double persenOperator = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS")); + double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS")); + double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS")); + double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi")); + double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium")); + double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik")); + double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter")); + double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter")); + double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter")); + 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 persenJasaTerapis24 = Double.parseDouble(getSettingDataFixed("persenFfsTerapisTmt21Okt24")); // Custom rule persentase jasa terapis 21 Oktober 2024 LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0); /* * Persiapan filter logic remunerasi */ + Date tglAwal = DateUtil.startMonth(bulan); List drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM); List drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); - List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); + List idsLabGenetikaLuarRuangan = getNilaiDataFixByTMT("idProdukLabGenetikaLuarRuangan", tglAwal); /* * Mapping persentase jasa remunerasi */ @@ -2508,7 +2513,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera d.put("keterangan", hargaJasa.getKeterangan()); d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) - && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) + && idsLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d); d.put("persenJasa", persenJasaLabGenetika + "%"); @@ -2724,33 +2729,34 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Mendapatkan persentase jasa */ - double persenBPJS = Double.parseDouble(GetSettingDataFixed("persenJasaBPJS")); - double persenOperator = Double.parseDouble(GetSettingDataFixed("persenJasaOperatorIBS")); - double persenAsistenIBS = Double.parseDouble(GetSettingDataFixed("persenJasaAsistenIBS")); - double persenAnestesi = Double.parseDouble(GetSettingDataFixed("persenJasaAnestesiIBS")); - double persenRadiologi = Double.parseDouble(GetSettingDataFixed("persenJasaRadiologi")); - double persenLaboratorium = Double.parseDouble(GetSettingDataFixed("persenJasaLaboratorium")); - double persenRehabMedik = Double.parseDouble(GetSettingDataFixed("persenJasaRehabMedik")); - double persenKonsultasi = Double.parseDouble(GetSettingDataFixed("persenJasaKonsultasiDokter")); - double persenVisite = Double.parseDouble(GetSettingDataFixed("persenJasaVisiteDokter")); - double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenJasaTindakanDokter")); - 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 persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24")); - double persenJasaLuarTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaLuarTerapis")); + double persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS")); + double persenOperator = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS")); + double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS")); + double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS")); + double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi")); + double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium")); + double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik")); + double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter")); + double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter")); + double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter")); + 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 persenJasaTerapis24 = Double.parseDouble(getSettingDataFixed("persenFfsTerapisTmt21Okt24")); + double persenJasaLuarTerapis = Double.parseDouble(getSettingDataFixed("persenJasaLuarTerapis")); // Custom rule persentase jasa terapis 21 Oktober 2024 LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0); /* * Persiapan filter logic remunerasi */ + Date tglAwal = DateUtil.startMonth(bulan); List drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM); List drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); - List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); + List idsLabGenetikaLuarRuangan = getNilaiDataFixByTMT("idProdukLabGenetikaLuarRuangan", tglAwal); /* * Mapping persentase jasa remunerasi */ @@ -2873,7 +2879,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera d.put("keterangan", hargaJasa.getKeterangan()); d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) - && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) + && idsLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d); d.put("persenJasa", persenJasaLabGenetika + "%"); @@ -2984,32 +2990,33 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera /* * Mendapatkan persentase jasa */ - double persenBPJS = Double.parseDouble(GetSettingDataFixed("persenJasaBPJS")); - double persenOperatorIBS = Double.parseDouble(GetSettingDataFixed("persenJasaOperatorIBS")); - double persenAsistenIBS = Double.parseDouble(GetSettingDataFixed("persenJasaAsistenIBS")); - double persenAnestesi = Double.parseDouble(GetSettingDataFixed("persenJasaAnestesiIBS")); - double persenRadiologi = Double.parseDouble(GetSettingDataFixed("persenJasaRadiologi")); - double persenLaboratorium = Double.parseDouble(GetSettingDataFixed("persenJasaLaboratorium")); - double persenRehabMedik = Double.parseDouble(GetSettingDataFixed("persenJasaRehabMedik")); - double persenKonsultasi = Double.parseDouble(GetSettingDataFixed("persenJasaKonsultasiDokter")); - double persenVisite = Double.parseDouble(GetSettingDataFixed("persenJasaVisiteDokter")); - double persenTindakan = Double.parseDouble(GetSettingDataFixed("persenJasaTindakanDokter")); - 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 persenJasaTerapis24 = Double.parseDouble(GetSettingDataFixed("persenFfsTerapisTmt21Okt24")); + double persenBPJS = Double.parseDouble(getSettingDataFixed("persenJasaBPJS")); + double persenOperatorIBS = Double.parseDouble(getSettingDataFixed("persenJasaOperatorIBS")); + double persenAsistenIBS = Double.parseDouble(getSettingDataFixed("persenJasaAsistenIBS")); + double persenAnestesi = Double.parseDouble(getSettingDataFixed("persenJasaAnestesiIBS")); + double persenRadiologi = Double.parseDouble(getSettingDataFixed("persenJasaRadiologi")); + double persenLaboratorium = Double.parseDouble(getSettingDataFixed("persenJasaLaboratorium")); + double persenRehabMedik = Double.parseDouble(getSettingDataFixed("persenJasaRehabMedik")); + double persenKonsultasi = Double.parseDouble(getSettingDataFixed("persenJasaKonsultasiDokter")); + double persenVisite = Double.parseDouble(getSettingDataFixed("persenJasaVisiteDokter")); + double persenTindakan = Double.parseDouble(getSettingDataFixed("persenJasaTindakanDokter")); + 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 persenJasaTerapis24 = Double.parseDouble(getSettingDataFixed("persenFfsTerapisTmt21Okt24")); // Custom rule persentase jasa terapis 21 Oktober 2024 LocalDateTime tmtJasaTerapis24 = LocalDateTime.of(2024, 11, 1, 0, 0, 0, 0); /* * Persiapan filter logic remunerasi */ + Date tglAwal = DateUtil.startMonth(bulan); List drKkPatologiAnatomiList = pegawaiDao.getDokterByKelompokKerja(KK_PATOLOGI_ANATOMI); List drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM); List drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA); List drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI); List terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI)); - List idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan"); + List idsLabGenetikaLuarRuangan = getNilaiDataFixByTMT("idProdukLabGenetikaLuarRuangan", tglAwal); if (terapisRehabMedik.contains(idPegawai)) return new ArrayList<>(); /* @@ -3129,7 +3136,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera d.put("keterangan", hargaJasa.getKeterangan()); d.put("hargaJasa", hargaJasa.getNilai()); } else if (drKkGenetika.contains(idPegawai) - && idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) + && idsLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString())) && (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) { RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d); d.put("persenJasa", persenJasaLabGenetika + "%"); @@ -3232,7 +3239,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera @Override public List> detailLogbookTarifDokter(Integer idPegawai, List norecs) { - List paketBukanFixedPay = splitDataSettingDatafixed("produkPaketBukanFixedPay"); + List paketBukanFixedPay = getNilaiDataFixByTMT("produkPaketBukanFixedPay", new Date()); List> result = pelayananPasienDao.findPelayananPasienByPetugasAndPelayananPasien(idPegawai, norecs); List listIdPelayananPaketBukanFixedPay = result.stream() diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportPengadaanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportPengadaanServiceImpl.java index a1f2fc8d..e525599d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportPengadaanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportPengadaanServiceImpl.java @@ -1,7 +1,8 @@ package com.jasamedika.medifirst2000.service.impl; import java.util.HashMap; -import java.util.Map;import org.hibernate.annotations.GenerationTime; +import java.util.Map; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,51 +50,51 @@ public class ReportPengadaanServiceImpl extends BaseAngaranServiceImpl implemen String namaPengendali=(String) header.get("namaPengendali"); if(namaPengendali.equalsIgnoreCase("Bagian Sumber Daya Manusia")){ - result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("KdDirekturSumberDayaManusia")))); + result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("KdDirekturSumberDayaManusia")))); result.put("jenisDirektur", "Direktur SDM"); result.put("jenisPengendali", "Koordinator Perencanaan SDM"); - result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("kdBagianSumberDayaManusia")))); + result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("kdBagianSumberDayaManusia")))); }else if(namaPengendali.equalsIgnoreCase("Bagian Umum")){ - result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("KdDirekturUmumDanOperasional")))); + result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("KdDirekturUmumDanOperasional")))); result.put("jenisDirektur", "Direktur Umum"); result.put("jenisPengendali", "Koordinator Perencanaan Umum"); - result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("kdBagianUmum")))); + result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("kdBagianUmum")))); }else if(namaPengendali.equalsIgnoreCase("Inst . Prasarana dan sarana Rumah Sakit")){ - result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("KdDirekturUmumDanOperasional")))); + result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("KdDirekturUmumDanOperasional")))); result.put("jenisDirektur", "Direktur Umum"); result.put("jenisPengendali", "Koordinator Perencanaan Prasarana dan sarana Rumah Sakit"); - result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("kdBagianPrasaranaDanSaranaRumahSakit")))); + result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("kdBagianPrasaranaDanSaranaRumahSakit")))); }else if(namaPengendali.equalsIgnoreCase("Instalasi Teknologi Informasi")){ - result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("KdDirekturUmumDanOperasional")))); + result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("KdDirekturUmumDanOperasional")))); result.put("jenisDirektur", "Direktur Umum"); result.put("jenisPengendali", "Koordinator Perencanaan Teknologi Informasi"); - result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("kdBagianInstalasiTeknologiInformasi")))); + result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("kdBagianInstalasiTeknologiInformasi")))); }else if(namaPengendali.equalsIgnoreCase("Instalasi Gizi")){ - result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("KdDirekturUmumDanOperasional")))); + result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("KdDirekturUmumDanOperasional")))); result.put("jenisDirektur", "Direktur Umum"); result.put("jenisPengendali", "Koordinator Perencanaan Gizi"); - result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("kdBagianInstalasiGizi")))); + result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("kdBagianInstalasiGizi")))); }else if(namaPengendali.equalsIgnoreCase("Bagian Medik")){ - result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("KdDirekturMedikDanPerawatan")))); + result.put("direkturTerkait", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("KdDirekturMedikDanPerawatan")))); result.put("jenisDirektur", "Direktur Medik"); result.put("jenisPengendali", "Koordinator Perencanaan Medik"); - result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("kdBagianMedik")))); + result.put("pengendali", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("kdBagianMedik")))); } } result.put("kartuPengendaliDetail",kartuPengendaliDaoCustom.getKartuPengendaliDetailByParentReport(noRec)); result.put("kartuPengendaliHeader",kartuPengendaliDaoCustom.getKartuPengendaliHeaderByNoRecReport(noRec)); - result.put("direkturKeuangan", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("KdDirekturKeuangan")))); - result.put("ppk", pegawaiDao.dataPegawaiByNoRec(new Integer(GetSettingDataFixed("kdBagianPpk")))); + result.put("direkturKeuangan", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("KdDirekturKeuangan")))); + result.put("ppk", pegawaiDao.dataPegawaiByNoRec(new Integer(getSettingDataFixed("kdBagianPpk")))); return result; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java index c9cb8fb2..30d2d9e8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java @@ -3119,7 +3119,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic Map result = pencatatanSuhuMesinDao.getReportPencatatanSuhuMesin(idMesin, idMappingMesin, tglCatSuhuMesin); Map supervisor = pegawaiDao.findPegawaiById(idSupervisor); - String ttdCatatSuhuMesin = GetSettingDataFixed("ttdCatatSuhuMesin"); + String ttdCatatSuhuMesin = getSettingDataFixed("ttdCatatSuhuMesin"); Map pegMonitorSterilisasi = pegawaiDao.getKepalaPegawai(Integer.valueOf(ttdCatatSuhuMesin)); result.put("idSupervisor", supervisor.get("idPegawai")); result.put("namaSupervisor", supervisor.get("nama")); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReturRuanganServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReturRuanganServiceImpl.java index 36d36e3b..0035d15f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReturRuanganServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReturRuanganServiceImpl.java @@ -21,7 +21,6 @@ import com.jasamedika.medifirst2000.dao.StrukKonfirmasiDao; import com.jasamedika.medifirst2000.dao.StrukReturDao; import com.jasamedika.medifirst2000.dao.custom.StrukPelayananDetailDaoCustom; import com.jasamedika.medifirst2000.entities.KelompokTransaksi; -import com.jasamedika.medifirst2000.entities.KirimBarang; import com.jasamedika.medifirst2000.entities.KirimProduk; import com.jasamedika.medifirst2000.entities.Produk; import com.jasamedika.medifirst2000.entities.Ruangan; @@ -39,7 +38,6 @@ import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.HibernateInitialize; import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.KartuPengendaliCustomVO; import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganDetailVO; import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganVO; import com.jasamedika.medifirst2000.vo.ReturRuanganDetailVO; @@ -102,7 +100,7 @@ public class ReturRuanganServiceImpl extends BaseAngaranServiceImpl implements R @Override public Map listPenerimaanBarang(Integer page, Integer limit, String sort, String dir,String tanggalAwal, String tanggalAhir, String noTerima, Integer produkId) { - Integer kelompokTransaksiReturId=Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKonfirmasiRetur")); + Integer kelompokTransaksiReturId=Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKonfirmasiRetur")); Ruangan ruanganAsal=getRuanganByUserLogin(); int totalRow = strukPelayananDetailDaoCustom.listPenerimaanCount(tanggalAwal,tanggalAhir,noTerima,produkId,ruanganAsal.getId(),kelompokTransaksiReturId); int totalPages = 0; @@ -147,7 +145,7 @@ public class ReturRuanganServiceImpl extends BaseAngaranServiceImpl implements R strukRetur.setRuangan(getRuanganByUserLogin()); String noUrut=strukOrderService.formatNoUrut("Struk Retur", "RRU"); strukRetur.setNoRetur(noUrut); - KelompokTransaksi kelompokTransaksi=kelompokTransaksiDao.findById(Integer.parseInt(GetSettingDataFixed("KdKelompokReturRuangan"))); + KelompokTransaksi kelompokTransaksi=kelompokTransaksiDao.findById(Integer.parseInt(getSettingDataFixed("KdKelompokReturRuangan"))); strukRetur.setKelompokTransaksi(kelompokTransaksi); strukRetur.setKeteranganAlasan(vo.getKeterangan()); List data=new ArrayList(); @@ -318,7 +316,7 @@ public class ReturRuanganServiceImpl extends BaseAngaranServiceImpl implements R @Transactional(readOnly=false) public Map saveVerifikasiPengiriman(RequestBarangDariRuanganVO vo) { KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKonfirmasiRetur"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKonfirmasiRetur"))); StrukKonfirmasi strukKonfirmasi = new StrukKonfirmasi(); strukKonfirmasi.setTglKonfirmasi(new Date()); strukKonfirmasi.setRuangan(getRuanganByUserLogin()); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java index d02d98d4..609643ba 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java @@ -1,54 +1,29 @@ package com.jasamedika.medifirst2000.service.impl; -import java.text.DateFormat; -import java.text.NumberFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.stereotype.Service; - import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.HargaNettoProdukByKelasDao; -import com.jasamedika.medifirst2000.dao.LoggingUserDao; -import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaDao; -import com.jasamedika.medifirst2000.dao.MapProdukKelompokKerjaDao; -import com.jasamedika.medifirst2000.dao.MapRuanganToProdukDao; -import com.jasamedika.medifirst2000.dao.PelayananPasienPetugasDao; -import com.jasamedika.medifirst2000.dao.ProdukDao; -import com.jasamedika.medifirst2000.dao.SettingDataFixedDao; -import com.jasamedika.medifirst2000.dao.SkoringTindakanMedisDao; -import com.jasamedika.medifirst2000.dao.SubUnitKerjaDao; -import com.jasamedika.medifirst2000.entities.LoggingUser; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.SkoringTindakanMedis; -import com.jasamedika.medifirst2000.entities.SubUnitKerjaPegawai; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.entities.*; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.SkoringTindakanMedisService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.vo.ProdukVO; import com.jasamedika.medifirst2000.vo.SkoringTindakanMedisVO; import com.jasamedika.medifirst2000.vo.SubUnitKerjaPegawaiVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.orm.jpa.JpaSystemException; +import org.springframework.stereotype.Service; + +import java.text.DateFormat; +import java.text.NumberFormat; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.concurrent.*; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; @Service("skoringTindakanMedisService") public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implements SkoringTindakanMedisService { @@ -590,11 +565,12 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement public List> findTindakanLogbookSkor(String namaProduk) { List> result = new ArrayList<>(); - List idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk"); - List idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama"); - List idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa"); - List idsRegDJPPenunjangPK = splitDataSettingDatafixed("penunjang_pk"); - List idsRegDJPPenunjangRad = splitDataSettingDatafixed("penunjang_radiologi"); + Date date = new Date(); + List idsRegDJPAdminNonPK = getNilaiDataFixByTMT("admin_nonpk", date); + List idsRegDJPMedisUtama = getNilaiDataFixByTMT("medis_utama", date); + List idsRegDJPPenunjangPA = getNilaiDataFixByTMT("penunjang_pa", date); + List idsRegDJPPenunjangPK = getNilaiDataFixByTMT("penunjang_pk", date); + List idsRegDJPPenunjangRad = getNilaiDataFixByTMT("penunjang_radiologi", date); List idsRegDJPPenunjangLab = splitDataSettingDatafixed("penunjang_laboratorium"); List tempList = new ArrayList<>(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SppbServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SppbServiceImpl.java index d24facbd..c5aa4111 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SppbServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SppbServiceImpl.java @@ -7,8 +7,6 @@ import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -106,7 +104,7 @@ public class SppbServiceImpl extends BaseAngaranServiceImpl implements SppbServi Map result = new HashMap(); List> listData = new ArrayList>(); for (Map data : kartupengendaliDaoCustom.preAddSppbGrid(dateStart, dateEnd, supplierId)) { - Integer kdKelompokTransaksi=new Integer(GetSettingDataFixed("kdKelompokTransaksiSppb")); + Integer kdKelompokTransaksi=new Integer(getSettingDataFixed("kdKelompokTransaksiSppb")); if(! kartupengendaliDaoCustom.CheckSppbTerhadapKontrak((String) data.get("noRec"),kdKelompokTransaksi)){ if (kelompokUser.getKelompokUser().equalsIgnoreCase("logistik")) { data.put("jenisPenerimaan", "logistik"); @@ -148,7 +146,7 @@ public class SppbServiceImpl extends BaseAngaranServiceImpl implements SppbServi strukPelayanan.setTglstruk(new Date()); strukPelayanan.setVerifikasi(VerifikasiEnum.NEW_SPPB.getVal()); strukPelayanan.setNostruk("Sppb"+getRunningNumber("Sppb")); - strukPelayanan.setKdkelompoktransaksi(kelompokTransaksiDao.findById(Integer.parseInt((String) this.GetSettingDataFixed("kdKelompokTransaksiSppb")))); + strukPelayanan.setKdkelompoktransaksi(kelompokTransaksiDao.findById(Integer.parseInt((String) this.getSettingDataFixed("kdKelompokTransaksiSppb")))); if(CommonUtil.isNotNullOrEmpty(vo.getSupplier())){ strukPelayanan.setKdrekanan(rekananConverter.transferVOToModel(vo.getSupplier(), new Rekanan())); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StokOpNameServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StokOpNameServiceImpl.java index 35aff992..1e2d95c8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StokOpNameServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StokOpNameServiceImpl.java @@ -96,7 +96,7 @@ public class StokOpNameServiceImpl extends BaseAngaranServiceImpl implements Sto dataId.add(model.getId()); StrukClosing strukClosing=new StrukClosing(); - Integer a=new Integer(GetSettingDataFixed("KdKelompokTransaksiStokOpName")); + Integer a=new Integer(getSettingDataFixed("KdKelompokTransaksiStokOpName")); KelompokTransaksi kelompokTransaksi=kelompokTransaksiDao.findById(a); strukClosing.setKelompokTransaksi(kelompokTransaksi); strukClosing.setRuangan(model.getRuangan()); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StokProdukGlobalServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StokProdukGlobalServiceImpl.java index b29c2a95..0683170b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StokProdukGlobalServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StokProdukGlobalServiceImpl.java @@ -584,7 +584,7 @@ public class StokProdukGlobalServiceImpl extends BaseAngaranServiceImpl impleme public Map getStokByRuangan() { Ruangan r = new Ruangan(); - r.setId(Integer.parseInt(GetSettingDataFixed("kdRuanganCssd"))); + r.setId(Integer.parseInt(getSettingDataFixed("kdRuanganCssd"))); Map data=new HashMap(); int detailJenisProduk=1319; List>dataList=new ArrayList>(); @@ -607,7 +607,7 @@ public class StokProdukGlobalServiceImpl extends BaseAngaranServiceImpl impleme private Double getStokByProduk(Integer produkId){ Double stok=0.0; - Integer ruanganId=Integer.parseInt(GetSettingDataFixed("kdRuanganCssd")); + Integer ruanganId=Integer.parseInt(getSettingDataFixed("kdRuanganCssd")); List listStok=stokProdukGlobalDao.findStok(produkId, ruanganId); if(CommonUtil.isNotNullOrEmpty(listStok)){ stok=listStok.get(0).getQtyProduk(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukHistoriServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukHistoriServiceImpl.java index fa317318..3aceaab1 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukHistoriServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukHistoriServiceImpl.java @@ -360,8 +360,8 @@ public class StrukHistoriServiceImpl extends BaseVoServiceImpl implements StrukH try { System.out.println("=======START SAVE STRUK VERIFIKASI======="); - String[] a = GetSettingDataFixed("RuanganVerifikasiPembayaranGajiPegawai").split(","); - String b = GetSettingDataFixed("KdRuanganAkuntansi"); + String[] a = getSettingDataFixed("RuanganVerifikasiPembayaranGajiPegawai").split(","); + String b = getSettingDataFixed("KdRuanganAkuntansi"); List> map = strukPelayananDao.getRuanganVerifikasiPembayaranHutang(); String[] ruanganSplit = map.get(0).get("nilaiField").toString().split(","); @@ -375,11 +375,11 @@ public class StrukHistoriServiceImpl extends BaseVoServiceImpl implements StrukH StrukVerifikasi strukVerif = new StrukVerifikasi(); strukVerif.setNoUrutRuangan((i + 1) + ""); strukVerif.setKelompokTransaksi(kelompokTransaksiDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdKelompokTransaksiGajiPegawaiNonPns")))); + Integer.parseInt((String) this.getSettingDataFixed("KdKelompokTransaksiGajiPegawaiNonPns")))); strukVerif.setTglverifikasi(DateUtil.getShortDate()); strukVerifikasi.setTglverifikasi(DateUtil.getShortDate()); strukVerifikasi.setKelompokTransaksi(kelompokTransaksiDao.findById( - Integer.parseInt((String) this.GetSettingDataFixed("KdKelompokTransaksiGajiPegawaiNonPns")))); + Integer.parseInt((String) this.getSettingDataFixed("KdKelompokTransaksiGajiPegawaiNonPns")))); final List temp = new ArrayList(); Collections.addAll(temp, ruanganSplit); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukOrderServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukOrderServiceImpl.java index 0b4692f7..23063d00 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukOrderServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukOrderServiceImpl.java @@ -178,7 +178,7 @@ public class StrukOrderServiceImpl extends BaseAngaranServiceImpl implements Str strukOrder.setIsDelivered((byte) 1); strukOrder.setKeteranganOrder("Permintaan Barang Dari Ruangan"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiOrderBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiOrderBarang"))); strukOrder.setKelompokTransaksi(kelompokTransaksi); if(CommonUtil.isNotNullOrEmpty(vo.getJenisPermintaanVO())){ strukOrder.setJenisPermintaan(jenisPermintaanConverter.transferVOToModel(vo.getJenisPermintaanVO(), new JenisPermintaan())); @@ -511,7 +511,7 @@ public class StrukOrderServiceImpl extends BaseAngaranServiceImpl implements Str strukKirim.setKeteranganlainnyakirim("Pengiriman Barang Ke Ruangan"); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKirimBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKirimBarang"))); strukKirim.setKelompokTransaksi(kelompokTransaksi); if(CommonUtil.isNotNullOrEmpty(vo.getJenisPermintaanVO())){ strukKirim.setJenisPermintaan(jenisPermintaanConverter.transferVOToModel(vo.getJenisPermintaanVO(), new JenisPermintaan())); @@ -709,7 +709,7 @@ public class StrukOrderServiceImpl extends BaseAngaranServiceImpl implements Str @Transactional(readOnly=false) public Map saveVerifikasiPengiriman(RequestBarangDariRuanganVO vo) { KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKonfirmasiBarang"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKonfirmasiBarang"))); StrukKonfirmasi strukKonfirmasi = new StrukKonfirmasi(); strukKonfirmasi.setTglKonfirmasi(new Date()); strukKonfirmasi.setRuangan(getRuanganByUserLogin()); @@ -876,7 +876,7 @@ public class StrukOrderServiceImpl extends BaseAngaranServiceImpl implements Str @Override public Map getInformasiPenerimaanBarang(Integer page, Integer limit, String sort, String dir,String dateStart, String dateEnd, String noOrder) { - Integer kelompokTransaksiBarangId=Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiKonfirmasiBarang")); + Integer kelompokTransaksiBarangId=Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiKonfirmasiBarang")); KelompokUser kelompokUser=getKelompokUserLogin(); Ruangan ruangan=getRuanganByUserLogin(); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukPelayananDetailServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukPelayananDetailServiceImpl.java index 5ad630b8..0a5feabd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukPelayananDetailServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukPelayananDetailServiceImpl.java @@ -97,7 +97,7 @@ public class StrukPelayananDetailServiceImpl extends BaseAngaranServiceImpl impl @Override public Map gridPenerimaanBarang(Integer page, Integer limit, String sort, String dir,String tanggalTerimAwal, String tanggalTerimAhir, String nofaktur, Integer idProduk,Integer supplierId) { - Integer kdKelompokTransaksi=Integer.parseInt((String) this.GetSettingDataFixed("KdPenerimaanBarangLogistik")); + Integer kdKelompokTransaksi=Integer.parseInt((String) this.getSettingDataFixed("KdPenerimaanBarangLogistik")); KelompokUser kelompokUser=getKelompokUserLogin(); int totalRow = strukPelayananDetailDaoCustom.gridPenerimaanBarangCount(tanggalTerimAwal,tanggalTerimAhir,nofaktur,idProduk,kdKelompokTransaksi,kelompokUser,supplierId); @@ -148,7 +148,7 @@ public class StrukPelayananDetailServiceImpl extends BaseAngaranServiceImpl impl @Transactional(readOnly=false) public Map listPenerimaanBarang(Integer page, Integer limit, String sort, String dir,String tanggalAwal, String tanggalAhir, Integer produkId, Integer jenisProdukId, Integer kelompokProdukId, String noTerima) { Integer ruanganId=getRuanganByUserLogin().getId(); - Integer kelompokTransaksiId=kelompokTransaksiDao.findById(Integer.parseInt((String) this.GetSettingDataFixed("KdPenerimaanBarangLogistik"))).getId(); + Integer kelompokTransaksiId=kelompokTransaksiDao.findById(Integer.parseInt((String) this.getSettingDataFixed("KdPenerimaanBarangLogistik"))).getId(); int totalRow = strukPelayananDetailDaoCustom.gridPenerimaanCountSupplier(tanggalAwal, tanggalAhir, produkId, ruanganId, kelompokTransaksiId,jenisProdukId,kelompokProdukId,noTerima); int totalPages = 0; int pageRequested = page; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukPelayananServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukPelayananServiceImpl.java index d1728ef4..fb94c666 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukPelayananServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StrukPelayananServiceImpl.java @@ -328,7 +328,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl strukPelayananDetail.setObjectProdukId(vo.getKdproduk().getId()); AsalProduk kdasalproduk = new AsalProduk(); - kdasalproduk.setId(Integer.parseInt(GetSettingDataFixed("KdAsalProdukPMI"))); + kdasalproduk.setId(Integer.parseInt(getSettingDataFixed("KdAsalProdukPMI"))); strukPelayananDetail.setKdasalproduk(kdasalproduk); strukPelayananDNoBatch.setKdasalproduk(kdasalproduk); @@ -370,7 +370,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl strukPelayananConverter.setUseGson(true); strukPelayananDetail = strukPelayananConverter.transferVOToModel(vo, new StrukPelayanan()); strukPelayananDetail.setKdkelompoktransaksi( - kelompokTransaksiDao.findById(Integer.parseInt((String) this.GetSettingDataFixed("KdLimbahInStruk")))); + kelompokTransaksiDao.findById(Integer.parseInt((String) this.getSettingDataFixed("KdLimbahInStruk")))); if (CommonUtil.isNotNullOrEmpty(vo.getJenisLimbahB3Masuk())) { strukPelayananDetail.setJenisLimbahB3Masuk(jenisLimbahB3MasukConverter .transferVOToModel(vo.getJenisLimbahB3Masuk(), new JenisLimbahB3Masuk())); @@ -396,7 +396,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl strukPelayananDetail = strukPelayananConverter.transferVOToModel(vo, new StrukPelayanan()); strukPelayananDetail.setKdkelompoktransaksi( - kelompokTransaksiDao.findById(Integer.parseInt((String) this.GetSettingDataFixed("KdLimbahInStruk")))); + kelompokTransaksiDao.findById(Integer.parseInt((String) this.getSettingDataFixed("KdLimbahInStruk")))); if (CommonUtil.isNotNullOrEmpty(vo.getJenisLimbahB3Masuk())) { strukPelayananDetail.setJenisLimbahB3Masuk(jenisLimbahB3MasukConverter .transferVOToModel(vo.getJenisLimbahB3Masuk(), new JenisLimbahB3Masuk())); @@ -477,7 +477,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl strukPelayananDetail.setKdruanganasal(kdasalruangan); AsalProduk kdasalproduk = new AsalProduk(); - kdasalproduk.setId(Integer.parseInt(GetSettingDataFixed("KdAsalProdukPMI"))); + kdasalproduk.setId(Integer.parseInt(getSettingDataFixed("KdAsalProdukPMI"))); strukPelayananDetail.setKdasalproduk(kdasalproduk); StrukPelayanan strukPelayananLocal = new StrukPelayanan(); @@ -582,7 +582,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl strukPelayanan.setTanggalKontrak(vo.getTanggalKontrak()); strukPelayanan.setKeteranganlainnya("Penerimaan dari supplier"); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksiDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdPenerimaanBarangLogistik")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdPenerimaanBarangLogistik")))); if (CommonUtil.isNotNullOrEmpty(vo.getSupplier())) { strukPelayanan.setKdrekanan(rekananConverter.transferVOToModel(vo.getSupplier(), new Rekanan())); } @@ -782,8 +782,8 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl try { System.out.println("=======START SAVE STRUK VERIFIKASI PENERIMAAN SUPPLIER======="); - String[] a = GetSettingDataFixed("RuanganVerifikasiPembayaranHutang").split(","); - String b = GetSettingDataFixed("KdRuanganAkuntansi"); + String[] a = getSettingDataFixed("RuanganVerifikasiPembayaranHutang").split(","); + String b = getSettingDataFixed("KdRuanganAkuntansi"); List> map = strukPelayananDao.getRuanganVerifikasiPembayaranHutang(); String[] ruanganSplit = map.get(0).get("nilaiField").toString().split(","); @@ -797,11 +797,11 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl StrukVerifikasi strukVerif = new StrukVerifikasi(); strukVerif.setNoUrutRuangan((i + 1) + ""); strukVerif.setKelompokTransaksi(kelompokTransaksiDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdPenerimaanBarangLogistik")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdPenerimaanBarangLogistik")))); strukVerif.setTglverifikasi(DateUtil.getShortDate()); strukVerifikasi.setTglverifikasi(DateUtil.getShortDate()); strukVerifikasi.setKelompokTransaksi(kelompokTransaksiDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdPenerimaanBarangLogistik")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdPenerimaanBarangLogistik")))); final List temp = new ArrayList(); Collections.addAll(temp, ruanganSplit); @@ -922,7 +922,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl if (CommonUtil.isNotNullOrEmpty(detail.getKdproduk()) && CommonUtil.isNotNullOrEmpty(detail.getKdasalproduk())) { List listStokProdukGlobal = stokProdukGlobalDao - .findStokWitAsalProduk(detail.getKdproduk().getId(), new Integer(GetSettingDataFixed( + .findStokWitAsalProduk(detail.getKdproduk().getId(), new Integer(getSettingDataFixed( "kdRuanganLogistik"))/* * ,detail.getKdasalproduk() * . getId() @@ -951,7 +951,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl stokProdukGlobal.setHargaNetto2(hargaNetto2); stokProdukGlobal.setPersenDiscount(detail.getPersendiscount()); stokProdukGlobal.setProduk(detail.getKdproduk()); - stokProdukGlobal.setRuangan(ruanganDao.findById(new Integer(GetSettingDataFixed("kdRuanganLogistik")))); + stokProdukGlobal.setRuangan(ruanganDao.findById(new Integer(getSettingDataFixed("kdRuanganLogistik")))); stokProdukGlobal.setNamaExternal(detail.getKdproduk().getNamaProduk()); stokProdukGlobal.setKodeExternal("0"); stokProdukGlobal.setReportDisplay(detail.getKdproduk().getNamaProduk()); @@ -1012,7 +1012,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl stokProdukDetail.setHargaNetto2(hargaNetto2); stokProdukDetail.setPersenDiscount(detail.getPersendiscount()); stokProdukDetail.setProduk(detail.getKdproduk()); - stokProdukDetail.setRuangan(ruanganDao.findById(new Integer(GetSettingDataFixed("kdRuanganLogistik")))); + stokProdukDetail.setRuangan(ruanganDao.findById(new Integer(getSettingDataFixed("kdRuanganLogistik")))); setStokprodukDetail.add(stokProdukDetail); @@ -1028,7 +1028,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl // fifo List listStokProdukGlobal = stokProdukGlobalDao.findStokWitAsalProduk( detail.getKdproduk().getId(), - new Integer(GetSettingDataFixed("kdRuanganLogistik"))/* , null */); + new Integer(getSettingDataFixed("kdRuanganLogistik"))/* , null */); if (CommonUtil.isNotNullOrEmpty(listStokProdukGlobal)) { StokProdukGlobal stokProdukGlobal = listStokProdukGlobal.get(0); @@ -1151,7 +1151,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl strukPelayanan.setTglstruk(new Date()); strukPelayanan.setNostruk(getRunningNumber("StrukPelayanan")); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksiDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdPengirimanBarangLogistik")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdPengirimanBarangLogistik")))); if (CommonUtil.isNotNullOrEmpty(vo.getStrukOrder())) { strukPelayanan.setNoorder(strukOrderConverter.transferVOToModel(vo.getStrukOrder(), new StrukOrder())); } @@ -1216,7 +1216,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl StrukPelayananDNoBatch modelEntity = new StrukPelayananDNoBatch(); modelEntity.setKdasalproduk(detail.getKdasalproduk()); modelEntity.setKdproduk(detail.getKdproduk()); - modelEntity.setKdruangan(ruanganDao.findById(new Integer(GetSettingDataFixed("kdRuanganLogistik")))); + modelEntity.setKdruangan(ruanganDao.findById(new Integer(getSettingDataFixed("kdRuanganLogistik")))); modelEntity.setKeteranganlainnya(modelVo.getKeteranganlainnya()); modelEntity.setNobatch(modelVo.getNobatch()); modelEntity.setTglpelayanan(modelVo.getTglpelayanan()); @@ -1242,7 +1242,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl strukPelayanan.setKeteranganlainnya(vo.getKeterangan()); strukPelayanan.setTglstruk(vo.getTanggalTerima()); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksiDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdKelompokPemakaianBarangHabisPakai")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdKelompokPemakaianBarangHabisPakai")))); if (CommonUtil.isNotNullOrEmpty(vo.getPemakaianBarangHabisPakai())) { for (PemakaianBarangHabisPakaiDetailVO detailVo : vo.getPemakaianBarangHabisPakai()) { @@ -1321,7 +1321,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl String tanggalAhir, Integer kelompokProdukId, Integer jenisProdukId, Integer produkId) { Integer ruanganId = getRuanganByUserLogin().getId(); Integer kelompokTransaksiId = kelompokTransaksiDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdKelompokPemakaianBarangHabisPakai"))) + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdKelompokPemakaianBarangHabisPakai"))) .getId(); int totalRow = strukPelayananDetailDaoCustom.listPemakaianBarangHabisPakaiCount(tanggalAwal, tanggalAhir, kelompokProdukId, jenisProdukId, produkId, ruanganId, kelompokTransaksiId); @@ -1356,7 +1356,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl String noTerima) { Integer ruanganId = getRuanganByUserLogin().getId(); Integer kelompokTransaksiId = kelompokTransaksiDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdPenerimaanBarangLogistik"))).getId(); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdPenerimaanBarangLogistik"))).getId(); int totalRow = strukPelayananDetailDaoCustom.listPenerimaanCountSupplier(tanggalAwal, tanggalAhir, produkId, ruanganId, kelompokTransaksiId, jenisProdukId, kelompokProdukId, noTerima); int totalPages = 0; @@ -1416,7 +1416,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl strukRetur.setPegawai(getPegawaiByUserLogin()); strukRetur.setKeteranganAlasan(vo.getKeterangan()); KelompokTransaksi kelompokTransaksi = kelompokTransaksiDao - .findById(Integer.parseInt(GetSettingDataFixed("KdKelompokReturSupplier"))); + .findById(Integer.parseInt(getSettingDataFixed("KdKelompokReturSupplier"))); strukRetur.setKelompokTransaksi(kelompokTransaksi); List data = new ArrayList(); if (CommonUtil.isNotNullOrEmpty(vo.getReturDetail())) { @@ -1499,7 +1499,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl public Map listReturSupplier(Integer page, Integer limit, String sort, String dir, String tanggalAwal, String tanggalAhir, Integer produkId, Integer jenisProdukId, Integer kelompokProdukId, Integer supplierId) { - Integer kelompokTransaksi = Integer.parseInt(GetSettingDataFixed("KdKelompokReturSupplier")); + Integer kelompokTransaksi = Integer.parseInt(getSettingDataFixed("KdKelompokReturSupplier")); int totalRow = strukPelayananDetailDaoCustom.listReturSupplierCount(tanggalAwal, tanggalAhir, produkId, jenisProdukId, kelompokProdukId, supplierId, kelompokTransaksi); int totalPages = 0; @@ -1549,7 +1549,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl strukPelayanan.setTotalbeamaterai(vo.getTotalBeaMaterai()); strukPelayanan.setTglstruk(new Date()); strukPelayanan.setKdkelompoktransaksi(kelompokTransaksiDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdPenerimaanBarangLogistik")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdPenerimaanBarangLogistik")))); if (CommonUtil.isNotNullOrEmpty(vo.getSupplier())) { strukPelayanan.setKdrekanan(rekananConverter.transferVOToModel(vo.getSupplier(), new Rekanan())); } @@ -1762,7 +1762,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl Map result = new HashMap(); Integer ruanganId = getRuanganByUserLogin().getId(); Integer kelompokTransaksiId = kelompokTransaksiDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdKelompokPemakaianBarangHabisPakai"))) + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdKelompokPemakaianBarangHabisPakai"))) .getId(); result.put("data", strukPelayananDetailDaoCustom.cetakListPemakaianBarangHabisPakai(tanggalAwal, tanggalAhir, kelompokProdukId, jenisProdukId, produkId, ruanganId, kelompokTransaksiId)); @@ -1800,7 +1800,7 @@ public class StrukPelayananServiceImpl extends BaseAngaranServiceImpl @Override public Map cetakListReturSupplier(String tanggalAwal, String tanggalAhir, Integer produkId, Integer jenisProdukId, Integer kelompokProdukId, Integer supplierId) { - Integer kelompokTransaksi = Integer.parseInt(GetSettingDataFixed("KdKelompokReturSupplier")); + Integer kelompokTransaksi = Integer.parseInt(getSettingDataFixed("KdKelompokReturSupplier")); Map result = new HashMap(); result.put("data", strukPelayananDetailDaoCustom.cetakListReturSupplierList(tanggalAwal, tanggalAhir, produkId, jenisProdukId, kelompokProdukId, supplierId, kelompokTransaksi)); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratMasukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratMasukServiceImpl.java index 3d040c56..a1d735bc 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratMasukServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratMasukServiceImpl.java @@ -232,7 +232,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas } // jenis dokumen JenisDokumen jenisDokumen = new JenisDokumen(); - jenisDokumen.setId(Integer.parseInt(GetSettingDataFixed("KdJenisDokumenSuratMasuk"))); + jenisDokumen.setId(Integer.parseInt(getSettingDataFixed("KdJenisDokumenSuratMasuk"))); dokumen.setJenisDokumen(jenisDokumen); dokumen.setJangkaWaktu(vo.getDokumen().getJangkaWaktu()); dokumen.setPathFile(reportDirectory); @@ -343,7 +343,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas // jenis dokumen JenisDokumen jenisDokumen = new JenisDokumen(); - jenisDokumen.setId(Integer.parseInt(GetSettingDataFixed("kdJenisDokumenDraft"))); + jenisDokumen.setId(Integer.parseInt(getSettingDataFixed("kdJenisDokumenDraft"))); dokumen.setJenisDokumen(jenisDokumen); Ruangan ruanganAsal = new Ruangan(); @@ -431,7 +431,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas strukKirim.setKdruanganasal(ruanganPengirim); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiTataUsaha"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiTataUsaha"))); strukKirim.setKelompokTransaksi(kelompokTransaksi); // set ruangan tujuan @@ -625,7 +625,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas // set kelompok transaksi tata usaha strukPelayanan.setKdkelompoktransaksi(kelompokTransaksiDao - .findById(Integer.parseInt((String) this.GetSettingDataFixed("KdKelompokTransaksiTataUsaha")))); + .findById(Integer.parseInt((String) this.getSettingDataFixed("KdKelompokTransaksiTataUsaha")))); strukPelayanan.setTglstruk(DateUtil.getShortDate()); strukPelayanan.setNostruk(getRunningNumber("StrukPelayanan")); @@ -803,7 +803,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas // jenis dokumen JenisDokumen jenisDokumen = new JenisDokumen(); - jenisDokumen.setId(Integer.parseInt(GetSettingDataFixed("KdJenisDokumenSuratMasuk"))); + jenisDokumen.setId(Integer.parseInt(getSettingDataFixed("KdJenisDokumenSuratMasuk"))); dokumen.setJenisDokumen(jenisDokumen); Ruangan ruanganAsal = new Ruangan(); @@ -902,7 +902,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas strukKirim.setKdruanganasal(ruanganPengirim); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiTataUsaha"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiTataUsaha"))); strukKirim.setKelompokTransaksi(kelompokTransaksi); // set ruangan tujuan @@ -1202,7 +1202,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas //Simpan kedalam dokumen dokumen.setPathFile(targetFile+File.separator+fileName); //Dianggap surat masuk saja - JenisDokumen jenisDokumen = jenisDokumenDao.findByIdJenisDokumen(Integer.parseInt(GetSettingDataFixed("KdJenisDokumenSuratMasuk"))); + JenisDokumen jenisDokumen = jenisDokumenDao.findByIdJenisDokumen(Integer.parseInt(getSettingDataFixed("KdJenisDokumenSuratMasuk"))); dokumen.setJenisDokumen(jenisDokumen); dokumen.setNoDokumen(suratMasukDariExternalVO.getNoSurat()); dokumen.setNamaJudulDokumen(suratMasukDariExternalVO.getNamaSurat()); @@ -1420,7 +1420,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas strukKirim.setKdruanganasal(loginUser.getPegawai().getRuangan()); KelompokTransaksi kelompokTransaksi = new KelompokTransaksi(); - kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KdKelompokTransaksiTataUsaha"))); + kelompokTransaksi.setId(Integer.parseInt(getSettingDataFixed("KdKelompokTransaksiTataUsaha"))); strukKirim.setKelompokTransaksi(kelompokTransaksi); strukKirim.setKdruangantujuan(dokumenMasuk.getKdruangantujuanlast()); @@ -1445,7 +1445,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas public String saveTerimaSurat(KirimDraftVO kirimDraftVO) { try { //Kode Kelompok Transaksi - String kdKelompokTransaksi=GetSettingDataFixed("KelompokTransaksiDokumenManagement"); + String kdKelompokTransaksi= getSettingDataFixed("KelompokTransaksiDokumenManagement"); LoginUser loginUser = loginUserService.getLoginUser(); //Struk Verifikasi StrukVerifikasi verifikasi = new StrukVerifikasi(); @@ -1520,7 +1520,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas dokumenMasuk.setInstitusinamapengirim(dokumen.getPegawaiPembuat().getNamaLengkap()); dokumenMasuk.setStatus("PENOMORAN"); - Integer idRuanganTujuan=Integer.parseInt(GetSettingDataFixed("KdRuanganTataUsaha")); + Integer idRuanganTujuan=Integer.parseInt(getSettingDataFixed("KdRuanganTataUsaha")); Ruangan ruanganTujuan=ruanganDao.findByIdSAllStatus(idRuanganTujuan); dokumenMasuk.setKdruangantujuanlast(ruanganTujuan); //Sama dengan tujuan surat @@ -1749,7 +1749,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas } //Dianggap surat masuk saja - JenisDokumen jenisDokumen = jenisDokumenDao.findByIdJenisDokumen(Integer.parseInt(GetSettingDataFixed("KdJenisDokumenSuratMasuk"))); + JenisDokumen jenisDokumen = jenisDokumenDao.findByIdJenisDokumen(Integer.parseInt(getSettingDataFixed("KdJenisDokumenSuratMasuk"))); dokumen.setJenisDokumen(jenisDokumen); dokumen.setNoDokumen(suratMasukKeInternal.getNoSurat()); //dokumen.setNamaJudulDokumen(suratMasukKeInternal.getNamaSurat()); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TagihanRekananServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TagihanRekananServiceImpl.java index 91469903..d1457fbc 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TagihanRekananServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TagihanRekananServiceImpl.java @@ -272,7 +272,7 @@ public class TagihanRekananServiceImpl extends BaseVoServiceImpl implements Tagi sbp.setPegawaiPembayar(loginUserService.getLoginUser()); Ruangan ruangan = new Ruangan(); - ruangan.setId(Integer.parseInt(GetSettingDataFixed("KdRuanganKeuangan"))); + ruangan.setId(Integer.parseInt(getSettingDataFixed("KdRuanganKeuangan"))); // set ruangan sbp.setRuangan(ruangan); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UsulanEvaluasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UsulanEvaluasiServiceImpl.java index 0e0bea4f..5f08aeb5 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UsulanEvaluasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/UsulanEvaluasiServiceImpl.java @@ -82,7 +82,7 @@ public class UsulanEvaluasiServiceImpl extends BaseVoServiceImpl implements Usul String noUsulan, Integer ruanganId) { List> maps = null; List> result= new ArrayList>(); - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); System.out.println("Usulan Evaluasi Jenis "+ idJensEvaluasi); if (CommonUtil.isNotNullOrEmpty(noUsulan)){ maps = UsulanEvaluasiDao.listUsulanEvaluasiByRuanganPembuat(tglAwal, tglAkhir, noUsulan,ruanganId,Integer.parseInt(idJensEvaluasi)); @@ -103,7 +103,7 @@ public class UsulanEvaluasiServiceImpl extends BaseVoServiceImpl implements Usul Integer idPegawai) { List> maps = null; List> result= new ArrayList>(); - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); if (CommonUtil.isNotNullOrEmpty(noUsulan)){ maps= UsulanEvaluasiDao.getUsulanEvaluasiByRuanganTujuan(tglAwal, tglAkhir, noUsulan,idPegawai); }else{ @@ -143,7 +143,7 @@ public class UsulanEvaluasiServiceImpl extends BaseVoServiceImpl implements Usul LoginUser loginUser = loginUserService.getLoginUser(); //SET JENIS EVALUASI - String idJensEvaluasi = GetSettingDataFixed(SETTING_DATA_FIXED_JENIS); + String idJensEvaluasi = getSettingDataFixed(SETTING_DATA_FIXED_JENIS); JenisEvaluasi jenisEvaluasi = new JenisEvaluasi(); jenisEvaluasi.setId(Integer.parseInt(idJensEvaluasi)); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/EffectiveDateDataFixDTO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/EffectiveDateDataFixDTO.java new file mode 100644 index 00000000..7ca31ef8 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/EffectiveDateDataFixDTO.java @@ -0,0 +1,17 @@ +package com.jasamedika.medifirst2000.dto; + +import lombok.Getter; + +/** + * @author Salman + * @version 1.0.0 + * @since 2/12/2025 + */ +@Getter +public final class EffectiveDateDataFixDTO { + + private String nilaiField; + + private Long tmt; + +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SettingDataFixed.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SettingDataFixed.java index efc2746a..6ec11b5f 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SettingDataFixed.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SettingDataFixed.java @@ -1,23 +1,10 @@ package com.jasamedika.medifirst2000.entities; -import java.io.Serializable; -import org.hibernate.envers.Audited; -import javax.persistence.*; - -import org.hibernate.validator.constraints.NotEmpty; - -import com.jasamedika.medifirst2000.base.BaseMaster; -import javax.validation.constraints.NotNull; -import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.internal.util.logging.Messages; - -import com.fasterxml.jackson.annotation.JsonManagedReference; import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; -import org.hibernate.envers.Audited; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; /** * class setingDataFixed @@ -76,8 +63,7 @@ public class SettingDataFixed extends BaseMaster { return this.namaField; } - @NotNull(message = "Nilai Field tidak boleh kosong") - @Column(name = "NilaiField", nullable = false, length = 50) + @Column(name = "NilaiField", columnDefinition = "TEXT") @Caption(value = "Nilai Field") private String nilaiField;