From 529e3d4874a7a254dd93960f0a2c6e75479f7b8a Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Thu, 2 Nov 2023 09:53:50 +0700 Subject: [PATCH] Update service pasien Cleaning code --- .../BridgingDaftarOnlineController.java | 370 ++++++------------ .../medifirst2000/dao/PasienDao.java | 5 +- .../medifirst2000/service/PasienService.java | 13 +- .../service/impl/PasienServiceImpl.java | 177 +++------ .../jasamedika/medifirst2000/vo/PasienVO.java | 361 +---------------- 5 files changed, 175 insertions(+), 751 deletions(-) diff --git a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java index 8f176b2c..6c51f35e 100644 --- a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java +++ b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java @@ -1,90 +1,38 @@ package com.jasamedika.medifirst2000.controller; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.dto.BatalRegistrasiDto; +import com.jasamedika.medifirst2000.dto.RegistrasiPasienDto; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.enums.TipePasienEnum; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.*; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.util.DateUtil; +import com.jasamedika.medifirst2000.vo.*; +import com.jasamedika.medifirst2000.vo.custom.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.jasamedika.medifirst2000.dto.BatalRegistrasiDto; -import com.jasamedika.medifirst2000.dto.RegistrasiPasienDto; -import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi; -import com.jasamedika.medifirst2000.entities.JadwalDokter; -import com.jasamedika.medifirst2000.entities.JadwalPraktek; -import com.jasamedika.medifirst2000.entities.KelompokPasien; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.entities.Pendidikan; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.enums.TipePasienEnum; -import com.jasamedika.medifirst2000.service.AntrianPasienDiPeriksaService; -import com.jasamedika.medifirst2000.service.AntrianPasienRegistrasiService; -import com.jasamedika.medifirst2000.service.BatalRegistrasiService; -import com.jasamedika.medifirst2000.service.BridgingService; -import com.jasamedika.medifirst2000.service.JadwalDokterService; -import com.jasamedika.medifirst2000.service.JadwalOperasiService; -import com.jasamedika.medifirst2000.service.JadwalPraktikDokterService; -import com.jasamedika.medifirst2000.service.ModelService; -import com.jasamedika.medifirst2000.service.PasienDaftarService; -import com.jasamedika.medifirst2000.service.PasienService; -import com.jasamedika.medifirst2000.service.PegawaiService; -import com.jasamedika.medifirst2000.service.RegistrasiPasienService; -import com.jasamedika.medifirst2000.service.RuanganService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.vo.AlamatVO; -import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO; -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.RegistrasiSmsVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarCaraBayarListVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarCaraBayarVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarJadwalDokterListVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarJadwalDokterVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarJadwalJamKunjunganListVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarJadwalJamKunjunganVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarKlinikListVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarKlinikVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarPasienDaftarBaruConsumeVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarPasienDaftarConsumeVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarPasienDaftarFailedProduceVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarPasienDaftarFailedVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarPasienDaftarOkProduceVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarPasienDaftarOkVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarVerifikasiPasienConsumeVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarVerifikasiPasienFoundReplyProduceVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarVerifikasiPasienFoundReplyVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarVerifikasiPasienNotFoundReplyProduceVO; -import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarVerifikasiPasienNotFoundReplyVO; +import javax.validation.Valid; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.util.*; @RestController @RequestMapping("/daftar-ol") public class BridgingDaftarOnlineController { + @Autowired private ModelService modelServiceRuangan; @Autowired - private PasienService pasienService; + private PasienService pasienService; @Autowired private RuanganService ruanganService; @@ -123,13 +71,11 @@ public class BridgingDaftarOnlineController { public BridgeDaftarKlinikListVO daftarKlinikRs() { BridgeDaftarKlinikListVO y = new BridgeDaftarKlinikListVO(); List> ruanganT = bridgingService.getJadwalKlinik(); - for (Map ruanganTmp : ruanganT) { BridgeDaftarKlinikVO x = new BridgeDaftarKlinikVO(); x.setIdKlinik(ruanganTmp.get("id").toString()); x.setNamaKlinik(ruanganTmp.get("namaRuangan").toString()); x.setHari(ruanganTmp.get("hari").toString()); - if (CommonUtil.isNullOrEmpty(ruanganTmp.get("jamBuka"))) { x.setJamBukaPelayanan(""); } else { @@ -143,7 +89,7 @@ public class BridgingDaftarOnlineController { Calendar cal = Calendar.getInstance(); DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); x.setUpdate(dateFormat.format(cal.getTime())); - x.setKuota(30);// dari antrian + x.setKuota(30); y.addBridgePendaftaranDaftarKlinikVO(x); } return y; @@ -152,77 +98,63 @@ public class BridgingDaftarOnlineController { @SuppressWarnings("unchecked") @RequestMapping(value = "/jadwal_dokters", method = RequestMethod.GET, produces = { MediaType.APPLICATION_XML_VALUE }) - // public BridgeDaftarJadwalDokterListVO jadwalDokterRs() { public BridgeDaftarJadwalDokterListVO jadwalDokterRs() { BridgeDaftarJadwalDokterListVO y = new BridgeDaftarJadwalDokterListVO(); List> ruanganT = modelServiceRuangan.getAllData("Ruangan", "id,departemenId", 1500, null, null, null, null, null, null, null, null, null, null); - ArrayList ytemp = new ArrayList(); - - for (int i = 0; i < ruanganT.size(); i++) { - Integer deptId = (Integer) ruanganT.get(i).get("departemenId"); - if (deptId != null) { - if (((Integer) ruanganT.get(i).get("departemenId") == 18) - || ((Integer) ruanganT.get(i).get("departemenId") == 28)) { - // Hanya di departement ruang RJ dan rehab medik saja - ytemp.add((Integer) ruanganT.get(i).get("id")); - } - } + ArrayList ytemp = new ArrayList<>(); + for (Map stringObjectMap : ruanganT) { + Integer deptId = (Integer) stringObjectMap.get("departemenId"); + if (deptId != null) + if (((Integer) stringObjectMap.get("departemenId") == 18) + || ((Integer) stringObjectMap.get("departemenId") == 28)) + ytemp.add((Integer) stringObjectMap.get("id")); } - // System.out.println(ytemp.size()); - for (int idruang = 0; idruang < ytemp.size(); idruang++) { - Map jd = new HashMap<>(); + for (Integer integer : ytemp) { + Map jd; try { - jd = jadwalDokterService.findByRuangan(ytemp.get(idruang)); + jd = jadwalDokterService.findByRuangan(integer); } catch (Exception ex) { jd = null; } - if (jd != null) { + if (jd != null) if (jd.get("data") != null) { List temp = (List) jd.get("data"); - - for (int i = 0; i < temp.size(); i++) { + for (JadwalDokter jadwalDokter : temp) { BridgeDaftarJadwalDokterVO x = new BridgeDaftarJadwalDokterVO(); - - x.setIdKlinik(temp.get(i).getRuangan().getId().toString()); + x.setIdKlinik(jadwalDokter.getRuangan().getId().toString()); String hari = bridgingService - .getTanggalJadwal(DateUtil.dayOfWeek(temp.get(i).getTanggalJadwal())); + .getTanggalJadwal(DateUtil.dayOfWeek(jadwalDokter.getTanggalJadwal())); x.setHari(hari); - JadwalPraktek jp = temp.get(i).getJadwalPraktek(); + JadwalPraktek jp = jadwalDokter.getJadwalPraktek(); if (CommonUtil.isNotNullOrEmpty(jp.getJamPraktek())) { String[] pp = jp.getJamPraktek().split("-"); if (pp.length == 2) { x.setJamTutupPraktek(pp[1]); x.setJamMulaiPraktek(pp[0]); - } else { - // System.out.println("Invalid len:" + - // jp.getJamPraktek()); } } else { x.setJamTutupPraktek(""); x.setJamMulaiPraktek(""); } - - if (CommonUtil.isNotNullOrEmpty(temp.get(i).getQuota())) { - x.setKuota(temp.get(i).getQuota().toString()); + if (CommonUtil.isNotNullOrEmpty(jadwalDokter.getQuota())) { + x.setKuota(jadwalDokter.getQuota().toString()); } else { x.setKuota("30"); } try { - x.setIddokter(temp.get(i).getDokter().getId().toString()); - x.setNamadokter(temp.get(i).getDokter().getNamaLengkap()); + x.setIddokter(jadwalDokter.getDokter().getId().toString()); + x.setNamadokter(jadwalDokter.getDokter().getNamaLengkap()); } catch (Exception ex) { x.setIddokter("?"); x.setNamadokter("?"); } - Calendar cal = Calendar.getInstance(); DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); x.setUpdate(dateFormat.format(cal.getTime())); y.addBridgePendaftaranJadwalDokterVO(x); } } - } } return y; } @@ -230,80 +162,63 @@ public class BridgingDaftarOnlineController { @SuppressWarnings("unchecked") @RequestMapping(value = "/jadwal_dokter_rev", method = RequestMethod.GET, produces = { MediaType.APPLICATION_XML_VALUE }) - // public BridgeDaftarJadwalDokterListVO jadwalDokterRs() { public BridgeDaftarJadwalDokterListVO jadwalDokterRse() { BridgeDaftarJadwalDokterListVO y = new BridgeDaftarJadwalDokterListVO(); - List filterTemp = new ArrayList(); + List filterTemp = new ArrayList<>(); List> ruanganT = modelServiceRuangan.getAllData("Ruangan", "id,departemenId", 1500, null, null, null, null, null, null, null, null, null, null); - ArrayList ytemp = new ArrayList(); - - for (int i = 0; i < ruanganT.size(); i++) { - Integer deptId = (Integer) ruanganT.get(i).get("departemenId"); - if (deptId != null) { - if (((Integer) ruanganT.get(i).get("departemenId") == 18) - || ((Integer) ruanganT.get(i).get("departemenId") == 28)) { - // Hanya di departement ruang RJ dan rehab medik saja - ytemp.add((Integer) ruanganT.get(i).get("id")); - } - } + ArrayList ytemp = new ArrayList<>(); + for (Map stringObjectMap : ruanganT) { + Integer deptId = (Integer) stringObjectMap.get("departemenId"); + if (deptId != null) + if (((Integer) stringObjectMap.get("departemenId") == 18) + || ((Integer) stringObjectMap.get("departemenId") == 28)) + ytemp.add((Integer) stringObjectMap.get("id")); } - - // System.out.print("ruangan yang benar"); - // System.out.println(ytemp.size()); - for (int idruang = 0; idruang < ytemp.size(); idruang++) { - Map jd = new HashMap<>(); + for (Integer integer : ytemp) { + Map jd; try { - jd = jadwalDokterService.findByRuangan(ytemp.get(idruang)); + jd = jadwalDokterService.findByRuangan(integer); } catch (Exception ex) { jd = null; } - if (jd != null) { + if (jd != null) if (jd.get("data") != null) { List temp = (List) jd.get("data"); - - for (int i = 0; i < temp.size(); i++) { + for (JadwalDokter jadwalDokter : temp) { BridgeDaftarJadwalDokterVO x = new BridgeDaftarJadwalDokterVO(); - - x.setIdKlinik(temp.get(i).getRuangan().getId().toString()); + x.setIdKlinik(jadwalDokter.getRuangan().getId().toString()); String hari = bridgingService - .getTanggalJadwal(DateUtil.dayOfWeek(temp.get(i).getTanggalJadwal())); + .getTanggalJadwal(DateUtil.dayOfWeek(jadwalDokter.getTanggalJadwal())); x.setHari(hari); - if (CommonUtil.isNullOrEmpty(hari)) { + if (CommonUtil.isNullOrEmpty(hari)) x.setHari(""); - } - JadwalPraktek jp = temp.get(i).getJadwalPraktek(); + JadwalPraktek jp = jadwalDokter.getJadwalPraktek(); if (CommonUtil.isNotNullOrEmpty(jp.getJamPraktek())) { String[] pp = jp.getJamPraktek().split("-"); if (pp.length == 2) { x.setJamTutupPraktek(pp[1]); x.setJamMulaiPraktek(pp[0]); - } else { - // System.out.println("Invalid len:" + - // jp.getJamPraktek()); } } else { x.setJamTutupPraktek(""); x.setJamMulaiPraktek(""); } - - if (CommonUtil.isNotNullOrEmpty(temp.get(i).getQuota())) { - x.setKuota(temp.get(i).getQuota().toString()); + if (CommonUtil.isNotNullOrEmpty(jadwalDokter.getQuota())) { + x.setKuota(jadwalDokter.getQuota().toString()); } else { x.setKuota("30"); } try { - x.setIddokter(temp.get(i).getDokter().getId().toString()); - x.setNamadokter(temp.get(i).getDokter().getNamaLengkap()); + x.setIddokter(jadwalDokter.getDokter().getId().toString()); + x.setNamadokter(jadwalDokter.getDokter().getNamaLengkap()); } catch (Exception ex) { x.setIddokter("?"); x.setNamadokter("?"); } - Calendar cal = Calendar.getInstance(); DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); x.setUpdate(dateFormat.format(cal.getTime())); - if (!filterTemp.contains(x)) { filterTemp.add(x); y.addBridgePendaftaranJadwalDokterVO(x); @@ -311,7 +226,6 @@ public class BridgingDaftarOnlineController { } } - } } return y; } @@ -321,10 +235,8 @@ public class BridgingDaftarOnlineController { public BridgeDaftarJadwalDokterListVO jadwalDokterRseRev() { BridgeDaftarJadwalDokterListVO y = new BridgeDaftarJadwalDokterListVO(); List> data = jadwalPraktikDokterService.findAllJadwalPraktikDokter(); - Calendar cal = Calendar.getInstance(); DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - for (Map map : data) { BridgeDaftarJadwalDokterVO bridge = new BridgeDaftarJadwalDokterVO(); bridge.setHari(map.get("namaHari").toString()); @@ -337,23 +249,21 @@ public class BridgingDaftarOnlineController { bridge.setUpdate(dateFormat.format(cal.getTime())); y.addBridgePendaftaranJadwalDokterVO(bridge); } - return y; } @RequestMapping(value = "/jam_kunjungan", method = RequestMethod.GET, produces = { MediaType.APPLICATION_XML_VALUE }) - public BridgeDaftarJadwalJamKunjunganListVO jamKunjungan( - @RequestParam(value = "idklinik", required = true) Integer idKlinik, - @RequestParam(value = "iddokter", required = true) Integer idDokter, + public BridgeDaftarJadwalJamKunjunganListVO jamKunjungan(@RequestParam(value = "idklinik") Integer idKlinik, + @RequestParam(value = "iddokter") Integer idDokter, @RequestParam(value = "tanggal", required = false) String tgl) { BridgeDaftarJadwalJamKunjunganListVO y = new BridgeDaftarJadwalJamKunjunganListVO(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - Date tanggal = null; + Date tanggal; try { tanggal = formatter.parse(tgl); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } Calendar calendar = Calendar.getInstance(); calendar.setTime(tanggal); @@ -380,14 +290,12 @@ public class BridgingDaftarOnlineController { @RequestMapping(value = "/cara_bayar", method = RequestMethod.GET, produces = { MediaType.APPLICATION_XML_VALUE }) public BridgeDaftarCaraBayarListVO caraBayar() { BridgeDaftarCaraBayarListVO y = new BridgeDaftarCaraBayarListVO(); - List> caraBayar = modelServiceRuangan.getAllData("KelompokPasien", "*", 1500, null, null, null, null, null, null, null, null, null, null); - - for (int i = 0; i < caraBayar.size(); i++) { + for (Map stringObjectMap : caraBayar) { BridgeDaftarCaraBayarVO x = new BridgeDaftarCaraBayarVO(); - x.setIdCaraBayar(caraBayar.get(i).get("id").toString()); - x.setDeskripsi(caraBayar.get(i).get("kelompokPasien").toString()); + x.setIdCaraBayar(stringObjectMap.get("id").toString()); + x.setDeskripsi(stringObjectMap.get("kelompokPasien").toString()); y.addBridgeDaftarCaraBayarVO(x); } return y; @@ -396,61 +304,47 @@ public class BridgingDaftarOnlineController { @RequestMapping(value = "/verifikasi_pasien", method = RequestMethod.POST, produces = { MediaType.APPLICATION_XML_VALUE }, consumes = { MediaType.APPLICATION_XML_VALUE }) public Object verifikasiPasien(@RequestBody BridgeDaftarVerifikasiPasienConsumeVO vox) { - System.out.print("NoCM:"); - System.out.println(vox.getObjVO().getNoCM()); PasienVO p = pasienService.findByNoCm(vox.getObjVO().getNoCM()); - Boolean pasienExist = false; - if (p != null) { - pasienExist = true; - } else { - System.out.println("p is null"); - } - + boolean pasienExist = p != null; DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); String dd_post = vox.getObjVO().getTglLahir(); - String dd = ""; - if (pasienExist) { + if (pasienExist) dd = dateFormat.format(p.getTglLahir()); - } - - // System.out.println(dd + "vs" + dd_post); - if (dd.equals(dd_post)) { - BridgeDaftarVerifikasiPasienFoundReplyVO y = new BridgeDaftarVerifikasiPasienFoundReplyVO(); - String notel = p.getNoTelepon(); - if (notel == null) { - notel = ""; - } - y.setNomorContact(notel); - y.setNama(p.getNamaPasien()); - y.setAlamat(""); - for (AlamatVO alamatVO : p.getAlamats()) { - y.setAlamat(alamatVO.getAlamatLengkap()); - break; - } - y.setTgllahir(vox.getObjVO().getTglLahir()); - y.setStatus(true); - BridgeDaftarVerifikasiPasienFoundReplyProduceVO ret = new BridgeDaftarVerifikasiPasienFoundReplyProduceVO( - y); - return ret; + if (dd.equals(dd_post) && p != null) { + return getProduceVO(vox, p); } else { BridgeDaftarVerifikasiPasienNotFoundReplyVO z = new BridgeDaftarVerifikasiPasienNotFoundReplyVO(); z.setPesan("Tidak ada"); z.setStatus(false); - BridgeDaftarVerifikasiPasienNotFoundReplyProduceVO ret = new BridgeDaftarVerifikasiPasienNotFoundReplyProduceVO( - z); - return ret; + return new BridgeDaftarVerifikasiPasienNotFoundReplyProduceVO(z); } } + private static BridgeDaftarVerifikasiPasienFoundReplyProduceVO getProduceVO( + BridgeDaftarVerifikasiPasienConsumeVO vox, PasienVO p) { + BridgeDaftarVerifikasiPasienFoundReplyVO y = new BridgeDaftarVerifikasiPasienFoundReplyVO(); + String notel = p.getNoTelepon(); + if (notel == null) + notel = ""; + y.setNomorContact(notel); + y.setNama(p.getNamaPasien()); + y.setAlamat(""); + for (AlamatVO alamatVO : p.getAlamats()) { + y.setAlamat(alamatVO.getAlamatLengkap()); + break; + } + y.setTgllahir(vox.getObjVO().getTglLahir()); + y.setStatus(true); + return new BridgeDaftarVerifikasiPasienFoundReplyProduceVO(y); + } + @RequestMapping(value = "/pendaftaran_pasien", method = RequestMethod.POST, produces = { MediaType.APPLICATION_XML_VALUE }, consumes = { MediaType.APPLICATION_XML_VALUE }) public Object pendaftaranPasien(@RequestBody BridgeDaftarPasienDaftarConsumeVO vox) { - RegistrasiSmsVO vo = new RegistrasiSmsVO(); Pasien p = new Pasien(); - boolean pasienValid = false; - System.out.println("service re-register registered patient has entered"); + boolean pasienValid; try { p = pasienService.findPasienByNoCm(vox.getData().getNoCM()); pasienValid = true; @@ -463,97 +357,66 @@ public class BridgingDaftarOnlineController { vo.setTanggal(dateFormat.parse(vox.getData().getTglKunjungan())); } catch (ParseException e) { vo.setTanggal(new Date()); - e.printStackTrace(); } vo.setTanggallahir(p.getTglLahir()); } catch (Exception ex) { pasienValid = false; } - AntrianPasienRegistrasi model = new AntrianPasienRegistrasi(); AntrianPasienRegistrasi hasil = null; UUID noReservasi = null; - Pegawai pegawai = new Pegawai(); - pegawai = pegawaiService.getById(Integer.parseInt(vox.getData().getIdDokter())); + Pegawai pegawai = pegawaiService.getById(Integer.parseInt(vox.getData().getIdDokter())); if (pasienValid) { Ruangan ruangan = ruanganService.findRuanganByDepartemenAndKdRuangan(vo.getKodeRuangan()); - //// print in log - System.out.println("CaraBayar " + vox.getData().getCaraBayar()); - System.out.println("IdDokter " + vox.getData().getIdDokter()); - System.out.println("Klinik " + vox.getData().getIdPoli()); - System.out.println("Jam Kunjungan " + vox.getData().getTglKunjungan()); - System.out.println("nocm " + vox.getData().getNoCM()); - System.out.println("nomor Kontak " + vox.getData().getNomorContact()); - System.out.println("tglDaftar " + vox.getData().getTanggalDaftar()); - System.out.println("tglkunjungan " + vox.getData().getTglKunjungan()); - //// model.setPasien(p); model.setRuangan(ruangan); model.setPegawai(pegawai); model.setPendidikan(p.getPendidikan()); model.setTipePasien(TipePasienEnum.LAMA.getVal()); model.setTglReservasi(vo.getTanggal()); - model.setType(vo.getKodeRegulerEkslusif().equals("0") ? "REGULER" - : (vo.getKodeRegulerEkslusif().equals("1") ? "EKSLUSIF" : "")); + model.setType(vo.getKodeRegulerEkslusif() == 1 ? "REGULER" + : (vo.getKodeRegulerEkslusif() == 2 ? "EKSLUSIF" : "")); model.setJenisKelamin(p.getJenisKelamin()); noReservasi = UUID.randomUUID(); model.setNoReservasi(noReservasi.toString().substring(1, 8)); List antrianPasienRegistrasi = antrianPasienRegistrasiService.findAntrianPasienLamaRegistrasi( p.getNoCm(), Integer.parseInt(vo.getKodeRuangan()), Integer.parseInt(vox.getData().getIdDokter()), vox.getData().getTglKunjungan()); - if (CommonUtil.isNullOrEmpty(antrianPasienRegistrasi)) { + if (CommonUtil.isNullOrEmpty(antrianPasienRegistrasi)) hasil = antrianPasienRegistrasiService.simpan(model); - } } if (hasil != null) { BridgeDaftarPasienDaftarOkVO y = new BridgeDaftarPasienDaftarOkVO(); y.setNomorReservasi(noReservasi.toString().substring(1, 8)); y.setJamKunjungan(vox.getData().getTglKunjungan()); y.setStatus(true); - BridgeDaftarPasienDaftarOkProduceVO ret = new BridgeDaftarPasienDaftarOkProduceVO(y); - return ret; + return new BridgeDaftarPasienDaftarOkProduceVO(y); } else { BridgeDaftarPasienDaftarFailedVO z = new BridgeDaftarPasienDaftarFailedVO(); z.setPesan("Gagal Daftar"); z.setStatus(false); - BridgeDaftarPasienDaftarFailedProduceVO ret = new BridgeDaftarPasienDaftarFailedProduceVO(z); - return ret; + return new BridgeDaftarPasienDaftarFailedProduceVO(z); } - } @RequestMapping(value = "/pendaftaran_pasien_baru", method = RequestMethod.POST, produces = { MediaType.APPLICATION_XML_VALUE }, consumes = { MediaType.APPLICATION_XML_VALUE }) public Object pendaftaranPasienBaru(@RequestBody BridgeDaftarPasienDaftarBaruConsumeVO vo) { - AntrianPasienRegistrasi model = new AntrianPasienRegistrasi(); AntrianPasienRegistrasi hasil = null; UUID noReservasi = null; DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); DateFormat hourFormat = new SimpleDateFormat("HH:mm"); - //// - System.out.println("CaraBayar " + vo.getData().getCarabayar()); - System.out.println("IdDokter " + vo.getData().getIdDokter()); - System.out.println("Klinik " + vo.getData().getIdKlinik()); - System.out.println("Jam Kunjungan " + vo.getData().getJamKunjungan()); - System.out.println("NamaPasien " + vo.getData().getNamaPasien()); - System.out.println("nomor Kontak " + vo.getData().getNomorKontak()); - System.out.println("tempat lahir " + vo.getData().getTempatLahir()); - System.out.println("tglkunjungan " + vo.getData().getTglKunjungan()); - System.out.println("tglLahir " + vo.getData().getTglLahir()); - //// String jamKunjungan = ""; if (CommonUtil.isNotNullOrEmpty(vo.getData())) { Ruangan ruangan = ruanganService.findRuanganByDepartemenAndKdRuangan(vo.getData().getIdKlinik()); Pendidikan pendidikan = bridgingService.findByIdPendidikan(13); - Integer ids = 1; - if (vo.getData().getCarabayar().toString().toLowerCase().equals("jkn") - || vo.getData().getCarabayar().toString().toLowerCase().equals("jamkesda")) { + int ids = 1; + if (vo.getData().getCarabayar().equalsIgnoreCase("jkn") + || vo.getData().getCarabayar().equalsIgnoreCase("jamkesda")) ids = 2; - } KelompokPasien kelompokPasien = bridgingService.findKelompokPasienById(ids); - Pegawai pegawai = new Pegawai(); - pegawai = pegawaiService.getById(Integer.parseInt(vo.getData().getIdDokter())); + Pegawai pegawai = pegawaiService.getById(Integer.parseInt(vo.getData().getIdDokter())); model.setNamaPasien(vo.getData().getNamaPasien()); model.setTempatLahir(vo.getData().getTempatLahir()); model.setNoTelepon(vo.getData().getNomorKontak()); @@ -564,20 +427,17 @@ public class BridgingDaftarOnlineController { model.setTipePasien(TipePasienEnum.BARU.getVal()); model.setPendidikan(pendidikan); String tanggal = vo.getData().getTglKunjungan(); - Date tglReservasi = null; - Date jamReservasi = null; + Date jamReservasi; try { - if (CommonUtil.isNotNullOrEmpty(tanggal)) { + if (CommonUtil.isNotNullOrEmpty(tanggal)) tglReservasi = dateFormat.parse(tanggal); - } if (CommonUtil.isNotNullOrEmpty(vo.getData().getJamKunjungan())) { jamKunjungan = vo.getData().getJamKunjungan(); - jamReservasi = hourFormat.parse(jamKunjungan); } else { jamKunjungan = "10:00"; - jamReservasi = hourFormat.parse(jamKunjungan); } + jamReservasi = hourFormat.parse(jamKunjungan); if (CommonUtil.isNotNullOrEmpty(vo.getData().getTglLahir())) { Date tglLahir = dateFormat.parse(vo.getData().getTglLahir()); model.setTglLahir(tglLahir); @@ -585,10 +445,8 @@ public class BridgingDaftarOnlineController { Date reservasi = concatenateTime(tglReservasi, jamReservasi); model.setTglReservasi(reservasi); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - // model.setJenisKelamin(p.getJenisKelamin()); - noReservasi = UUID.randomUUID(); model.setNoReservasi(noReservasi.toString().substring(1, 8)); List antrianPasienRegistrasi = antrianPasienRegistrasiService.findAntrianPasienRegistrasi( @@ -599,35 +457,28 @@ public class BridgingDaftarOnlineController { hasil = antrianPasienRegistrasiService.simpan(model); } } - if (hasil != null) { BridgeDaftarPasienDaftarOkVO y = new BridgeDaftarPasienDaftarOkVO(); y.setNomorReservasi(noReservasi.toString().substring(1, 8)); y.setJamKunjungan(jamKunjungan); y.setStatus(true); - BridgeDaftarPasienDaftarOkProduceVO ret = new BridgeDaftarPasienDaftarOkProduceVO(y); - return ret; + return new BridgeDaftarPasienDaftarOkProduceVO(y); } else { BridgeDaftarPasienDaftarFailedVO z = new BridgeDaftarPasienDaftarFailedVO(); z.setPesan("Gagal Daftar"); z.setStatus(false); - BridgeDaftarPasienDaftarFailedProduceVO ret = new BridgeDaftarPasienDaftarFailedProduceVO(z); - return ret; + return new BridgeDaftarPasienDaftarFailedProduceVO(z); } - } public Date concatenateTime(Date date, Date time) { Calendar aDateTime = Calendar.getInstance(); Calendar aDate = Calendar.getInstance(); - - if (CommonUtil.isNotNullOrEmpty(date)) { + if (CommonUtil.isNotNullOrEmpty(date)) aDate.setTime(date); - } Calendar aTime = Calendar.getInstance(); - if (CommonUtil.isNotNullOrEmpty(time)) { + if (CommonUtil.isNotNullOrEmpty(time)) aTime.setTime(time); - } aDateTime.set(Calendar.DAY_OF_MONTH, aDate.get(Calendar.DAY_OF_MONTH)); aDateTime.set(Calendar.MONTH, aDate.get(Calendar.MONTH)); aDateTime.set(Calendar.YEAR, aDate.get(Calendar.YEAR)); @@ -656,7 +507,6 @@ public class BridgingDaftarOnlineController { return new ResponseEntity<>(result.getId(), HttpStatus.CREATED); return new ResponseEntity<>(null, HttpStatus.NOT_ACCEPTABLE); } catch (Exception e) { - e.printStackTrace(); return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); } } @@ -696,7 +546,6 @@ public class BridgingDaftarOnlineController { String result = registrasiPasienService.saveRegistrasiPasien(dto); return new ResponseEntity<>(result, HttpStatus.CREATED); } catch (Exception e) { - e.printStackTrace(); return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); } } @@ -726,7 +575,6 @@ public class BridgingDaftarOnlineController { Map result = batalRegistrasiService.batalAntrian(dto); return new ResponseEntity<>(result, HttpStatus.CREATED); } catch (Exception e) { - e.printStackTrace(); return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); } } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java index d77e4481..8e353251 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java @@ -6,7 +6,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Lock; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import javax.persistence.LockModeType; import java.util.List; @@ -18,7 +17,6 @@ import java.util.Set; * * @author Askur */ -@Repository("PasienDao") public interface PasienDao extends JpaRepository { @Query("select model from Pasien model where model.noCm = :noCm") List findPasienBynoCm(@Param("noCm") String noCm); @@ -42,7 +40,8 @@ public interface PasienDao extends JpaRepository { @Query("select model from Pasien model where model.noCm = :noCm") List findByNoCm(@Param("noCm") String noCm); - @Query("select a.noCm, a.namaPasien, to_char(a.tglLahir,'yyyy-MM-dd'), a.jenisKelamin.jenisKelamin from Pasien a where a.noCm= :noCm") + @Query("select a.noCm, a.namaPasien, to_char(a.tglLahir,'yyyy-MM-dd'), a.jenisKelamin.jenisKelamin " + + "from Pasien a where a.noCm= :noCm") List findByNocm(@Param("noCm") String noCm); @Query("select model from Pasien model where model.noCm = :noCm") diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienService.java index 73e4e9aa..78a9c7fa 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienService.java @@ -1,18 +1,18 @@ package com.jasamedika.medifirst2000.service; -import java.util.List; -import java.util.Map; - import com.jasamedika.medifirst2000.entities.Pasien; import com.jasamedika.medifirst2000.vo.PasienVO; import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO; +import java.util.List; +import java.util.Map; + /** * Pasien Service * * @author Roberto */ -public interface PasienService extends BaseVoService { +public interface PasienService extends BaseVoService { String generatePasienCM(); @@ -34,8 +34,6 @@ public interface PasienService extends BaseVoService findAll(); - Map findByNameAndNoCm(Integer page, Integer limit, String sort, String dir, String nama); - Map findByNoCmAndTglLahir(Integer page, Integer limit, String sort, String dir, String noCm, String dateStart, String dateEnd, String tanggalLahir, String namaIbu); @@ -44,7 +42,6 @@ public interface PasienService extends BaseVoService> findIbuAnak(Long tglAwal, Long tglAkhir); - - Pasien findPasienByNoCm(String noCm); + Pasien findPasienByNoCm(String noCm); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienServiceImpl.java index 02fadb49..5d7dfb6f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienServiceImpl.java @@ -1,16 +1,16 @@ package com.jasamedika.medifirst2000.service.impl; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import com.jasamedika.medifirst2000.converter.*; +import com.jasamedika.medifirst2000.dao.AlamatDao; +import com.jasamedika.medifirst2000.dao.PasienDao; +import com.jasamedika.medifirst2000.dao.RunningNumberDao; +import com.jasamedika.medifirst2000.dao.custom.PasienDaoCustom; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.enums.TipePasienEnum; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.PasienService; +import com.jasamedika.medifirst2000.util.*; +import com.jasamedika.medifirst2000.vo.*; import org.apache.commons.collections.IteratorUtils; import org.hibernate.Hibernate; import org.hibernate.proxy.HibernateProxy; @@ -20,68 +20,19 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.jasamedika.medifirst2000.converter.AgamaConverter; -import com.jasamedika.medifirst2000.converter.AlamatConverter; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.converter.DesaKelurahanConverter; -import com.jasamedika.medifirst2000.converter.JenisAlamatConverter; -import com.jasamedika.medifirst2000.converter.JenisKelaminConverter; -import com.jasamedika.medifirst2000.converter.LoginUserConverter; -import com.jasamedika.medifirst2000.converter.NegaraConverter; -import com.jasamedika.medifirst2000.converter.PasienConverter; -import com.jasamedika.medifirst2000.converter.PekerjaanConverter; -import com.jasamedika.medifirst2000.converter.PendidikanConverter; -import com.jasamedika.medifirst2000.converter.PropinsiConverter; -import com.jasamedika.medifirst2000.converter.RekananConverter; -import com.jasamedika.medifirst2000.converter.StatusPerkawinanConverter; -import com.jasamedika.medifirst2000.converter.TitlePasienConverter; -import com.jasamedika.medifirst2000.dao.AlamatDao; -import com.jasamedika.medifirst2000.dao.PasienDao; -import com.jasamedika.medifirst2000.dao.RunningNumberDao; -import com.jasamedika.medifirst2000.dao.custom.PasienDaoCustom; -import com.jasamedika.medifirst2000.dao.custom.base.util.PaginationResult; -import com.jasamedika.medifirst2000.entities.Agama; -import com.jasamedika.medifirst2000.entities.Alamat; -import com.jasamedika.medifirst2000.entities.DesaKelurahan; -import com.jasamedika.medifirst2000.entities.JenisAlamat; -import com.jasamedika.medifirst2000.entities.JenisKelamin; -import com.jasamedika.medifirst2000.entities.Kecamatan; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Negara; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.Pekerjaan; -import com.jasamedika.medifirst2000.entities.Pendidikan; -import com.jasamedika.medifirst2000.entities.Propinsi; -import com.jasamedika.medifirst2000.entities.Rekanan; -import com.jasamedika.medifirst2000.entities.RunningNumber; -import com.jasamedika.medifirst2000.entities.StatusPerkawinan; -import com.jasamedika.medifirst2000.entities.TitlePasien; -import com.jasamedika.medifirst2000.enums.TipePasienEnum; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PasienService; -import com.jasamedika.medifirst2000.util.Age; -import com.jasamedika.medifirst2000.util.AgeCalculator; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.DateUtil; -import com.jasamedika.medifirst2000.util.StringUtil; -import com.jasamedika.medifirst2000.vo.AlamatVO; -import com.jasamedika.medifirst2000.vo.DesaKelurahanVO; -import com.jasamedika.medifirst2000.vo.GridPasienVO; -import com.jasamedika.medifirst2000.vo.JenisKelaminVO; -import com.jasamedika.medifirst2000.vo.KecamatanVO; -import com.jasamedika.medifirst2000.vo.KotaKabupatenVO; -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.PropinsiVO; -import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; /** * Implement class for PasienService * * @author Roberto - * @param + * */ -@Service("pasienService") -public class PasienServiceImpl extends BaseVoServiceImpl implements PasienService { +@Service +public class PasienServiceImpl extends BaseVoServiceImpl implements PasienService { + @Autowired private BaseConverterImpl converterPasien; @@ -143,7 +94,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic private PasienDaoCustom pasienDaoCustom; @Override - @Transactional(readOnly = false) + @Transactional public PasienVO add(PasienVO vo) throws JpaSystemException, ServiceVOException { Pasien pasien = new Pasien(); pasien = pasienConverter.transferVOToModel(vo, pasien); @@ -160,10 +111,9 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic statusPerkawinanConverter.transferVOToModel(vo.getStatusPerkawinan(), new StatusPerkawinan())); Pasien resultModel = pasienDao.save(pasien); if (CommonUtil.isNotNullOrEmpty(resultModel.getId())) { - List listAlamat = new ArrayList(); + List listAlamat = new ArrayList<>(); for (AlamatVO alamatVo : vo.getAlamats()) { - Alamat alamat = new Alamat(); - alamat = alamatConverter.transferVOToModel(alamatVo, new Alamat()); + Alamat alamat = alamatConverter.transferVOToModel(alamatVo, new Alamat()); if (CommonUtil.isNotNullOrEmpty(alamatVo.getJenisAlamat())) alamat.setJenisAlamat( jenisAlamatConverter.transferVOToModel(alamatVo.getJenisAlamat(), new JenisAlamat())); @@ -186,7 +136,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic } @Override - @Transactional(readOnly = false) + @Transactional public PasienVO update(PasienVO vo) throws JpaSystemException, ServiceVOException { Pasien pasien = pasienDao.findOne(vo.getId()); @@ -211,7 +161,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic @Override public PasienVO findByNoBpjs(String noBpjs) { List data = pasienDao.findPasienByNoBpjs(noBpjs); - if (data.size() > 0) { + if (!data.isEmpty()) { Pasien pasien = data.get(0); PasienVO pasienVO = new PasienVO(); pasienVO = converterPasien.transferModelToVO(pasien, pasienVO); @@ -226,25 +176,6 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic return null; } - @Override - @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) - public Map findByNameAndNoCm(Integer page, Integer limit, String sort, String dir, String nama) { - - List pasienVOList = new ArrayList(); - PaginationResult paginationResult = null; - if (CommonUtil.isNotNullOrEmpty(nama)) { - Map maps = new HashMap(); - maps.put("namaPasien", nama); - paginationResult = pasienDaoCustom.paginateLikeMapOfProperties(maps, null, null, null); - } else { - paginationResult = pasienDaoCustom.paginateAll(null, null, null); - } - - pasienConverter.transferListOfModelToListOfVO(paginationResult.getResultList(), pasienVOList); - return constructMapReturn(paginationResult.getResultList(), paginationResult.getRowCount(), - paginationResult.getRowCount()); - } - @Override public Map findAllWithPageAndLimitAndSortByAndDirectionParameter(Integer page, Integer limit, String sort, String dir) { @@ -255,18 +186,17 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic public String generatePasienCM() { @SuppressWarnings("unchecked") List nocmList = IteratorUtils.toList(pasienDao.findAllNoCm().iterator()); - String missNoCm = getCM(nocmList, 8); - return missNoCm; + return getCM(nocmList); } - private String getCM(List nocmList, int lengthDigit) { - int d = lengthDigit; - StringBuffer buf = new StringBuffer(); + private String getCM(List nocmList) { + int d = 8; + StringBuilder buf = new StringBuilder(); for (int i = 1; i <= 10; i++) { buf.append("9"); } Long end = Long.valueOf(buf.toString()); - List nocms = new ArrayList(); + List nocms = new ArrayList<>(); nocms.add(0L); nocms.add(end); for (String pas : nocmList) { @@ -276,14 +206,13 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic } Collections.sort(nocms); - Long[] nocmGen = nocms.toArray(new Long[nocms.size()]); + Long[] nocmGen = nocms.toArray(new Long[0]); long missNoCm = missingNumberFromSortedArray(nocmGen); - String missNoCmS = String.format("%0" + d + "d", missNoCm); - return missNoCmS; + return String.format("%0" + d + "d", missNoCm); } private long missingNumberFromSortedArray(Long[] numbers) { - if (numbers == null || numbers.length <= 0) { + if (numbers == null || numbers.length == 0) { throw new IllegalArgumentException("Null or Empty array not permitted"); } long left = 0; @@ -320,12 +249,6 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic int pageRequested = page; - if (totalRow > 0) { - totalPages = (int) Math.ceil((double) totalRow / (double) limit); - } else { - totalPages = 0; - } - if (pageRequested > totalPages) pageRequested = totalPages; int rowStart = pageRequested * limit - limit; @@ -336,7 +259,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic List pasienList = pasienDaoCustom.findAllPasienPagingList(rowStart, rowEnd, startDate, endDate, noCm, namaAyah, tanggalLahir); - List gridPasienVoList = new ArrayList(); + List gridPasienVoList = new ArrayList<>(); for (Pasien pasien : pasienList) { GridPasienVO gridPasienVO = new GridPasienVO(); gridPasienVO.setJenisKelamin( @@ -345,7 +268,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic gridPasienVO.setTglDaftar(pasien.getTglDaftar()); gridPasienVO.setTglLahir(pasien.getTglLahir()); gridPasienVO.setNamaAyah(pasien.getNamaAyah()); - gridPasienVO.setNamaLengkap(pasien.getNamaPasien().toString()); + gridPasienVO.setNamaLengkap(pasien.getNamaPasien()); if (CommonUtil.isNotNullOrEmpty(pasien.getTglLahir())) { Age age = AgeCalculator.calculateAge(pasien.getTglLahir()); if (CommonUtil.isNotNullOrEmpty(age)) { @@ -353,11 +276,10 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic } } gridPasienVoList.add(gridPasienVO); - List alamatsvo = new ArrayList(); + List alamatsvo = new ArrayList<>(); for (Alamat alamat : alamatDao.findAlamatByIdPasien(pasien.getId())) { AlamatVO alamatVO = alamatConverter.transferModelToVO(alamat, new AlamatVO()); if (CommonUtil.isNotNullOrEmpty(alamat.getDesaKelurahan())) { - alamat.getDesaKelurahan().getNamaDesaKelurahan(); DesaKelurahan desaKelurahan = alamat.getDesaKelurahan(); alamatVO.setDesaKelurahan( desaKelurahanConverter.transferModelToVO(desaKelurahan, new DesaKelurahanVO())); @@ -382,7 +304,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic List> listPasien = pasienDao.findByNoRM(noCm); List> listAlamat = alamatDao.findAlamatByNoRM(noCm); String alamat = setAlamat(listAlamat); - if (listPasien == null || listPasien.size() == 0) + if (listPasien == null || listPasien.isEmpty()) return null; listPasien.forEach(pasien -> { pasien.put("jeniskelamin", 'L'); @@ -394,7 +316,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic } private String setAlamat(List> listMapAlamat) { - if (listMapAlamat == null || listMapAlamat.size() == 0) + if (listMapAlamat == null || listMapAlamat.isEmpty()) return null; String alamat = null; for (Map mapAlamat : listMapAlamat) { @@ -416,7 +338,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) public PasienVO findByNoCm(String key) throws JpaSystemException { List list = pasienDao.findPasienBynoCm(key); - if (list.size() == 0) + if (list.isEmpty()) return null; Pasien pasien = list.get(0); if (pasien == null) { @@ -425,7 +347,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic PasienVO pasienVO = new PasienVO(); pasienVO = pasienConverter.transferModelToVO(pasien, pasienVO); - Set alamats = new HashSet(); + Set alamats = new HashSet<>(); try { Alamat alamat = alamatDao.findAlamatByPasienId(pasien.getId()); @@ -468,15 +390,16 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic } pasienVO.setAlamats(alamats); } catch (Exception e) { - + throw new ServiceVOException(e.getMessage()); } return pasienVO; } @Override + @Transactional public Map savePasienFromRegistrasiPasienGawatDarurat(RegistrasiPasienGawatDaruratVO vo) { - Map result = new HashMap(); + Map result = new HashMap<>(); Pasien pasien = new Pasien(); if (vo.getTipePasien().equalsIgnoreCase(TipePasienEnum.BARU.getVal())) { if (CommonUtil.isNotNullOrEmpty(vo.getJenisKelamin())) { @@ -518,11 +441,11 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic runningNumber = new RunningNumber(); runningNumber.setKegunaan("Pasien"); runningNumber.setReset("0"); - runningNumber.setNomerTerbaru((Integer) 0); + runningNumber.setNomerTerbaru(0); } - Integer number = (runningNumber.getNomerTerbaru() + (Integer) 1); + int number = (runningNumber.getNomerTerbaru() + (Integer) 1); runningNumber.setNomerTerbaru(runningNumber.getNomerTerbaru() + (Integer) 1); - String missNoCm = StringUtil.formatNumber(number.toString(), 8); + String missNoCm = StringUtil.formatNumber(Integer.toString(number), 8); // want to edit by askur 03012017 pasien.setNoCm(missNoCm); @@ -569,6 +492,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic } @Override + @Transactional public void updateTanggalMeninggal(Pasien p) { pasienDao.save(p); } @@ -577,7 +501,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) public PasienVO findByNorecAntrian(String noRec) throws JpaSystemException { List list = pasienDao.findPasienByNoRecAntrian(noRec); - if (list.size() == 0) + if (list.isEmpty()) return null; Pasien pasien = list.get(0); if (pasien == null) { @@ -586,7 +510,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic PasienVO pasienVO = new PasienVO(); pasienVO = pasienConverter.transferModelToVO(pasien, pasienVO); - Set alamats = new HashSet(); + Set alamats = new HashSet<>(); try { Alamat alamat = alamatDao.findAlamatByPasienId(pasien.getId()); @@ -629,7 +553,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic } pasienVO.setAlamats(alamats); } catch (Exception e) { - + throw new ServiceVOException(e.getMessage()); } return pasienVO; @@ -639,10 +563,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic public List> findIbuAnak(Long tglAwal, Long tglAkhir) { DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); - List> result = pasienDao.findIbuAnak(df.format(new Date(tglAwal)), - df.format(new Date(tglAkhir))); - - return result; + return pasienDao.findIbuAnak(df.format(new Date(tglAwal)), df.format(new Date(tglAkhir))); } @Override diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienVO.java index 624f031b..d8fa3f03 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienVO.java @@ -1,12 +1,16 @@ package com.jasamedika.medifirst2000.vo; +import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + import java.util.Date; import java.util.HashSet; import java.util.Set; -import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; -import com.jasamedika.medifirst2000.helper.Caption; - +@Getter +@Setter public class PasienVO extends BaseMasterVO { private String umur; @@ -74,11 +78,11 @@ public class PasienVO extends BaseMasterVO { @Caption(value = "Tanggal Lahir") private Date tglLahir; - private Set alamats = new HashSet(); + private Set alamats = new HashSet<>(); - private Set catatanPasien = new HashSet(); + private Set catatanPasien = new HashSet<>(); - private Set antrianPasienRegistrasis = new HashSet(); + private Set antrianPasienRegistrasis = new HashSet<>(); @Caption(value = "NoIdentitas") private String noIdentitas; @@ -133,349 +137,4 @@ public class PasienVO extends BaseMasterVO { @Caption(value = "propinsi") private PropinsiVO propinsi; - - public String getUmur() { - return umur; - } - - public void setUmur(String umur) { - this.umur = umur; - } - - public Date getTanggalMeninggal() { - return tanggalMeninggal; - } - - public void setTanggalMeninggal(Date tanggalMeninggal) { - this.tanggalMeninggal = tanggalMeninggal; - } - - public DokumenVO getDokumenRekamMedis() { - return dokumenRekamMedis; - } - - public void setDokumenRekamMedis(DokumenVO dokumenRekamMedis) { - this.dokumenRekamMedis = dokumenRekamMedis; - } - - public AgamaVO getAgama() { - return agama; - } - - public void setAgama(AgamaVO agama) { - this.agama = agama; - } - - public GolonganDarahVO getGolonganDarah() { - return golonganDarah; - } - - public void setGolonganDarah(GolonganDarahVO golonganDarah) { - this.golonganDarah = golonganDarah; - } - - public JenisKelaminVO getJenisKelamin() { - return jenisKelamin; - } - - public void setJenisKelamin(JenisKelaminVO jenisKelamin) { - this.jenisKelamin = jenisKelamin; - } - - public PekerjaanVO getPekerjaan() { - return pekerjaan; - } - - public void setPekerjaan(PekerjaanVO pekerjaan) { - this.pekerjaan = pekerjaan; - } - - public NegaraVO getNegara() { - return negara; - } - - public void setNegara(NegaraVO negara) { - this.negara = negara; - } - - public KebangsaanVO getKebangsaan() { - return kebangsaan; - } - - public void setKebangsaan(KebangsaanVO kebangsaan) { - this.kebangsaan = kebangsaan; - } - - public PendidikanVO getPendidikan() { - return pendidikan; - } - - public void setPendidikan(PendidikanVO pendidikan) { - this.pendidikan = pendidikan; - } - - public StatusPerkawinanVO getStatusPerkawinan() { - return statusPerkawinan; - } - - public void setStatusPerkawinan(StatusPerkawinanVO statusPerkawinan) { - this.statusPerkawinan = statusPerkawinan; - } - - public TitlePasienVO getTitle() { - return title; - } - - public void setTitle(TitlePasienVO title) { - this.title = title; - } - - public String getNamaPasien() { - return namaPasien; - } - - public void setNamaPasien(String namaPasien) { - this.namaPasien = namaPasien; - } - - public String getNamaIbu() { - return namaIbu; - } - - public void setNamaIbu(String namaIbu) { - this.namaIbu = namaIbu; - } - - public String getNamaAyah() { - return namaAyah; - } - - public void setNamaAyah(String namaAyah) { - this.namaAyah = namaAyah; - } - - public String getNamaSuamiIstri() { - return namaSuamiIstri; - } - - public void setNamaSuamiIstri(String namaSuamiIstri) { - this.namaSuamiIstri = namaSuamiIstri; - } - - public String getNoTelepon() { - return noTelepon; - } - - public void setNoTelepon(String noTelepon) { - this.noTelepon = noTelepon; - } - - public String getNoCm() { - return noCm; - } - - public void setNoCm(String noCm) { - this.noCm = noCm; - } - - public Integer getqPasien() { - return qPasien; - } - - public void setqPasien(Integer qPasien) { - this.qPasien = qPasien; - } - - public Date getTglDaftar() { - return tglDaftar; - } - - public void setTglDaftar(Date tglDaftar) { - this.tglDaftar = tglDaftar; - } - - public Date getTglLahir() { - return tglLahir; - } - - public void setTglLahir(Date tglLahir) { - this.tglLahir = tglLahir; - } - - public Set getAlamats() { - return alamats; - } - - public void setAlamats(Set alamats) { - this.alamats = alamats; - } - - public Set getCatatanPasien() { - return catatanPasien; - } - - public void setCatatanPasien(Set catatanPasien) { - this.catatanPasien = catatanPasien; - } - - public Set getAntrianPasienRegistrasis() { - return antrianPasienRegistrasis; - } - - public void setAntrianPasienRegistrasis(Set antrianPasienRegistrasis) { - this.antrianPasienRegistrasis = antrianPasienRegistrasis; - } - - public String getNoIdentitas() { - return noIdentitas; - } - - public void setNoIdentitas(String noIdentitas) { - this.noIdentitas = noIdentitas; - } - - public String getPaspor() { - return paspor; - } - - public void setPaspor(String paspor) { - this.paspor = paspor; - } - - public String getNoAditional() { - return noAditional; - } - - public void setNoAditional(String noAditional) { - this.noAditional = noAditional; - } - - public String getNamaDepan() { - return namaDepan; - } - - public void setNamaDepan(String namaDepan) { - this.namaDepan = namaDepan; - } - - public String getNamaBelakang() { - return namaBelakang; - } - - public void setNamaBelakang(String namaBelakang) { - this.namaBelakang = namaBelakang; - } - - public String getTempatLahir() { - return tempatLahir; - } - - public void setTempatLahir(String tempatLahir) { - this.tempatLahir = tempatLahir; - } - - public String getNoBpjs() { - return noBpjs; - } - - public void setNoBpjs(String noBpjs) { - this.noBpjs = noBpjs; - } - - public String getNoAsuransiLain() { - return noAsuransiLain; - } - - public void setNoAsuransiLain(String noAsuransiLain) { - this.noAsuransiLain = noAsuransiLain; - } - - public String getNoHp() { - return noHp; - } - - public void setNoHp(String noHp) { - this.noHp = noHp; - } - - public PasienDaftarVO getPasienDaftar() { - return pasienDaftar; - } - - public void setPasienDaftar(PasienDaftarVO pasienDaftar) { - this.pasienDaftar = pasienDaftar; - } - - public PasienVO getPasienIbu() { - return pasienIbu; - } - - public void setPasienIbu(PasienVO pasienIbu) { - this.pasienIbu = pasienIbu; - } - - public Date getJamLahir() { - return jamLahir; - } - - public void setJamLahir(Date jamLahir) { - this.jamLahir = jamLahir; - } - - public String getAlamatLengkap() { - return alamatLengkap; - } - - public void setAlamatLengkap(String alamatLengkap) { - this.alamatLengkap = alamatLengkap; - } - - public String getKodePos() { - return kodePos; - } - - public void setKodePos(String kodePos) { - this.kodePos = kodePos; - } - - public DesaKelurahanVO getDesaKelurahan() { - return desaKelurahan; - } - - public void setDesaKelurahan(DesaKelurahanVO desaKelurahan) { - this.desaKelurahan = desaKelurahan; - } - - public KecamatanVO getKecamatan() { - return kecamatan; - } - - public void setKecamatan(KecamatanVO kecamatan) { - this.kecamatan = kecamatan; - } - - public KotaKabupatenVO getKotaKabupaten() { - return kotaKabupaten; - } - - public void setKotaKabupaten(KotaKabupatenVO kotaKabupaten) { - this.kotaKabupaten = kotaKabupaten; - } - - public PropinsiVO getPropinsi() { - return propinsi; - } - - public void setPropinsi(PropinsiVO propinsi) { - this.propinsi = propinsi; - } - - public String getNamaKeluarga() { - return namaKeluarga; - } - - public void setNamaKeluarga(String namaKeluarga) { - this.namaKeluarga = namaKeluarga; - } - }