diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index 9f661fd5..1a4ca7bf 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -148,7 +148,6 @@ public final class Master { public static final Integer MITRA = 16; public static final Integer[] NONSDM = { 13, 16, 17 }; // peserta_didik,_mitra public static final Integer[] PARUH_WAKTU = { 12, 19 }; - public static final Integer PESERTA_DIDIK = 17; public static final Integer PNS = 1; public static final Integer[] REMUN = { 1, 10, 14, 21 }; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java index 142ce3c7..57de4c58 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java @@ -400,10 +400,10 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific + "left join pegawai.statusKawin statusKawin " + "left join pegawai.statusPegawai statusPegawai " + "left join pegawai.statusPerkawinanPegawai statusPerkawinanPegawai " + "left join pegawai.suku suku " + "left join pegawai.typePegawai typePegawai " + "where pegawai.statusEnabled is true " - + "and pegawai.kategoryPegawaiId = :idKategoryPegawai " + // PNS + + "and pegawai.kategoryPegawaiId in (:listIdKategoryPegawai) " + // PNS "and kedudukan.id not in :listKedudukan " + "order by pegawai.nama") List> findAllPegawaiByKategory(@Param("listKedudukan") List listKedudukan, - @Param("idKategoryPegawai") Integer idKategoryPegawai); + @Param("listIdKategoryPegawai") List listIdKategoryPegawai); @Query("select new map (jabatanInternal.namaJabatan as jabatanInternal, " + "jabatanInternal.id as idJabatanInternal, " + "unitKerja.id as idUnitKerja, " diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java index b65afc29..8f369b9f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java @@ -88,6 +88,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl public Map save(List listVo) { Map result = new HashMap<>(); List> listResult = new ArrayList<>(); + List listIdKategoriPesertaDidik = splitDataSettingDatafixed("listIdKategoriPesertaDidik"); if (CommonUtil.isNotNullOrEmpty(listVo)) { for (MapPegawaiJabatanToUnitKerjaVO vo : listVo) { @@ -112,7 +113,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl } if (CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) { map.setStatusEnabled(vo.getStatusEnabled()); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "hapus mapping dokter penanggung jawab, "; } else { perubahan += "hapus mapping jabatan, "; @@ -316,6 +317,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl String perubahan = ""; + List listIdKategoriPesertaDidik = splitDataSettingDatafixed("listIdKategoriPesertaDidik"); for (MapPegawaiJabatanToUnitKerjaVO vo : listVo) { MapPegawaiJabatanToUnitKerja map = new MapPegawaiJabatanToUnitKerja(); Map tmp = new HashMap<>(); @@ -361,7 +363,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl && CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) { if (!map.getStatusEnabled().equals(vo.getStatusEnabled())) { map.setStatusEnabled(vo.getStatusEnabled()); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status hapus mapping dokter penanggung jawab, "; } else { perubahan += "status hapus mapping jabatan, "; @@ -370,7 +372,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl } else if (CommonUtil.isNullOrEmpty(map.getStatusEnabled()) && CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) { map.setStatusEnabled(vo.getStatusEnabled()); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status hapus mapping dokter penanggung jawab, "; } else { perubahan += "status hapus mapping jabatan, "; @@ -499,7 +501,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl if (!map.getAtasanLangsungId().equals(vo.getAtasanLangsung().getId())) { map.setAtasanLangsung( pegawaiConverter.transferVOToModel(vo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "ubah dokter penanggung jawab, "; } else { perubahan += "ubah atasan langsung, "; @@ -508,7 +510,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl } else if (CommonUtil.isNullOrEmpty(map.getAtasanLangsungId()) && CommonUtil.isNotNullOrEmpty(vo.getAtasanLangsung())) { map.setAtasanLangsung(pegawaiConverter.transferVOToModel(vo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "dokter penanggung jawab, "; } else { perubahan += "atasan langsung, "; @@ -516,7 +518,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl } else if (CommonUtil.isNotNullOrEmpty(map.getAtasanLangsungId()) && CommonUtil.isNullOrEmpty(vo.getAtasanLangsung())) { map.setAtasanLangsung(null); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "hapus dokter penanggung jawab, "; } else { perubahan += "hapus atasan langsung, "; @@ -673,7 +675,7 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl if (CommonUtil.isNotNullOrEmpty(vo.getAtasanLangsung())) { map.setAtasanLangsung(pegawaiConverter.transferVOToModel(vo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "dokter penanggung jawab, "; } else { perubahan += "atasan langsung, "; @@ -700,21 +702,21 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl if (vo.getIsPrimary()) { disableIsprimary(vo.getPegawai().getId()); } - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status jabatan utama, "; } } if (CommonUtil.isNotNullOrEmpty(vo.getIsMonitoring())) { map.setIsMonitoring(vo.getIsMonitoring()); - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status monitoring, "; } } if (CommonUtil.isNotNullOrEmpty(vo.getIsCanCreateJadwal())) { map.setIsCanCreateJadwal(vo.getIsCanCreateJadwal()); - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status buat jadwal dinas, "; } } 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 b86da6b0..5303dcb8 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 @@ -521,8 +521,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ public Map findAllPegawaiPNS() { Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); - List> resultModel = pegawaiDao - .findAllPegawaiByKategory(Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.PNS); + List> resultModel = pegawaiDao.findAllPegawaiByKategory( + Arrays.asList(Master.KedudukanPegawai.NONSDM), Collections.singletonList(Master.KategoryPegawai.PNS)); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -572,8 +572,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ public Map findAllPegawaiMitra() { Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); - List> resultModel = pegawaiDao - .findAllPegawaiByKategory(Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.MITRA); + List> resultModel = pegawaiDao.findAllPegawaiByKategory( + Arrays.asList(Master.KedudukanPegawai.NONSDM), Collections.singletonList(Master.KategoryPegawai.MITRA)); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -624,7 +624,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDao.findAllPegawaiByKategory( - Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.PESERTA_DIDIK); + Arrays.asList(Master.KedudukanPegawai.NONSDM), splitDataSettingDatafixed("listIdKategoriPesertaDidik")); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -675,7 +675,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ Map result = new HashMap<>(); List> resultModelWithUsername = new ArrayList<>(); List> resultModel = pegawaiDao.findAllPegawaiByKategory( - Arrays.asList(Master.KedudukanPegawai.NONSDM), Master.KategoryPegawai.DOKTER_TAMU); + Arrays.asList(Master.KedudukanPegawai.NONSDM), + Collections.singletonList(Master.KategoryPegawai.DOKTER_TAMU)); for (Map map : resultModel) { Map usernames = new HashMap<>(); @@ -2261,7 +2262,8 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ Map map = pegawaiDao.getPegawaiKeluarHariIni(today, idPegawai); if (CommonUtil.isNotNullOrEmpty(map)) { - if (map.get("idKategoryPegawai").equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (splitDataSettingDatafixed("listIdKategoriPesertaDidik") + .contains(Integer.parseInt(map.get("idKategoryPegawai").toString()))) { Pegawai pegawai = pegawaiDao.findOne(Integer.parseInt(map.get("idPegawai").toString())); Kedudukan kedudukan = new Kedudukan(); kedudukan.setId(Master.KedudukanPegawai.NONAKTIF); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java index 19ad001f..097b74ee 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java @@ -180,6 +180,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re List kategoriPegawaiAksesAplikasiRemun = splitDataSettingDatafixed( "kategoriPegawaiAksesAplikasiRemun"); + List listIdKategoriPesertaDidik = splitDataSettingDatafixed("listIdKategoriPesertaDidik"); if (CommonUtil.isNotNullOrEmpty(vo.getId())) { pegawai = rekamDataPegawaiDao.findOne(vo.getId()); Integer idJabatanUtama = mapPegawaiJabatanToUnitkerjaDao.getIdJabatanInternalUtamaByIdPegawai(vo.getId()); @@ -1654,7 +1655,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re && CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) { if (!map.getStatusEnabled().equals(vo.getStatusEnabled())) { map.setStatusEnabled(vo.getStatusEnabled()); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status hapus mapping dokter penanggung jawab, "; } else { perubahan += "status hapus mapping jabatan, "; @@ -1663,7 +1664,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } else if (CommonUtil.isNullOrEmpty(map.getStatusEnabled()) && CommonUtil.isNotNullOrEmpty(vo.getStatusEnabled())) { map.setStatusEnabled(vo.getStatusEnabled()); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status hapus mapping dokter penanggung jawab, "; } else { perubahan += "status hapus mapping jabatan, "; @@ -1779,7 +1780,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (!map.getAtasanLangsungId().equals(mapVo.getAtasanLangsung().getId())) { map.setAtasanLangsung( pegawaiConverter.transferVOToModel(mapVo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "ubah dokter penanggung jawab, "; } else { perubahan += "ubah atasan langsung, "; @@ -1789,7 +1790,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re && CommonUtil.isNotNullOrEmpty(mapVo.getAtasanLangsung())) { map.setAtasanLangsung( pegawaiConverter.transferVOToModel(mapVo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "dokter penanggung jawab, "; } else { perubahan += "atasan langsung, "; @@ -1797,7 +1798,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re } else if (CommonUtil.isNotNullOrEmpty(map.getAtasanLangsungId()) && CommonUtil.isNullOrEmpty(mapVo.getAtasanLangsung())) { map.setAtasanLangsung(null); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "hapus dokter penanggung jawab, "; } else { perubahan += "hapus atasan langsung, "; @@ -1974,7 +1975,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (CommonUtil.isNotNullOrEmpty(mapVo.getAtasanLangsung())) { map.setAtasanLangsung( pegawaiConverter.transferVOToModel(mapVo.getAtasanLangsung(), new Pegawai())); - if (idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "dokter penanggung jawab, "; } else { perubahan += "atasan langsung, "; @@ -2002,21 +2003,21 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re if (mapVo.getIsPrimary()) { disableIsprimary(resultDomain.getId()); } - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status jabatan utama, "; } } if (CommonUtil.isNotNullOrEmpty(mapVo.getIsMonitoring())) { map.setIsMonitoring(mapVo.getIsMonitoring()); - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status monitoring, "; } } if (CommonUtil.isNotNullOrEmpty(mapVo.getIsCanCreateJadwal())) { map.setIsCanCreateJadwal(mapVo.getIsCanCreateJadwal()); - if (!idKategoryPegawai.equals(Master.KategoryPegawai.PESERTA_DIDIK)) { + if (!listIdKategoriPesertaDidik.contains(idKategoryPegawai)) { perubahan += "status buat jadwal dinas, "; } }