salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- perubahan parameter menjadi periodik dari range waktu

Browse Source 
- penambahan data unit kerja pegawai presensi dokter dpjp untuk persiapan hak akses verifikasi
This commit is contained in:
salmanoe 2021-12-06 09:39:38 +07:00
parent a7cd0e15e8
commit e2f0be2d09
4 changed files with 63 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
View File

@ -493,10 +493,10 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends CrudRepository<MapPegaw
+ "and pg.jenisPegawaiId = 1 " + "and jb.levelJabatan = 5") + "and pg.jenisPegawaiId = 1 " + "and jb.levelJabatan = 5")
List<Integer> findAllDokterKelompokStafMedik(@Param("listKsmId") List<Integer> listIdKsm); List<Integer> findAllDokterKelompokStafMedik(@Param("listKsmId") List<Integer> listIdKsm);
String strDokter = "select distinct new Map(pg.id as pegawaiId,pg.nama as nama,pg.namaLengkap as namaLengkap) " 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 " + "mj.unitKerjaPegawaiId as ksmId) " + "from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
+ "where mj.statusEnabled is true " + "and pg.statusEnabled is true " + "and pg.jenisPegawaiId = 1 " + "inner join mj.jabatan jb " + "where mj.statusEnabled is true " + "and pg.statusEnabled is true "
+ "and jb.levelJabatan = 5 "; + "and pg.jenisPegawaiId = 1 " + "and jb.levelJabatan = 5 ";
String remun = "and mj.unitKerjaPegawaiId in (:ksmListId) and pg.kategoryPegawaiId in (1,10,14) "; String remun = "and mj.unitKerjaPegawaiId in (:ksmListId) and pg.kategoryPegawaiId in (1,10,14) ";

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/CatatanPerkembanganPasienTerintegrasiService.java
View File

@ -17,8 +17,8 @@ public interface CatatanPerkembanganPasienTerintegrasiService
List<Map<String, Object>> findDokter(Integer idKsm, Integer idKk, Integer idDr) throws JpaSystemException; List<Map<String, Object>> findDokter(Integer idKsm, Integer idKk, Integer idDr) throws JpaSystemException;
List<Map<String, Object>> findPresensiVisiteDokter(Integer idKsm, Integer idKk, Integer idDr, Long startDate, List<Map<String, Object>> findPresensiVisiteDokter(Integer idKsm, Integer idKk, Integer idDr, Long periode)
Long endDate) throws JpaSystemException; throws JpaSystemException;
Map<String, Object> findPresensiVisiteDokter(Integer idPegawai, Long bulan) throws JpaSystemException; Map<String, Object> findPresensiVisiteDokter(Integer idPegawai, Long bulan) throws JpaSystemException;

28
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganPasienTerintegrasiServiceImpl.java
View File

