From e2f0be2d09285622f173071e133380de0d553b20 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Mon, 6 Dec 2021 09:39:38 +0700 Subject: [PATCH] - perubahan parameter menjadi periodik dari range waktu - penambahan data unit kerja pegawai presensi dokter dpjp untuk persiapan hak akses verifikasi --- .../dao/MapPegawaiJabatanToUnitKerjaDao.java | 8 +-- ...PerkembanganPasienTerintegrasiService.java | 4 +- ...embanganPasienTerintegrasiServiceImpl.java | 28 +++++--- .../controller/ReportingController.java | 67 ++++++++++--------- 4 files changed, 63 insertions(+), 44 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java index 5509f66f..971ddcc8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java @@ -493,10 +493,10 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends CrudRepository findAllDokterKelompokStafMedik(@Param("listKsmId") List listIdKsm); - String strDokter = "select distinct new Map(pg.id as pegawaiId,pg.nama as nama,pg.namaLengkap as namaLengkap) " - + "from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg " + "inner join mj.jabatan jb " - + "where mj.statusEnabled is true " + "and pg.statusEnabled is true " + "and pg.jenisPegawaiId = 1 " - + "and jb.levelJabatan = 5 "; + String strDokter = "select distinct new Map(pg.id as pegawaiId,pg.nama as nama,pg.namaLengkap as namaLengkap," + + "mj.unitKerjaPegawaiId as ksmId) " + "from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg " + + "inner join mj.jabatan jb " + "where mj.statusEnabled is true " + "and pg.statusEnabled is true " + + "and pg.jenisPegawaiId = 1 " + "and jb.levelJabatan = 5 "; String remun = "and mj.unitKerjaPegawaiId in (:ksmListId) and pg.kategoryPegawaiId in (1,10,14) "; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/CatatanPerkembanganPasienTerintegrasiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/CatatanPerkembanganPasienTerintegrasiService.java index f243eab1..31fc6819 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/CatatanPerkembanganPasienTerintegrasiService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/CatatanPerkembanganPasienTerintegrasiService.java @@ -17,8 +17,8 @@ public interface CatatanPerkembanganPasienTerintegrasiService List> findDokter(Integer idKsm, Integer idKk, Integer idDr) throws JpaSystemException; - List> findPresensiVisiteDokter(Integer idKsm, Integer idKk, Integer idDr, Long startDate, - Long endDate) throws JpaSystemException; + List> findPresensiVisiteDokter(Integer idKsm, Integer idKk, Integer idDr, Long periode) + throws JpaSystemException; Map findPresensiVisiteDokter(Integer idPegawai, Long bulan) throws JpaSystemException; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganPasienTerintegrasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganPasienTerintegrasiServiceImpl.java index b054ddb6..6eeaa44b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganPasienTerintegrasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganPasienTerintegrasiServiceImpl.java @@ -2,9 +2,13 @@ package com.jasamedika.medifirst2000.service.impl; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; +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.Date; @@ -205,25 +209,33 @@ public class CatatanPerkembanganPasienTerintegrasiServiceImpl extends BaseVoServ * id kelompok kerja * @param idDr * id pegawai dokter - * @param startDate - * tanggal awal pengambilan data - * @param endDate - * tanggal akhir pengambilan data + * @param periode + * periode pengambilan data * @return presensi visite dokter */ @Override - public List> findPresensiVisiteDokter(Integer idKsm, Integer idKk, Integer idDr, Long startDate, - Long endDate) throws JpaSystemException { + public List> findPresensiVisiteDokter(Integer idKsm, Integer idKk, Integer idDr, Long periode) + throws JpaSystemException { List> result = new ArrayList<>(); List> dataInit = new ArrayList<>(); List listIdDokter = new ArrayList<>(); + DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); DateFormat df_ina = new SimpleDateFormat("dd-MM-yyyy"); DateFormat sf_ina = new SimpleDateFormat("HH:mm:ss"); - String strStartDate = df.format(new Date(startDate)); - String strEndDate = df.format(new Date(endDate)); + + String strStartDate; + String strEndDate; + LocalDate localMonth = Instant.ofEpochMilli(periode).atZone(ZoneId.systemDefault()).toLocalDate(); + if (LocalDate.now().getMonthValue() == localMonth.getMonthValue()) { + strStartDate = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(dtf); + strEndDate = LocalDate.now().format(dtf); + } else { + strStartDate = localMonth.with(TemporalAdjusters.firstDayOfMonth()).format(dtf); + strEndDate = localMonth.with(TemporalAdjusters.lastDayOfMonth()).format(dtf); + } List> listDokter = this.findDokter(idKsm, idKk, idDr); for (Map map : listDokter) { diff --git a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java index 65feedd8..38401a10 100644 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java +++ b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java @@ -96,10 +96,16 @@ import com.jasamedika.medifirst2000.dto.PerjanjianPasienDto; import com.jasamedika.medifirst2000.dto.ReportingPegawaiDto; import com.jasamedika.medifirst2000.dto.SensusHarianDto; import com.jasamedika.medifirst2000.dto.SuratPesananSementaraDto; +import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; +import com.jasamedika.medifirst2000.entities.Generik; +import com.jasamedika.medifirst2000.entities.HasilPemeriksaanSwaPantauLimbahCair; import com.jasamedika.medifirst2000.entities.Jabatan; import com.jasamedika.medifirst2000.entities.LoginUser; import com.jasamedika.medifirst2000.entities.Pasien; +import com.jasamedika.medifirst2000.entities.PasienDaftar; import com.jasamedika.medifirst2000.entities.Pegawai; +import com.jasamedika.medifirst2000.entities.Ruangan; +import com.jasamedika.medifirst2000.entities.StrukPelayanan; import com.jasamedika.medifirst2000.exception.ServiceVOException; import com.jasamedika.medifirst2000.service.CatatanPerkembanganPasienTerintegrasiService; import com.jasamedika.medifirst2000.service.CssdSterilisasiService; @@ -159,7 +165,7 @@ public class ReportingController extends LocaleController private LoginUserService loginUserService; @Autowired - private ReportingPelayananRekamMedisService reportingPelayananRekamMedisService; + private ReportingPelayananRekamMedisService reportingPelayananRekamMedisService; @Autowired private RuanganDao ruanganDao; @@ -192,13 +198,13 @@ public class ReportingController extends LocaleController private TagihanRekananService tagihanRekananService; @Autowired - private StrukPelayananService strukPelayananService; + private StrukPelayananService strukPelayananService; @Autowired private ReportingDao reportingDao; @Autowired - private RegistrasiPelayananService registrasiPelayananService; + private RegistrasiPelayananService registrasiPelayananService; @Autowired private ObatGenerikDao obatGenerikDao; @@ -261,7 +267,7 @@ public class ReportingController extends LocaleController private JabatanDao jabatanDao; @Autowired - private ObatGenerikService obatGenerikService; + private ObatGenerikService obatGenerikService; @Autowired private MonitoringAbsenService monitoringAbsenService; @@ -288,7 +294,7 @@ public class ReportingController extends LocaleController private KelasDao kelasDao; @Autowired - private ReportingPegawaiService reportingPegawaiService; + private ReportingPegawaiService reportingPegawaiService; @Autowired private NeracaLimbahService neracaLimbahService; @@ -297,7 +303,7 @@ public class ReportingController extends LocaleController private PelayananPasienService pelayananPasienService; @Autowired - private HasilPemeriksaanSwaPantauLimbahCairService hasilPemeriksaanSwaPantauLimbahCairService; + private HasilPemeriksaanSwaPantauLimbahCairService hasilPemeriksaanSwaPantauLimbahCairService; @Autowired private CssdSterilisasiService cssdSterilisasiService; @@ -321,13 +327,13 @@ public class ReportingController extends LocaleController private ProdukService produkService; @Autowired - private RuanganService ruanganService; + private RuanganService ruanganService; @Autowired private KetersediaanTempatTidurService ketersediaanTempatTidurService; @Autowired - private PasienService pasienService; + private PasienService pasienService; @Autowired private CatatanPerkembanganPasienTerintegrasiService cpptService; @@ -3666,7 +3672,7 @@ public class ReportingController extends LocaleController .findListCheckOutKelengkapanByNoRegistrasi(noRegistrasi); List listCheckOutPemasangan = checkListProsedurKeselamatanPasienDao .findListCheckOutPemasanganByNoRegistrasi(noRegistrasi); - List listDiagnosa = checkListProsedurKeselamatanPasienDao.findDiagnosaByNoRegistrasi(noRegistrasi); +// List listDiagnosa = checkListProsedurKeselamatanPasienDao.findDiagnosaByNoRegistrasi(noRegistrasi); int beratBadan = 0; String namaPasien = ""; String noCm = ""; @@ -3953,12 +3959,12 @@ public class ReportingController extends LocaleController BarcodelabDto dto = new BarcodelabDto(); String barcode1 = "000000019020"; String barcode2 = "000000019110"; - List dataLab = laboratoriumDao.findListNoLab(noLab); + // List dataLab = laboratoriumDao.findListNoLab(noLab); List listData = new ArrayList(); String keterangan = "L0000000190-20 Urin"; String detail = "00000320/Andri/2016-12-04/Laboratorium Patologi Klinik"; - String pemeriksaan = ""; + // String pemeriksaan = ""; String nomorLab = ""; dto.setBarcode(nomorLab); dto.setKeterangan(keterangan); @@ -3986,11 +3992,11 @@ public class ReportingController extends LocaleController PerjanjianPasienDto dto = new PerjanjianPasienDto(); List listPerjanjianPasienDto = new ArrayList(); - String nocm = ""; - for (Object[] data : pasien) { - nocm = ((String) data[0]); - - } + // String nocm = ""; + // for (Object[] data : pasien) { + // nocm = ((String) data[0]); + // + // } List papInstruksiPerjanjian = new ArrayList(); for (Object[] data : papInstruksiPerjanjian) { dto.setNamaPasien(((String) data[0])); @@ -4095,9 +4101,9 @@ public class ReportingController extends LocaleController noCm = ((String) data[1]); namaPasien = ((String) data[2]); tglLahir = ((String) data[3]); - String bahanSample = ((String) data[4]); + // String bahanSample = ((String) data[4]); kdBahanSample = ((String) data[5]); - String namaRuangan = ((String) data[6]); + // String namaRuangan = ((String) data[6]); String hasilPemeriksaan = ((String) data[7]); String nilaiNormal = ((String) data[8]); keterangan = ((String) data[9]); @@ -4351,8 +4357,9 @@ public class ReportingController extends LocaleController LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec); String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null ? dto.getKartuPengendaliHeader().getNoUsulan() : ""; - String namaPengendali = dto.getKartuPengendaliHeader().getNamaPengendali() != null - ? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; + // String namaPengendali = + // dto.getKartuPengendaliHeader().getNamaPengendali() != null + // ? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan(); String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : ""; String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl).toString() : ""; @@ -4377,8 +4384,9 @@ public class ReportingController extends LocaleController LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec); String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null ? dto.getKartuPengendaliHeader().getNoUsulan() : ""; - String namaPengendali = dto.getKartuPengendaliHeader().getNamaPengendali() != null - ? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; + // String namaPengendali = + // dto.getKartuPengendaliHeader().getNamaPengendali() != null + // ? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan(); String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : ""; String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl).toString() : ""; @@ -4403,8 +4411,9 @@ public class ReportingController extends LocaleController LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec); String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null ? dto.getKartuPengendaliHeader().getNoUsulan() : ""; - String namaPengendali = dto.getKartuPengendaliHeader().getNamaPengendali() != null - ? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; + // String namaPengendali = + // dto.getKartuPengendaliHeader().getNamaPengendali() != null + // ? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan(); String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : ""; String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-yyyy").format(tgl).toString() : ""; @@ -4426,10 +4435,10 @@ public class ReportingController extends LocaleController @RequestParam(value = "format", required = false) String format, @RequestParam(value = "startDate", required = true) String startDate, @RequestParam(value = "endDate", required = true) String endDate) { - Map map = new HashMap(); + // Map map = new HashMap(); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); - String monthAllCaplock = month.toUpperCase(); + // String monthAllCaplock = month.toUpperCase(); List listKunjunganPasienStatusDanJenisPasienDto = new ArrayList(); List listStatusPasien = reportingPelayananRekamMedisService @@ -7697,14 +7706,12 @@ public class ReportingController extends LocaleController @RequestMapping(value = "/presensi-visite-dokter", method = RequestMethod.GET) public ResponseEntity>> presensiVisiteDokter(HttpServletRequest request, - @RequestParam(value = "startDate", required = true) Long startDate, - @RequestParam(value = "endDate", required = true) Long endDate, + @RequestParam(value = "periode", required = true) Long periode, @RequestParam(value = "ksmId", required = false) Integer idKsm, @RequestParam(value = "kkId", required = false) Integer idKk, @RequestParam(value = "drId", required = false) Integer idDr) { try { - List> result = cpptService.findPresensiVisiteDokter(idKsm, idKk, idDr, startDate, - endDate); + List> result = cpptService.findPresensiVisiteDokter(idKsm, idKk, idDr, periode); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);