Merge branch 'dev/base' into dev/integrasi/minio

This commit is contained in:
adesyawal 2025-06-07 04:13:36 +07:00
commit 56c44aa388

View File

@ -333,7 +333,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "inner join pelayananpasienpetugas_t ppp on pp.norec = ppp.pelayananpasien " + "inner join pelayananpasienpetugas_t ppp on pp.norec = ppp.pelayananpasien "
+ "inner join mappegawaijabatantounitkerja_m mj on ppp.objectpegawaifk = mj.objectpegawaifk " + "inner join mappegawaijabatantounitkerja_m mj on ppp.objectpegawaifk = mj.objectpegawaifk "
+ "where ppp.objectpegawaifk = :pegawaiId " + "and pp.tglpelayanan between :tglAwal and :tglAkhir " + "where ppp.objectpegawaifk = :pegawaiId " + "and pp.tglpelayanan between :tglAwal and :tglAkhir "
+ "and mj.statusenabled = true " + "and ppp.objectjenispetugaspefk in (:listJenisPetugasPelaksanaId)") + "and mj.statusenabled = true " + "and pp.statusenabled = true " + "and ppp.objectjenispetugaspefk in (:listJenisPetugasPelaksanaId)")
List<String> findIdPelayananByDokter(@Param("pegawaiId") Integer idPegawai, @Param("tglAwal") Date tglAwal, List<String> findIdPelayananByDokter(@Param("pegawaiId") Integer idPegawai, @Param("tglAwal") Date tglAwal,
@Param("tglAkhir") Date tglAkhir, @Param("tglAkhir") Date tglAkhir,
@Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana); @Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana);
@ -341,14 +341,14 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
@Query(nativeQuery = true, value = "select pp.norec " + "from pelayananpasien_t pp " @Query(nativeQuery = true, value = "select pp.norec " + "from pelayananpasien_t pp "
+ "inner join pelayananpasienpetugas_t ppp on pp.norec = ppp.pelayananpasien " + "inner join pelayananpasienpetugas_t ppp on pp.norec = ppp.pelayananpasien "
+ "inner join mappegawaijabatantounitkerja_m mj on ppp.objectpegawaifk = mj.objectpegawaifk " + "inner join mappegawaijabatantounitkerja_m mj on ppp.objectpegawaifk = mj.objectpegawaifk "
+ "where pp.tglpelayanan between :tglAwal and :tglAkhir " + "and mj.statusenabled = true " + "where pp.tglpelayanan between :tglAwal and :tglAkhir " + "and mj.statusenabled = true " + "and pp.statusenabled = true "
+ "and mj.objectunitkerjapegawaifk in (:listKsmId) " + "and mj.objectunitkerjapegawaifk in (:listKsmId) "
+ "and ppp.objectjenispetugaspefk in (:listJenisPetugasPelaksanaId) " + "and ppp.objectjenispetugaspefk in (:listJenisPetugasPelaksanaId) "
+ "group by pp.norec having count(pp.norec) > 1") + "group by pp.norec having count(pp.norec) > 1")
List<String> findIdPelayananByKsm(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir, List<String> findIdPelayananByKsm(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir,
@Param("listKsmId") List<Integer> listIdKsm, @Param("listKsmId") List<Integer> listIdKsm,
@Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana); @Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana);
@Query("select distinct new com.jasamedika.medifirst2000.dto.PelayananDokterBedahDto(" @Query("select distinct new com.jasamedika.medifirst2000.dto.PelayananDokterBedahDto("
+ "pp.noRec as noRec,pp.produkId as idProduk," + "pp.noRec as noRec,pp.produkId as idProduk,"
+ "ppp.ObjectPegawaiId as idPegawai,ppp.ObjectJenisPetugasPeId as idJenisPetugasPelaksana) " + "ppp.ObjectPegawaiId as idPegawai,ppp.ObjectJenisPetugasPeId as idJenisPetugasPelaksana) "
@ -357,7 +357,16 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "and ppp.ObjectPegawaiId = mj.pegawaiId " + "and ppp.ObjectPegawaiId = pg.id " + "and ppp.ObjectPegawaiId = mj.pegawaiId " + "and ppp.ObjectPegawaiId = pg.id "
+ "and pp.tglPelayanan between :tglAwal and :tglAkhir " + "and mj.unitKerjaPegawaiId in (:listKsmId) " + "and pp.tglPelayanan between :tglAwal and :tglAkhir " + "and mj.unitKerjaPegawaiId in (:listKsmId) "
+ "and ppp.ObjectJenisPetugasPeId in (:listJenisPetugasPelaksanaId) " + "and ppp.ObjectJenisPetugasPeId in (:listJenisPetugasPelaksanaId) "
+ "and pp.statusEnabled is true "
+ "and pp.noRec in (:listPelayananIdByDokter) " + "and pp.noRec in (:listPelayananIdByKsm)") + "and pp.noRec in (:listPelayananIdByDokter) " + "and pp.noRec in (:listPelayananIdByKsm)")
List<PelayananDokterBedahDto> findPelayananBedahOriginal(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir,
@Param("listKsmId") List<Integer> listIdKsm,
@Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana,
@Param("listPelayananIdByDokter") List<String> listIdPelayananByDokter,
@Param("listPelayananIdByKsm") List<String> listIdPelayananByKsm);
@Query(nativeQuery = true, value = "select distinct pp.noRec as noRec, pp.produkfk as idProduk, ppp.objectpegawaifk as idPegawai, ppp.objectjenispetugaspefk as idJenisPetugasPelaksana from pelayananpasienpetugas_t ppp inner join mappegawaijabatantounitkerja_m mj on mj.objectpegawaifk = ppp.objectpegawaifk inner join pelayananpasien_t pp on pp.norec = ppp.pelayananpasien inner join pegawai_m pg on mj.objectpegawaifk = pg.id where mj.statusEnabled is true and ppp.objectpegawaifk = mj.objectpegawaifk and ppp.objectpegawaifk = pg.id and pp.tglPelayanan between :tglAwal and :tglAkhir and mj.objectunitkerjapegawaifk in (:listKsmId) and ppp.objectjenispetugaspefk in (:listJenisPetugasPelaksanaId) and pp.statusEnabled is true and pp.noRec in (:listPelayananIdByDokter) and pp.noRec in (:listPelayananIdByKsm)")
List<PelayananDokterBedahDto> findPelayananBedah(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir, List<PelayananDokterBedahDto> findPelayananBedah(@Param("tglAwal") Date tglAwal, @Param("tglAkhir") Date tglAkhir,
@Param("listKsmId") List<Integer> listIdKsm, @Param("listKsmId") List<Integer> listIdKsm,
@Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana, @Param("listJenisPetugasPelaksanaId") List<Integer> listIdJenisPetugasPelaksana,