@ -2,9 +2,13 @@ package com.jasamedika.medifirst2000.service.impl;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime; 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.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
@ -205,25 +209,33 @@ public class CatatanPerkembanganPasienTerintegrasiServiceImpl extends BaseVoServ
* id kelompok kerja * id kelompok kerja
* @param idDr * @param idDr
* id pegawai dokter * id pegawai dokter
* @param startDate * @param periode
* tanggal awal pengambilan data * periode pengambilan data
* @param endDate
* tanggal akhir pengambilan data
* @return presensi visite dokter * @return presensi visite dokter
*/ */
@Override @Override
public List<Map<String, Object>> findPresensiVisiteDokter(Integer idKsm, Integer idKk, Integer idDr, Long startDate, public List<Map<String, Object>> findPresensiVisiteDokter(Integer idKsm, Integer idKk, Integer idDr, Long periode)
Long endDate) throws JpaSystemException { throws JpaSystemException {
List<Map<String, Object>> result = new ArrayList<>(); List<Map<String, Object>> result = new ArrayList<>();
List<Map<String, Object>> dataInit = new ArrayList<>(); List<Map<String, Object>> dataInit = new ArrayList<>();
List<Integer> listIdDokter = new ArrayList<>(); List<Integer> listIdDokter = new ArrayList<>();
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
DateFormat df_ina = new SimpleDateFormat("dd-MM-yyyy"); DateFormat df_ina = new SimpleDateFormat("dd-MM-yyyy");
DateFormat sf_ina = new SimpleDateFormat("HH:mm:ss"); 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<Map<String, Object>> listDokter = this.findDokter(idKsm, idKk, idDr); List<Map<String, Object>> listDokter = this.findDokter(idKsm, idKk, idDr);
for (Map<String, Object> map : listDokter) { for (Map<String, Object> map : listDokter) {

67
jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java
View File

@ -96,10 +96,16 @@ import com.jasamedika.medifirst2000.dto.PerjanjianPasienDto;
import com.jasamedika.medifirst2000.dto.ReportingPegawaiDto; import com.jasamedika.medifirst2000.dto.ReportingPegawaiDto;
import com.jasamedika.medifirst2000.dto.SensusHarianDto; import com.jasamedika.medifirst2000.dto.SensusHarianDto;
import com.jasamedika.medifirst2000.dto.SuratPesananSementaraDto; 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.Jabatan;
import com.jasamedika.medifirst2000.entities.LoginUser; import com.jasamedika.medifirst2000.entities.LoginUser;
import com.jasamedika.medifirst2000.entities.Pasien; import com.jasamedika.medifirst2000.entities.Pasien;
import com.jasamedika.medifirst2000.entities.PasienDaftar;
import com.jasamedika.medifirst2000.entities.Pegawai; 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.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.CatatanPerkembanganPasienTerintegrasiService; import com.jasamedika.medifirst2000.service.CatatanPerkembanganPasienTerintegrasiService;
import com.jasamedika.medifirst2000.service.CssdSterilisasiService; import com.jasamedika.medifirst2000.service.CssdSterilisasiService;
@ -159,7 +165,7 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
private LoginUserService loginUserService; private LoginUserService loginUserService;
@Autowired @Autowired
private ReportingPelayananRekamMedisService reportingPelayananRekamMedisService; private ReportingPelayananRekamMedisService<AntrianPasienDiPeriksa> reportingPelayananRekamMedisService;
@Autowired @Autowired
private RuanganDao ruanganDao; private RuanganDao ruanganDao;
@ -192,13 +198,13 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
private TagihanRekananService tagihanRekananService; private TagihanRekananService tagihanRekananService;
@Autowired @Autowired
private StrukPelayananService strukPelayananService; private StrukPelayananService<StrukPelayanan> strukPelayananService;
@Autowired @Autowired
private ReportingDao reportingDao; private ReportingDao reportingDao;
@Autowired @Autowired
private RegistrasiPelayananService registrasiPelayananService; private RegistrasiPelayananService<PasienDaftar> registrasiPelayananService;
@Autowired @Autowired
private ObatGenerikDao obatGenerikDao; private ObatGenerikDao obatGenerikDao;
@ -261,7 +267,7 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
private JabatanDao jabatanDao; private JabatanDao jabatanDao;
@Autowired @Autowired
private ObatGenerikService obatGenerikService; private ObatGenerikService<Generik> obatGenerikService;
@Autowired @Autowired
private MonitoringAbsenService monitoringAbsenService; private MonitoringAbsenService monitoringAbsenService;
@ -288,7 +294,7 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
private KelasDao kelasDao; private KelasDao kelasDao;
@Autowired @Autowired
private ReportingPegawaiService reportingPegawaiService; private ReportingPegawaiService<Pegawai> reportingPegawaiService;
@Autowired @Autowired
private NeracaLimbahService neracaLimbahService; private NeracaLimbahService neracaLimbahService;
@ -297,7 +303,7 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
private PelayananPasienService pelayananPasienService; private PelayananPasienService pelayananPasienService;
@Autowired @Autowired
private HasilPemeriksaanSwaPantauLimbahCairService hasilPemeriksaanSwaPantauLimbahCairService; private HasilPemeriksaanSwaPantauLimbahCairService<HasilPemeriksaanSwaPantauLimbahCair> hasilPemeriksaanSwaPantauLimbahCairService;
@Autowired @Autowired
private CssdSterilisasiService cssdSterilisasiService; private CssdSterilisasiService cssdSterilisasiService;
@ -321,13 +327,13 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
private ProdukService produkService; private ProdukService produkService;
@Autowired @Autowired
private RuanganService ruanganService; private RuanganService<Ruangan> ruanganService;
@Autowired @Autowired
private KetersediaanTempatTidurService ketersediaanTempatTidurService; private KetersediaanTempatTidurService ketersediaanTempatTidurService;
@Autowired @Autowired
private PasienService pasienService; private PasienService<Pasien> pasienService;
@Autowired @Autowired
private CatatanPerkembanganPasienTerintegrasiService cpptService; private CatatanPerkembanganPasienTerintegrasiService cpptService;
@ -3666,7 +3672,7 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
.findListCheckOutKelengkapanByNoRegistrasi(noRegistrasi); .findListCheckOutKelengkapanByNoRegistrasi(noRegistrasi);
List<Object[]> listCheckOutPemasangan = checkListProsedurKeselamatanPasienDao List<Object[]> listCheckOutPemasangan = checkListProsedurKeselamatanPasienDao
.findListCheckOutPemasanganByNoRegistrasi(noRegistrasi); .findListCheckOutPemasanganByNoRegistrasi(noRegistrasi);
List<Object[]> listDiagnosa = checkListProsedurKeselamatanPasienDao.findDiagnosaByNoRegistrasi(noRegistrasi); // List<Object[]> listDiagnosa = checkListProsedurKeselamatanPasienDao.findDiagnosaByNoRegistrasi(noRegistrasi);
int beratBadan = 0; int beratBadan = 0;
String namaPasien = ""; String namaPasien = "";
String noCm = ""; String noCm = "";
@ -3953,12 +3959,12 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
BarcodelabDto dto = new BarcodelabDto(); BarcodelabDto dto = new BarcodelabDto();
String barcode1 = "000000019020"; String barcode1 = "000000019020";
String barcode2 = "000000019110"; String barcode2 = "000000019110";
List<Object[]> dataLab = laboratoriumDao.findListNoLab(noLab); // List<Object[]> dataLab = laboratoriumDao.findListNoLab(noLab);
List<String> listData = new ArrayList<String>(); List<String> listData = new ArrayList<String>();
String keterangan = "L0000000190-20 Urin"; String keterangan = "L0000000190-20 Urin";
String detail = "00000320/Andri/2016-12-04/Laboratorium Patologi Klinik"; String detail = "00000320/Andri/2016-12-04/Laboratorium Patologi Klinik";
String pemeriksaan = ""; // String pemeriksaan = "";
String nomorLab = ""; String nomorLab = "";
dto.setBarcode(nomorLab); dto.setBarcode(nomorLab);
dto.setKeterangan(keterangan); dto.setKeterangan(keterangan);
@ -3986,11 +3992,11 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
PerjanjianPasienDto dto = new PerjanjianPasienDto(); PerjanjianPasienDto dto = new PerjanjianPasienDto();
List<PerjanjianPasienDto> listPerjanjianPasienDto = new ArrayList<PerjanjianPasienDto>(); List<PerjanjianPasienDto> listPerjanjianPasienDto = new ArrayList<PerjanjianPasienDto>();
String nocm = ""; // String nocm = "";
for (Object[] data : pasien) { // for (Object[] data : pasien) {
nocm = ((String) data[0]); // nocm = ((String) data[0]);
//
} // }
List<Object[]> papInstruksiPerjanjian = new ArrayList<Object[]>(); List<Object[]> papInstruksiPerjanjian = new ArrayList<Object[]>();
for (Object[] data : papInstruksiPerjanjian) { for (Object[] data : papInstruksiPerjanjian) {
dto.setNamaPasien(((String) data[0])); dto.setNamaPasien(((String) data[0]));
@ -4095,9 +4101,9 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
noCm = ((String) data[1]); noCm = ((String) data[1]);
namaPasien = ((String) data[2]); namaPasien = ((String) data[2]);
tglLahir = ((String) data[3]); tglLahir = ((String) data[3]);
String bahanSample = ((String) data[4]); // String bahanSample = ((String) data[4]);
kdBahanSample = ((String) data[5]); kdBahanSample = ((String) data[5]);
String namaRuangan = ((String) data[6]); // String namaRuangan = ((String) data[6]);
String hasilPemeriksaan = ((String) data[7]); String hasilPemeriksaan = ((String) data[7]);
String nilaiNormal = ((String) data[8]); String nilaiNormal = ((String) data[8]);
keterangan = ((String) data[9]); keterangan = ((String) data[9]);
@ -4351,8 +4357,9 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec); LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec);
String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null
? dto.getKartuPengendaliHeader().getNoUsulan() : ""; ? dto.getKartuPengendaliHeader().getNoUsulan() : "";
String namaPengendali = dto.getKartuPengendaliHeader().getNamaPengendali() != null // String namaPengendali =
? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; // dto.getKartuPengendaliHeader().getNamaPengendali() != null
// ? dto.getKartuPengendaliHeader().getNamaPengendali() : "";
Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan(); Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan();
String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : ""; String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : "";
String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-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<RegistrasiPelayananVO>
LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec); LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec);
String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null
? dto.getKartuPengendaliHeader().getNoUsulan() : ""; ? dto.getKartuPengendaliHeader().getNoUsulan() : "";
String namaPengendali = dto.getKartuPengendaliHeader().getNamaPengendali() != null // String namaPengendali =
? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; // dto.getKartuPengendaliHeader().getNamaPengendali() != null
// ? dto.getKartuPengendaliHeader().getNamaPengendali() : "";
Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan(); Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan();
String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : ""; String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : "";
String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-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<RegistrasiPelayananVO>
LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec); LampiranSPPHDto dto = reportService.generateLampiranSPPH(noRec);
String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null String noUsulan = dto.getKartuPengendaliHeader().getNoUsulan() != null
? dto.getKartuPengendaliHeader().getNoUsulan() : ""; ? dto.getKartuPengendaliHeader().getNoUsulan() : "";
String namaPengendali = dto.getKartuPengendaliHeader().getNamaPengendali() != null // String namaPengendali =
? dto.getKartuPengendaliHeader().getNamaPengendali() : ""; // dto.getKartuPengendaliHeader().getNamaPengendali() != null
// ? dto.getKartuPengendaliHeader().getNamaPengendali() : "";
Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan(); Date tgl = dto.getKartuPengendaliHeader().getTanggalUsulan();
String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : ""; String tahun = tgl != null ? new SimpleDateFormat("yyyy").format(tgl).toString() : "";
String tanggal = tgl != null ? new SimpleDateFormat("dd-MM-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<RegistrasiPelayananVO>
@RequestParam(value = "format", required = false) String format, @RequestParam(value = "format", required = false) String format,
@RequestParam(value = "startDate", required = true) String startDate, @RequestParam(value = "startDate", required = true) String startDate,
@RequestParam(value = "endDate", required = true) String endDate) { @RequestParam(value = "endDate", required = true) String endDate) {
Map<String, Object> map = new HashMap<String, Object>(); // Map<String, Object> map = new HashMap<String, Object>();
String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date())))); String month = (formatBulan(Integer.valueOf(new SimpleDateFormat("MM").format(new Date()))));
String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1); String monthFirstCaplock = Character.toString(month.charAt(0)).toUpperCase() + month.substring(1);
String monthAllCaplock = month.toUpperCase(); // String monthAllCaplock = month.toUpperCase();
List<KunjunganPasienStatusDanJenisPasienDto2> listKunjunganPasienStatusDanJenisPasienDto = new ArrayList<KunjunganPasienStatusDanJenisPasienDto2>(); List<KunjunganPasienStatusDanJenisPasienDto2> listKunjunganPasienStatusDanJenisPasienDto = new ArrayList<KunjunganPasienStatusDanJenisPasienDto2>();
List<Object[]> listStatusPasien = reportingPelayananRekamMedisService List<Object[]> listStatusPasien = reportingPelayananRekamMedisService
@ -7697,14 +7706,12 @@ public class ReportingController extends LocaleController<RegistrasiPelayananVO>
@RequestMapping(value = "/presensi-visite-dokter", method = RequestMethod.GET) @RequestMapping(value = "/presensi-visite-dokter", method = RequestMethod.GET)
public ResponseEntity<List<Map<String, Object>>> presensiVisiteDokter(HttpServletRequest request, public ResponseEntity<List<Map<String, Object>>> presensiVisiteDokter(HttpServletRequest request,
@RequestParam(value = "startDate", required = true) Long startDate, @RequestParam(value = "periode", required = true) Long periode,
@RequestParam(value = "endDate", required = true) Long endDate,
@RequestParam(value = "ksmId", required = false) Integer idKsm, @RequestParam(value = "ksmId", required = false) Integer idKsm,
@RequestParam(value = "kkId", required = false) Integer idKk, @RequestParam(value = "kkId", required = false) Integer idKk,
@RequestParam(value = "drId", required = false) Integer idDr) { @RequestParam(value = "drId", required = false) Integer idDr) {
try { try {
List<Map<String, Object>> result = cpptService.findPresensiVisiteDokter(idKsm, idKk, idDr, startDate, List<Map<String, Object>> result = cpptService.findPresensiVisiteDokter(idKsm, idKk, idDr, periode);
endDate);
mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
getMessage(MessageResource.LABEL_SUCCESS, request)); getMessage(MessageResource.LABEL_SUCCESS, request));
return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);