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 49d023f2..e169f1e7 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 @@ -1078,7 +1078,7 @@ public interface PegawaiDao extends PagingAndSortingRepository public List> checkExistingFingerId(@Param("fingerId") String idFinger); @Query("select new Map(pg.id as id,pg.namaLengkap as namaLengkap) " + "from Pegawai pg " - + "where pg.statusEnabled is true " + "and pg.idFinger = :fingerId " + "and pg.idFinger <> '' " + + "where pg.statusEnabled is true " + "and trim(pg.idFinger) = :fingerId " + "and trim(pg.idFinger) <> '' " + "and pg.id <> :pegawaiId") public List> checkExistingFingerId(@Param("fingerId") String idFinger, @Param("pegawaiId") Integer idPegawai); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java index 785b472b..e23b3b0f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java @@ -173,7 +173,7 @@ public interface PelayananPasienDao extends PagingAndSortingRepository> findLayananTagihan(@Param("noRegistrasi") String noRegistrasi, @Param("jenisDiskon") Integer jenisDiskon, @Param("listDepartemenId") List listIdDepartemen, diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienNakesDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienNakesDao.java index 573a3407..101a6335 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienNakesDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienNakesDao.java @@ -14,12 +14,14 @@ import com.jasamedika.medifirst2000.entities.PelayananPasienNakes; public interface PelayananPasienNakesDao extends PagingAndSortingRepository { @Query("select new Map(pp.noRec as noRec,pp.antrianPasienDiperiksaId as noRecAPD," - + "pr.id as produkId,pr.namaProduk as namaProduk," - + "pp.tglPelayanan as tglPelayanan,to_char(pp.tglPelayanan,'dd-MM-yyyy HH24:MI:ss') as tglPelayananFormatted," + + "pr.id as produkId,pr.namaProduk as namaProduk," + "pfs.id as profesiId,pfs.namaProfesi as namaProfesi," + + "pp.tglPelayanan as tglPelayanan," + + "to_char(pp.tglPelayanan,'dd-MM-yyyy HH24:MI:ss') as tglPelayananFormatted," + "pp.jumlah as jumlah,pp.skor as skor,(pp.jumlah*pp.skor) as tSkor," + "pg.id as pegawaiId,pg.namaLengkap as namaLengkap) " + "from PelayananPasienNakes pp " - + "inner join pp.produk pr " + "left join pp.pegawai pg " + "where pp.statusEnabled is true " - + "and pp.antrianPasienDiperiksaId = :norecAPD " + "and pg.id = :pegawaiId " + "order by pp.tglPelayanan") + + "inner join pp.produk pr " + "inner join pr.profesi pfs " + "left join pp.pegawai pg " + + "where pp.statusEnabled is true " + "and pp.antrianPasienDiperiksaId = :norecAPD " + + "and pg.id = :pegawaiId " + "order by pp.tglPelayanan") List> findByAntrianPasienDiperiksa(@Param("norecAPD") String noRec, @Param("pegawaiId") Integer idPegawai); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukNakesDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukNakesDao.java index 3a98a97e..e983c413 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukNakesDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProdukNakesDao.java @@ -20,8 +20,4 @@ import com.jasamedika.medifirst2000.entities.ProdukNakes; @Repository("produkNakesDao") public interface ProdukNakesDao extends PagingAndSortingRepository { - @Query("select new Map(prn.id as id,prn.namaProduk as namaProduk) " + "from ProdukNakes prn " - + "where prn.statusEnabled is true " + "and prn.profesiId = :profesiId") - List> findByProfesi(@Param("profesiId") Integer idProfesi); - } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ProdukNakesService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ProdukNakesService.java index f09d5770..0a132bcb 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ProdukNakesService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ProdukNakesService.java @@ -3,11 +3,6 @@ */ package com.jasamedika.medifirst2000.service; -import java.util.List; -import java.util.Map; - -import org.springframework.orm.jpa.JpaSystemException; - import com.jasamedika.medifirst2000.entities.ProdukNakes; import com.jasamedika.medifirst2000.vo.ProdukNakesVO; @@ -17,6 +12,4 @@ import com.jasamedika.medifirst2000.vo.ProdukNakesVO; */ public interface ProdukNakesService extends BaseVoService { - List> findByProfesi(Integer idProfesi) throws JpaSystemException; - } 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 37db0b3b..689053b1 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 @@ -4255,6 +4255,9 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon if (isDirektur) { result = monitoringAbsenDao.getDataPegawaiDirektur(idUnitKerja, levelJabatan, sublevelJabatan, splitDataSettingDatafixed("idMeninggalKeluarPindah")); + } else if (listPegawaiSDM.contains(idPegawaiLogin)) { + result = monitoringAbsenDao.getDataPegawaiRev(idUnitKerja, idSubUnitKerja, + splitDataSettingDatafixed("idMeninggalKeluarPindah")); } } 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 f9739a00..002f86ba 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 @@ -2408,9 +2408,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ List> result = new ArrayList<>(); if (CommonUtil.isNotNullOrEmpty(idPegawai)) { - result = pegawaiDao.checkExistingFingerId(idFinger, idPegawai); + result = pegawaiDao.checkExistingFingerId(idFinger.trim(), idPegawai); } else { - result = pegawaiDao.checkExistingFingerId(idFinger); + result = pegawaiDao.checkExistingFingerId(idFinger.trim()); } return result; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukNakesServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukNakesServiceImpl.java index 6f186917..acf69675 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukNakesServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukNakesServiceImpl.java @@ -111,11 +111,4 @@ public class ProdukNakesServiceImpl extends BaseVoServiceImpl implements ProdukN return null; } - @Override - public List> findByProfesi(Integer idProfesi) throws JpaSystemException { - List> result = produkNakesDao.findByProfesi(idProfesi); - - return result; - } - } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java index d5d046e0..8e240e4d 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java @@ -1610,25 +1610,6 @@ public class IkiDanRemunerasiController extends LocaleController>> getProdukNakes(HttpServletRequest request, - @RequestParam(value = "profesiId", required = false) Integer idProfesi) throws ParseException { - try { - List> result = produkNakesService.findByProfesi(idProfesi); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException sve) { - LOGGER.error("Got exception {} when get produk nakes per profesi", sve.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get produk nakes per profesi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - @RequestMapping(value = "/save-skoring-tindakan-nakes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity saveSkoringTindakanNakes(HttpServletRequest request, @Valid @RequestBody SkoringTindakanNakesVO vo) { diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java index c06b11d3..878cb761 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java @@ -5206,7 +5206,7 @@ public class SdmController extends LocaleController { } @RequestMapping(value = "/get-id-kalender", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getDataPegawaiRevMonitoring( + public ResponseEntity>> getIdKalender( @RequestParam(value = "tanggal", required = true) String tanggal, HttpServletRequest request) { List> result = new ArrayList<>(); try {