From 9aeb7dc6cc69bd59accd9b57ef53563073cae074 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 17 Jan 2022 17:31:37 +0700 Subject: [PATCH] Update LogbookKinerjaDokterService Penghapusan service get pegawai akses kinerja dokter karena diubah untuk dibuatkan generalisasi --- .../dao/LogbookKinerjaDokterDao.java | 32 --------- .../service/LogbookKinerjaDokterService.java | 5 -- .../impl/LogbookKinerjaDokterServiceImpl.java | 65 ------------------- 3 files changed, 102 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDokterDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDokterDao.java index 31358af6..58696392 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDokterDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDokterDao.java @@ -74,36 +74,4 @@ public interface LogbookKinerjaDokterDao extends PagingAndSortingRepository> findPegawaiByListKategori( @Param("listKategoryPegawaiId") List listIdKategoriPegawai); - @Query("select distinct new Map(pg.id as id,pg.namaLengkap as namaLengkap,pg.tglMasuk as tglMasuk) " - + "from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg " + "inner join mj.jabatan jb " - + "where mj.statusEnabled is true " + "and pg.statusEnabled is true " + "and jb.statusEnabled is true " - + "and pg.id = :pegawaiId " + "and pg.kategoryPegawaiId in (:listKategoryPegawaiId) " - + "and jb.unitKerjaId in (:listKsmId)") - List> findAksesPegawaiByStaf(@Param("pegawaiId") Integer idPegawai, - @Param("listKategoryPegawaiId") List listIdKategoriPegawai, - @Param("listKsmId") List listIdKsm); - - @Query("select distinct new Map(pgb.id as id,pgb.namaLengkap as namaLengkap,pgb.tglMasuk as tglMasuk) " - + "from MapPegawaiJabatanToUnitKerja mjp, MapPegawaiJabatanToUnitKerja mja " + "inner join mjp.pegawai pgb " - + "inner join mjp.atasanLangsung pg " + "inner join mja.jabatan jb " - + "where mjp.atasanLangsungId = mja.pegawaiId " + "and mja.pegawaiId = pg.id " - + "and mjp.statusEnabled is true " + "and mja.statusEnabled is true " + "and pgb.statusEnabled is true " - + "and pg.statusEnabled is true " + "and jb.statusEnabled is true " + "and pg.id = :pegawaiId " - + "and pgb.kategoryPegawaiId in (:listKategoryPegawaiId) " + "and pgb.jenisPegawaiId = 1 " - + "and jb.unitKerjaId in (:listKsmId)") - List> findAksesPegawaiByAtasan(@Param("pegawaiId") Integer idPegawai, - @Param("listKategoryPegawaiId") List listIdKategoriPegawai, - @Param("listKsmId") List listIdKsm); - - @Query("select distinct new Map(pgb.id as id,pgb.namaLengkap as namaLengkap,pgb.tglMasuk as tglMasuk) " - + "from MapPegawaiJabatanToUnitKerja mjp, MapPegawaiJabatanToUnitKerja mjn " + "inner join mjp.pegawai pgb " - + "inner join mjp.pejabatPenilai pg " + "inner join mjn.jabatan jb " - + "where mjp.pejabatPenilaiId = mjn.pegawaiId " + "and mjn.pegawaiId = pg.id " - + "and mjp.statusEnabled is true " + "and mjn.statusEnabled is true " + "and pgb.statusEnabled is true " - + "and pg.statusEnabled is true " + "and jb.statusEnabled is true " + "and pg.id = :pegawaiId " - + "and pgb.kategoryPegawaiId in (:listKategoryPegawaiId) " + "and pgb.jenisPegawaiId = 1 " - + "and jb.unitKerjaId = :direksiId") - List> findAksesPegawaiByPenilai(@Param("pegawaiId") Integer idPegawai, - @Param("listKategoryPegawaiId") List listIdKategoriPegawai, @Param("direksiId") Integer idDireksi); - } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaDokterService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaDokterService.java index d14245e5..fe4ac037 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaDokterService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/LogbookKinerjaDokterService.java @@ -1,8 +1,5 @@ package com.jasamedika.medifirst2000.service; -import java.util.List; -import java.util.Map; - import org.springframework.orm.jpa.JpaSystemException; import com.jasamedika.medifirst2000.entities.LogbookKinerjaDokter; @@ -13,8 +10,6 @@ import com.jasamedika.medifirst2000.vo.custom.CpptDokterVo; public interface LogbookKinerjaDokterService extends BaseVoService { - public List> findAksesPegawai(Integer idPegawai) throws JpaSystemException; - public LogbookKinerjaDokterVO verify(CpptDokterVo vo) throws JpaSystemException, ServiceVOException; public void verify(String idLogbook) throws JpaSystemException, ServiceVOException; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDokterServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDokterServiceImpl.java index f22b2211..e56f5ec6 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDokterServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDokterServiceImpl.java @@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.service.impl; import java.util.ArrayList; import java.util.Arrays; -import java.util.Comparator; import java.util.List; import java.util.Map; @@ -14,7 +13,6 @@ import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.LogbookKinerjaDao; import com.jasamedika.medifirst2000.dao.LogbookKinerjaDokterDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; import com.jasamedika.medifirst2000.entities.IndikatorKinerjaDetail; import com.jasamedika.medifirst2000.entities.Jabatan; import com.jasamedika.medifirst2000.entities.LogbookKinerja; @@ -50,9 +48,6 @@ public class LogbookKinerjaDokterServiceImpl extends BaseVoServiceImpl implement @Autowired private LogbookKinerjaDokterDao logbookDokterDao; - @Autowired - private PegawaiDao pegawaiDao; - @Override public LogbookKinerjaDokterVO add(LogbookKinerjaDokterVO vo) throws JpaSystemException, ServiceVOException { Pegawai pegawai = pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai()); @@ -181,64 +176,4 @@ public class LogbookKinerjaDokterServiceImpl extends BaseVoServiceImpl implement return null; } - @Override - public List> findAksesPegawai(Integer idPegawai) throws JpaSystemException { - List> result = new ArrayList<>(); - List> rsAll = new ArrayList<>(); - List listPurnaWaktu = Arrays.asList(Master.KategoryPegawai.PURNA_WAKTU); - - List listIdSDM = pegawaiDao.getPegawaiSDMforCred(Master.UnitKerja.BAG_SDM, - Master.SubUnitKerja.SUBBAG_KESEJAHTERAAN); - if (listIdSDM.contains(idPegawai)) { - rsAll = logbookDokterDao.findPegawaiByListKategori(listPurnaWaktu); - result.addAll(rsAll); - for (Map map : result) { - map.put("isVerifAkses", false); - } - } - - List> aksesByStaf = logbookDokterDao.findAksesPegawaiByStaf(idPegawai, listPurnaWaktu, - Arrays.asList(Master.UnitKerja.KSM)); - List> aksesByAtasan = logbookDokterDao.findAksesPegawaiByAtasan(idPegawai, listPurnaWaktu, - Arrays.asList(Master.UnitKerja.KSM)); - List> aksesByPenilai = logbookDokterDao.findAksesPegawaiByPenilai(idPegawai, listPurnaWaktu, - Master.UnitKerja.DIREKSI); - - if (CommonUtil.isNotNullOrEmpty(aksesByStaf) && CommonUtil.isNullOrEmpty(rsAll)) { - for (Map map : aksesByStaf) { - map.put("isVerifAkses", false); - } - result.addAll(aksesByStaf); - } - if (CommonUtil.isNotNullOrEmpty(aksesByAtasan)) { - if (CommonUtil.isNullOrEmpty(rsAll)) { - for (Map map : aksesByAtasan) { - map.put("isVerifAkses", true); - } - result.addAll(aksesByAtasan); - } else { - for (Map res : result) { - for (Map map : aksesByAtasan) { - if (res.get("id").equals(map.get("id"))) { - res.put("isVerifAkses", true); - break; - } - } - } - } - } - if (CommonUtil.isNotNullOrEmpty(aksesByPenilai) && CommonUtil.isNullOrEmpty(rsAll)) { - for (Map map : aksesByPenilai) { - map.put("isVerifAkses", false); - } - result.addAll(aksesByPenilai); - } - - if (CommonUtil.isNotNullOrEmpty(result)) { - result.sort(Comparator.comparing(m -> (String) m.get("namaLengkap"), String.CASE_INSENSITIVE_ORDER)); - } - - return result; - } - }