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 4262a30b..df4415d2 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 @@ -37,6 +37,7 @@ import com.jasamedika.medifirst2000.dao.PasienDao; import com.jasamedika.medifirst2000.dao.PegawaiDao; import com.jasamedika.medifirst2000.dao.PendidikanDao; import com.jasamedika.medifirst2000.dao.RuanganDao; +import com.jasamedika.medifirst2000.dto.RegistrasiPasienDto; import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi; import com.jasamedika.medifirst2000.entities.JadwalDokter; import com.jasamedika.medifirst2000.entities.JadwalPraktek; @@ -52,6 +53,7 @@ import com.jasamedika.medifirst2000.service.JadwalDokterService; import com.jasamedika.medifirst2000.service.ModelService; 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; @@ -84,24 +86,6 @@ import com.jasamedika.medifirst2000.vo.custom.BridgeDaftarVerifikasiPasienNotFou public class BridgingDaftarOnlineController { private static final Logger LOGGER = LoggerFactory.getLogger(BridgingDaftarOnlineController.class); - @Autowired - private PasienService pasienService; - - @Autowired - private ModelService modelServiceRuangan; - - @Autowired - private JadwalDokterService jadwalDokterService; - - @Autowired - private RuanganService ruanganService; - - @Autowired - private PegawaiService pegawaiService; - - @Autowired - private AntrianPasienDiPeriksaService antrianService; - @Autowired private AntrianPasienRegistrasiDao antrianPasienRegistrasiDao; @@ -126,6 +110,27 @@ public class BridgingDaftarOnlineController { @Autowired private JadwalPraktikDokterDao jadwalPraktikDokterDao; + @Autowired + private PasienService pasienService; + + @Autowired + private ModelService modelServiceRuangan; + + @Autowired + private JadwalDokterService jadwalDokterService; + + @Autowired + private RuanganService ruanganService; + + @Autowired + private PegawaiService pegawaiService; + + @Autowired + private AntrianPasienDiPeriksaService antrianService; + + @Autowired + private RegistrasiPasienService registrasiPasienService; + @RequestMapping(value = "/klinik_rs", method = RequestMethod.GET, produces = { MediaType.APPLICATION_XML_VALUE }) public BridgeDaftarKlinikListVO daftarKlinikRs() { BridgeDaftarKlinikListVO y = new BridgeDaftarKlinikListVO(); @@ -674,6 +679,7 @@ public class BridgingDaftarOnlineController { PasienVO result = pasienService.add(vo); if (result != null) return new ResponseEntity<>(result.getId(), HttpStatus.CREATED); + return new ResponseEntity<>(null, HttpStatus.NOT_ACCEPTABLE); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add Pasien", e.getMessage()); return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); @@ -681,7 +687,6 @@ public class BridgingDaftarOnlineController { LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); return new ResponseEntity<>(null, HttpStatus.CONFLICT); } - return new ResponseEntity<>(null, HttpStatus.NOT_ACCEPTABLE); } @RequestMapping(value = "/bpjs/medical-record-id/patient/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @@ -712,4 +717,18 @@ public class BridgingDaftarOnlineController { Map entity = antrianService.getAntreanByRuangan(tglMasuk, ruanganId); return new ResponseEntity<>(entity, HttpStatus.OK); } + + @RequestMapping(value = "/bpjs/registration/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity saveNewRegistration(@RequestBody RegistrasiPasienDto dto) { + try { + boolean result = registrasiPasienService.saveRegistrasiPasine(dto); + return new ResponseEntity<>(result, HttpStatus.CREATED); + } catch (ServiceVOException e) { + LOGGER.error("Got exception {} when add Pasien", e.getMessage()); + return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); + } catch (JpaSystemException jse) { + LOGGER.error("Got exception {} when add Pasien", jse.getMessage()); + return new ResponseEntity<>(null, HttpStatus.CONFLICT); + } + } } 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 44e42771..b06a4c1a 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 @@ -84,10 +84,10 @@ public interface PasienDao extends PagingAndSortingRepository { + "left join ah.propinsi ahd " + "where a.noCm=:noCm") public Map findMapPasienByNoCm(@Param("noCm") String noCm); - @Query("select new Map(ps.noBpjs as nomorkartu," + "ps.noIdentitas as nik," + "ps.namaPasien as nama," - + "ps.jenisKelaminId as jeniskelamin," + "to_char(ps.tglLahir,'yyyy-MM-dd') as tanggallahir," - + "ps.noHp as nohp) " + "from Pasien ps " + "where ps.statusEnabled is true " + "and ps.noCm = :noRm " - + "order by ps.id desc") + @Query("select new Map(ps.id as id," + "ps.noBpjs as nomorkartu," + "ps.noIdentitas as nik," + + "ps.namaPasien as nama," + "ps.jenisKelaminId as jeniskelamin," + + "to_char(ps.tglLahir,'yyyy-MM-dd') as tanggallahir," + "ps.noHp as nohp) " + "from Pasien ps " + + "where ps.statusEnabled is true " + "and ps.noCm = :noRm " + "order by ps.id desc") public List> findByNoRM(@Param("noRm") String noRm); @Query("select NEW Map (" + "a.id as id, " + "a.namaKelas as namaKelas) " + "from Kelas a") diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/RegistrasiPasienService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/RegistrasiPasienService.java index a1de47b4..277a35e3 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/RegistrasiPasienService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/RegistrasiPasienService.java @@ -2,10 +2,11 @@ package com.jasamedika.medifirst2000.service; import java.util.Map; +import com.jasamedika.medifirst2000.dto.RegistrasiPasienDto; import com.jasamedika.medifirst2000.vo.RegistrasiPasienVO; public interface RegistrasiPasienService { - - Map saveRegistrasiPasien(RegistrasiPasienVO vo); + Map saveRegistrasiPasien(RegistrasiPasienVO vo); + boolean saveRegistrasiPasine(RegistrasiPasienDto dto); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AntrianPasienDiPeriksaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AntrianPasienDiPeriksaServiceImpl.java index bf866d7b..3f68ffec 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AntrianPasienDiPeriksaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AntrianPasienDiPeriksaServiceImpl.java @@ -45,19 +45,18 @@ import com.jasamedika.medifirst2000.vo.PegawaiVO; * Implement class for PasienService * * @author Adik - * @param */ @Service("antrianPasienDiPeriksaService") public class AntrianPasienDiPeriksaServiceImpl extends BaseVoServiceImpl implements AntrianPasienDiPeriksaService { + @Autowired + private AntrianPasienDiPeriksaConverter antrianPasienDiPeriksaConverter; + @Autowired private AntrianPasienDiPeriksaDao antrianPasienDiPeriksaDao; @Autowired private RunningNumberDao runningNumberDao; - @Autowired - private AntrianPasienDiPeriksaConverter antrianPasienDiPeriksaConverter; - @Autowired private AlamatDao alamatDao; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienDaftarServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienDaftarServiceImpl.java index 8eaec654..bdb7ceb9 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienDaftarServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienDaftarServiceImpl.java @@ -64,6 +64,17 @@ import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO; @Service("PasienDaftarService") public class PasienDaftarServiceImpl implements PasienDaftarService { + @Autowired + private PasienDaftarConverter pasienDaftarConverter; + + @Autowired + private AsalRujukanConverter asalRujukanConverter; + + @Autowired + private PegawaiConverter pegawaiConverter; + + @Autowired + private DiputuskanConverter diputuskanConverter; @Autowired private PasienDaftarDao pasienDaftarDao; @@ -71,21 +82,11 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { @Autowired private SuratPermintaanMasukDao suratPermintaanMasukDao; - @Autowired - private PasienDaftarConverter pasienDaftarConverter; - @Autowired private RuanganDao ruanganDao; - @Autowired - private AsalRujukanConverter asalRujukanConverter; @Autowired private JadwalDokterDao jadwalDokterDao; - @Autowired - private PegawaiConverter pegawaiConverter; - - @Autowired - private DiputuskanConverter diputuskanConverter; @Autowired private AntrianPasienDiPeriksaService antrianPasienDiPeriksaService; @@ -108,6 +109,9 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { @Autowired private LoginUserService loginUserService; + @Autowired + private SkalaNyeriDao skalaNyeri; + @Override public PasienDaftarVO add(PasienDaftarVO vo) throws JpaSystemException, ServiceVOException { return null; @@ -128,6 +132,17 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { return null; } + @Override + public Map findAllWithPageAndLimitAndSortByAndDirectionParameter(Integer page, Integer limit, + String sort, String dir) { + return null; + } + + @Override + public List findAllPasienDaftar(String startDate, String endDate) { + return null; + } + @Override public List findAll() throws JpaSystemException { List vos = new ArrayList(); @@ -136,12 +151,6 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { return vos; } - @Override - public Map findAllWithPageAndLimitAndSortByAndDirectionParameter(Integer page, Integer limit, - String sort, String dir) { - return null; - } - @Override public String getFormatNumberByMonthYear() { Date dateNow = new Date(); @@ -227,13 +236,8 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { pasienDaftar.setIsRegistrasiLengkap((byte) 0); pasienDaftar.setTglRegistrasi(DateUtil.getShortDate()); pasienDaftar.setKelas(kelasDao.findKelas3()); - // edit by askur 15022017 - // KelompokPasien - // kelompokPasien=kelompokPasienDao.getKelompokPasienUmum().get(0); - // add KelompokPasien kelompokPasien = new KelompokPasien(); kelompokPasien.setId(vo.getKelompokPasien().getId()); - // pasienDaftar.setKelompokPasien(kelompokPasien); pasienDaftar.setNoRegistrasi(getFormatNumberByMonthYear()); @@ -246,18 +250,8 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { antrianPasienDiPeriksa .setAsalRujukan(asalRujukanConverter.transferVOToModel(vo.getAsalRujukan(), new AsalRujukan())); } - // if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) { - // bukan dari jadwal dokter - // antrianPasienDiPeriksa.setPegawai(pegawaiConverter.transferVOToModel(vo.getPegawai(), - // new Pegawai())); - // pasienDaftar.setDokterPenanggungJawab(pegawaiConverter.transferVOToModel(vo.getPegawai(), - // new Pegawai())); if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) { - // edit by askur 15112016 - // antrianPasienDiPeriksa.setPegawai(pegawaiConverter.transferVOToModel(vo.getPegawai(), - // new Pegawai())); - // if (!CommonUtil.isNotNullOrEmpty(vo.getPegawai().getId())) { if (CommonUtil.isNotNullOrEmpty(vo.getPegawai().getId())) { // PegawaiVO pegawaiVo = new PegawaiVO(); @@ -338,12 +332,9 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { } } - // add by askur 15112016 + antrianPasienDiPeriksa.setPegawai(pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai())); pasienDaftar.setDokterPenanggungJawab(pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai())); - // - - // } if (diagnosaPasienService.checkDiagnosaPasien(model.getId())) { antrianPasienDiPeriksa.setStatusPenyakit(StatusPenyakitEnum.LAMA.getVal()); @@ -355,16 +346,9 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { antrianPasienDiPeriksa.setNoMasuk(StatusAntrianEnum.MENUNGGU.getVal()); antrianPasienDiPeriksa.setStatusPasien((byte) 1); antrianPasienDiPeriksa.setPasienDaftar(pasienDaftar); - // edit by askur 15112016 - // antrianPasienDiPeriksa.setNoAntrian(antrianPasienDiPeriksaService.getFormatNumberByMonthYear()); - // antrianPasienDiPeriksa.setStatusAntrian(StatusAntrianEnum.MENUNGGU.getVal()); antrianPasienDiPeriksa.setNoAntrian(antrianPasienDiPeriksaService.getFormatNumberByMonthYearRuangan(null, ruanganDao.findRuanganGawatDarurat().getId())); - // edit by askur 28122016 - // antrianPasienDiPeriksa.setStatusAntrian(StatusAntrianEnum.DIPANGGIL_DOKTER.getVal()); antrianPasienDiPeriksa.setStatusAntrian(StatusAntrianEnum.DIPANGGIL_SUSTER.getVal()); - // - // pasienDaftar.getAntrianPasienDiPeriksaSet().add(antrianPasienDiPeriksa); if (CommonUtil.isNotNullOrEmpty(vo.getDiputuskanDetailSet())) { @@ -381,9 +365,6 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { if (CommonUtil.isNotNullOrEmpty(passienDaftarResult)) { resultSavePasienDaftar.put("antrianPasienDiPeriksa", antrianPasienDiPeriksa); resultSavePasienDaftar.put("pasienDaftar", pasienDaftar); - - // resultSaveRegistrasiPelayananPasien=registrasiPelayananPasienService.createRegistrasiPelayananPasien(pasienDaftar.getNoRegistrasi()); - } return resultSavePasienDaftar; @@ -400,14 +381,10 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { System.out.println(tahun.substring(2, 4)); String lastNoRegistrasi = pasienDaftarDao.getMaxNoRegistrasiByMonthAndYear(month, Integer.valueOf(tahun.substring(2, 4))); - // Integer lastNoRegistrasi = - // pasienDaftarDao.getCountByMonthAndYear(month, year); if (CommonUtil.isNotNullOrEmpty(lastNoRegistrasi)) { String temp = lastNoRegistrasi.substring(4, 10); countByMonthAndYear = Integer.valueOf(temp); } - // countByMonthAndYear=pasienDaftarDao.getCountByMonthAndYear(month, - // year); if (countByMonthAndYear == 0) { countByMonthAndYear++; } else { @@ -437,35 +414,6 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { } return yearNowString + "" + dateNowString + "" + countString; } - /* - * old public String getFormatNumberByMonthYearByParameter(Date - * tglRegistrasi) { Date dateNow=tglRegistrasi; Integer - * year=DateUtil.getYearFromDate(dateNow); Integer - * month=DateUtil.getMonthFromDate(dateNow); Integer countByMonthAndYear=0; - * - * countByMonthAndYear=pasienDaftarDao.getCountByMonthAndYear(month, year); - * if(countByMonthAndYear==0){ countByMonthAndYear++; }else{ - * countByMonthAndYear++; } Integer - * monthNow=DateUtil.getMonthFromDate(dateNow); Integer - * yearNow=DateUtil.getYearFromDate(dateNow); String - * yearNowString=yearNow.toString().substring(2, 4); String - * dateNowString=monthNow.toString(); String countString=null; - * if(com.jasamedika.medifirst2000.util.CommonUtil.isNotNullOrEmpty( - * countByMonthAndYear)){ if(countByMonthAndYear.toString().length()==1){ - * countString="00000"+countByMonthAndYear.toString(); }else - * if(countByMonthAndYear.toString().length()==2){ - * countString="0000"+countByMonthAndYear.toString(); }else - * if(countByMonthAndYear.toString().length()==3){ - * countString="000"+countByMonthAndYear.toString(); }else - * if(countByMonthAndYear.toString().length()==4){ - * countString="00"+countByMonthAndYear.toString(); }else - * if(countByMonthAndYear.toString().length()==5){ - * countString="0"+countByMonthAndYear.toString(); } } - * - * if((dateNowString.length())==1){ dateNowString="0"+monthNow; } return - * yearNowString+""+dateNowString+""+countString; } - * - */ @Override public Map updatePasienDaftarFromMasukKamar(MasukKamarVO masukKamarVO) { @@ -477,13 +425,11 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { Ruangan ruangan = new Ruangan(); ruangan.setId(kamar1.getRuangan().getId()); model.setRuangan(ruangan); - // add by askur 21112016 List dpjp = suratPermintaanMasukDao .finByNoRecAntrianPasienDiPeriksa(masukKamarVO.getPasienDaftar().getNoRec()); if (!dpjp.isEmpty()) { SuratPermintaanMasuk spm = dpjp.get(0); model.setDokterPenanggungJawab(spm.getDokterPenanggungJawab()); - // add by askur 22112016 Kamar kamar = kamarDao.findOne(masukKamarVO.getKamar().getId()); if (kamar != null) spm.setUnit(kamar.getRuangan()); @@ -494,16 +440,12 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { else spm.setPetugas(loginUserService.getLoginUser().getPegawai()); suratPermintaanMasukDao.save(spm); - // } - // if (CommonUtil.isNotNullOrEmpty(model)) { List listPersetujuanUmum = persetujuanUmumDao .findByPasienDaftar(masukKamarVO.getPasienDaftar().getNoRec(), (short) 0); if (CommonUtil.isNotNullOrEmpty(listPersetujuanUmum)) { PersetujuanUmum persetujuanUmum = listPersetujuanUmum.get(0); - // Shakato 05082016 - // model.setRuangan(persetujuanUmum.getRuanganTujuan()); model.setKelompokPasien(persetujuanUmum.getJenisPembayaran()); pasienDaftarDao.save(model); } @@ -526,13 +468,6 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { pasienDaftarDao.save(pasienDaftar); } - @Override - public List findAllPasienDaftar(String startDate, String endDate) { - // List models = (List) - // pasienDaftarDao.findPasienByStartDateAndEndDate(startDate,endDate); - return null; - } - @Override @Transactional public PasienDaftar findbyNoCmLast(String noCm) { @@ -543,9 +478,6 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { return model; } - @Autowired - private SkalaNyeriDao skalaNyeri; - public List getSkalaNyeri() { List listData = (List) skalaNyeri.findAll(); return listData; @@ -576,9 +508,6 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { Long tlosPlgPeriod = 0L; Long lengthPeriod = ChronoUnit.DAYS.between(LocalDate.parse(tglAwal.substring(0, 10)), LocalDate.parse(tglAkhir.substring(0, 10))) + 1; - - // Integer jumlahTempatTidur = - // tempatTidurDao.countTempatTidurAktif(Arrays.asList(Master.Ruangan.TANJUNG)); Integer jumlahTempatTidur = Integer.valueOf(settingDataFixedDao.getSettingDataFixed("totalkamarranapaktif")); List> borData = pasienDaftarDao.getPasienRanap(tglAwal, tglAkhir); @@ -790,5 +719,4 @@ public class PasienDaftarServiceImpl implements PasienDaftarService { return result; } - } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienServiceImpl.java index 21ee6a6f..e8581d7d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPasienServiceImpl.java @@ -5,7 +5,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.UUID; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.jpa.JpaSystemException; @@ -15,43 +14,30 @@ import org.springframework.transaction.annotation.Transactional; import com.jasamedika.medifirst2000.converter.AgamaConverter; import com.jasamedika.medifirst2000.converter.AlamatConverter; -import com.jasamedika.medifirst2000.converter.AsalRujukanConverter; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.converter.DesaKelurahanConverter; import com.jasamedika.medifirst2000.converter.HubunganKeluargaConverter; -import com.jasamedika.medifirst2000.converter.JabatanConverter; import com.jasamedika.medifirst2000.converter.JenisAlamatConverter; import com.jasamedika.medifirst2000.converter.JenisKelaminConverter; import com.jasamedika.medifirst2000.converter.KecamatanConverter; -import com.jasamedika.medifirst2000.converter.KelompokUmurConverter; import com.jasamedika.medifirst2000.converter.KotaKabupatenConverter; import com.jasamedika.medifirst2000.converter.LoginUserConverter; -import com.jasamedika.medifirst2000.converter.LokasiConverter; import com.jasamedika.medifirst2000.converter.NegaraConverter; import com.jasamedika.medifirst2000.converter.PasienConverter; -import com.jasamedika.medifirst2000.converter.PegawaiConverter; import com.jasamedika.medifirst2000.converter.PekerjaanConverter; import com.jasamedika.medifirst2000.converter.PendidikanConverter; import com.jasamedika.medifirst2000.converter.PropinsiConverter; -import com.jasamedika.medifirst2000.converter.RegistrasiPasienConverter; import com.jasamedika.medifirst2000.converter.RekananConverter; -import com.jasamedika.medifirst2000.converter.RuanganConverter; import com.jasamedika.medifirst2000.converter.StatusPerkawinanConverter; -import com.jasamedika.medifirst2000.converter.SukuConverter; import com.jasamedika.medifirst2000.converter.TitlePasienConverter; import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; -import com.jasamedika.medifirst2000.dao.AntrianPasienRegistrasiDao; -import com.jasamedika.medifirst2000.dao.KelompokPasienDao; import com.jasamedika.medifirst2000.dao.PasienDaftarDao; import com.jasamedika.medifirst2000.dao.PasienDao; -import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao; import com.jasamedika.medifirst2000.dao.RunningNumberDao; -import com.jasamedika.medifirst2000.dao.custom.PasienDaoCustom; +import com.jasamedika.medifirst2000.dto.RegistrasiPasienDto; import com.jasamedika.medifirst2000.entities.Agama; import com.jasamedika.medifirst2000.entities.Alamat; import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi; -import com.jasamedika.medifirst2000.entities.AsalRujukan; import com.jasamedika.medifirst2000.entities.CatatanPasien; import com.jasamedika.medifirst2000.entities.DesaKelurahan; import com.jasamedika.medifirst2000.entities.HubunganKeluarga; @@ -69,31 +55,24 @@ import com.jasamedika.medifirst2000.entities.Pegawai; import com.jasamedika.medifirst2000.entities.Pekerjaan; import com.jasamedika.medifirst2000.entities.Pendidikan; import com.jasamedika.medifirst2000.entities.Propinsi; -import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien; import com.jasamedika.medifirst2000.entities.Rekanan; -import com.jasamedika.medifirst2000.entities.Ruangan; import com.jasamedika.medifirst2000.entities.RunningNumber; import com.jasamedika.medifirst2000.entities.StatusPerkawinan; import com.jasamedika.medifirst2000.entities.TitlePasien; -import com.jasamedika.medifirst2000.enums.StatusAntrianEnum; -//import com.jasamedika.medifirst2000.enums.TipePasienEnum; import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.AntrianPasienDiPeriksaService; -import com.jasamedika.medifirst2000.service.GenerateNumberService; -import com.jasamedika.medifirst2000.service.PasienDaftarService; -import com.jasamedika.medifirst2000.service.PasienService; import com.jasamedika.medifirst2000.service.RegistrasiPasienService; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananPasienService; import com.jasamedika.medifirst2000.util.CommonUtil; import com.jasamedika.medifirst2000.util.StringUtil; import com.jasamedika.medifirst2000.vo.AlamatVO; import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; -import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO; import com.jasamedika.medifirst2000.vo.CatatanPasienVO; import com.jasamedika.medifirst2000.vo.KebangsaanVO; +import com.jasamedika.medifirst2000.vo.KelompokPasienVO; +import com.jasamedika.medifirst2000.vo.PasienDaftarVO; +import com.jasamedika.medifirst2000.vo.PasienVO; +import com.jasamedika.medifirst2000.vo.PegawaiVO; import com.jasamedika.medifirst2000.vo.RegistrasiPasienVO; - /** * Implement class for RegistrasiPasienService * @@ -102,315 +81,316 @@ import com.jasamedika.medifirst2000.vo.RegistrasiPasienVO; */ @Service("registrasiPasienService") public class RegistrasiPasienServiceImpl extends BaseVoServiceImpl implements RegistrasiPasienService { + @Autowired + private BaseConverterImpl kebangsaanConverter; @Autowired - private PasienDao pasienDao; + private BaseConverterImpl converterPasienDaftar; + + @Autowired + private BaseConverterImpl converterPegawai; + + @Autowired + private BaseConverterImpl converterKelompokPasien; + + @Autowired + private BaseConverterImpl converterPasien; @Autowired - private PasienDaoCustom pasienDaoCustom; - - @Autowired - private PasienDaftarService pasienDaftarService; - - @Autowired - private RegistrasiPelayananPasienDao registrasiPelayananPasienDao; - - @Autowired - private RegistrasiPelayananPasienService registrasiPelayananPasienService; - - @Autowired - private KelompokPasienDao kelompokPasienDao; + private BaseConverterImpl converterAntrianDiperiksa; @Autowired private PasienConverter pasienConverter; + @Autowired private JenisKelaminConverter jenisKelaminConverter; + @Autowired private AgamaConverter agamaConverter; + @Autowired private PendidikanConverter pendidikanConverter; + @Autowired private PekerjaanConverter pekerjaanConverter; - - @Autowired - private BaseConverterImpl kebangsaanConverter; - - @Autowired private StatusPerkawinanConverter statusPerkawinanConverter; + @Autowired private NegaraConverter negaraConverter; - @Autowired - private KelompokUmurConverter kelompokUmurConverter; + @Autowired private TitlePasienConverter titlePasienConverter; - @Autowired - private LokasiConverter lokasiConverter; - - @Autowired - private AsalRujukanConverter asalRujukanConverter; - - @Autowired - private RuanganConverter ruanganConverter; - + @Autowired private LoginUserConverter loginUserConverter; @Autowired private AlamatConverter alamatConverter; + @Autowired private JenisAlamatConverter jenisAlamatConverter; + @Autowired private PropinsiConverter propinsiConverter; + @Autowired private RekananConverter rekananConverter; + @Autowired private KecamatanConverter kecamatanConverter; - @Autowired - private JabatanConverter jabatanConverter; - @Autowired - private SukuConverter sukuConverter; + @Autowired private DesaKelurahanConverter desaKelurahanConverter; + @Autowired private HubunganKeluargaConverter hubunganKeluargaConverter; + @Autowired private KotaKabupatenConverter kotaKabupatenConverter; - + @Autowired - private AntrianPasienDiPeriksaService antrianPasienDiPeriksaService; - - - @Autowired - private RegistrasiPasienConverter registrasiPasienConverter; - - @Autowired - private PegawaiConverter pegawaiConverter; - - @Autowired - private AntrianPasienRegistrasiDao antrianPasienRegistrasiDao; - - @Autowired - private PasienService pasienService; - - @Autowired - private PasienDaftarDao pasienDaftarDao; + private PasienDao pasienDao; + @Autowired private RunningNumberDao runningNumberDao; - + @Autowired - private GenerateNumberService generateNumberService; - @Transactional(readOnly = false,isolation=Isolation.SERIALIZABLE) - public Map saveRegistrasiPasien(RegistrasiPasienVO vo) throws JpaSystemException, ServiceVOException { - + private PasienDaftarDao pasienDaftarDao; + + private AntrianPasienDiPeriksaDao antrianDiperiksaDao; + + @Transactional(readOnly = false, isolation = Isolation.SERIALIZABLE) + public Map saveRegistrasiPasien(RegistrasiPasienVO vo) + throws JpaSystemException, ServiceVOException { + Pasien pasien = new Pasien(); - pasien=pasienConverter.transferVOToModel(vo.getPasien(), pasien); - + pasien = pasienConverter.transferVOToModel(vo.getPasien(), pasien); + RunningNumber runningNumber = runningNumberDao.findByResetAndKegunaan("0", "Pasien"); - if(runningNumber==null) - { + if (runningNumber == null) { runningNumber = new RunningNumber(); runningNumber.setKegunaan("Pasien"); runningNumber.setReset("0"); - runningNumber.setNomerTerbaru((Integer)0); + runningNumber.setNomerTerbaru((Integer) 0); } - if(CommonUtil.isNullOrEmpty(pasien.getNoCm())) - { - Integer number=(runningNumber.getNomerTerbaru()+(Integer)1); + if (CommonUtil.isNullOrEmpty(pasien.getNoCm())) { + Integer number = (runningNumber.getNomerTerbaru() + (Integer) 1); String formatDepan = runningNumber.getExtention(); - runningNumber.setNomerTerbaru(runningNumber.getNomerTerbaru()+(Integer)1); - String missNoCm = StringUtil.formatNumber(number.toString(), 6); - pasien.setNoCm(formatDepan+missNoCm); + runningNumber.setNomerTerbaru(runningNumber.getNomerTerbaru() + (Integer) 1); + String missNoCm = StringUtil.formatNumber(number.toString(), 6); + pasien.setNoCm(formatDepan + missNoCm); } - - pasien.setTglDaftar(new Date() ); - if(CommonUtil.isNotNullOrEmpty(vo)) { + + pasien.setTglDaftar(new Date()); + if (CommonUtil.isNotNullOrEmpty(vo)) { pasien.setKdProfile((short) 0); pasien.setStatusEnabled(true); pasien.setKodeExternal("''"); pasien.setNoRec("-"); } - if(CommonUtil.isNotNullOrEmpty(vo.getPasien())) { + if (CommonUtil.isNotNullOrEmpty(vo.getPasien())) { pasien.setNamaExternal(vo.getPasien().getNamaPasien().toUpperCase()); pasien.setReportDisplay(vo.getPasien().getNamaPasien().toUpperCase()); } - if(CommonUtil.isNotNullOrEmpty(vo.getJenisKelamin())){ + if (CommonUtil.isNotNullOrEmpty(vo.getJenisKelamin())) { pasien.setJenisKelamin(jenisKelaminConverter.transferVOToModel(vo.getJenisKelamin(), new JenisKelamin())); } - if(CommonUtil.isNotNullOrEmpty(vo.getAgama())){ + if (CommonUtil.isNotNullOrEmpty(vo.getAgama())) { pasien.setAgama(agamaConverter.transferVOToModel(vo.getAgama(), new Agama())); } - if(CommonUtil.isNotNullOrEmpty(vo.getStatusPerkawinan())){ - pasien.setStatusPerkawinan(statusPerkawinanConverter.transferVOToModel(vo.getStatusPerkawinan(), new StatusPerkawinan())); + if (CommonUtil.isNotNullOrEmpty(vo.getStatusPerkawinan())) { + pasien.setStatusPerkawinan( + statusPerkawinanConverter.transferVOToModel(vo.getStatusPerkawinan(), new StatusPerkawinan())); } - if(CommonUtil.isNotNullOrEmpty(vo.getPendidikan())){ + if (CommonUtil.isNotNullOrEmpty(vo.getPendidikan())) { pasien.setPendidikan(pendidikanConverter.transferVOToModel(vo.getPendidikan(), new Pendidikan())); } - if(CommonUtil.isNotNullOrEmpty(vo.getPekerjaan())){ + if (CommonUtil.isNotNullOrEmpty(vo.getPekerjaan())) { pasien.setPekerjaan(pekerjaanConverter.transferVOToModel(vo.getPekerjaan(), new Pekerjaan())); } - if(CommonUtil.isNotNullOrEmpty(vo.getKebangsaan())){ + if (CommonUtil.isNotNullOrEmpty(vo.getKebangsaan())) { pasien.setKebangsaan(kebangsaanConverter.transferVOToModel(vo.getKebangsaan(), new Kebangsaan())); } - if(CommonUtil.isNotNullOrEmpty(vo.getNegara())){ + if (CommonUtil.isNotNullOrEmpty(vo.getNegara())) { pasien.setNegara(negaraConverter.transferVOToModel(vo.getNegara(), new Negara())); } - if(CommonUtil.isNotNullOrEmpty(vo.getNoTelepon())){ + if (CommonUtil.isNotNullOrEmpty(vo.getNoTelepon())) { pasien.setNoTelepon(vo.getNoTelepon()); } - if(CommonUtil.isNotNullOrEmpty(vo.getNoAditional())){ + if (CommonUtil.isNotNullOrEmpty(vo.getNoAditional())) { pasien.setNoAditional(vo.getNoAditional()); } - if(CommonUtil.isNotNullOrEmpty(vo.getNamaAyah())){ + if (CommonUtil.isNotNullOrEmpty(vo.getNamaAyah())) { pasien.setNamaAyah(vo.getNamaAyah()); } - if(CommonUtil.isNotNullOrEmpty(vo.getNamaIbu())){ + if (CommonUtil.isNotNullOrEmpty(vo.getNamaIbu())) { pasien.setNamaIbu(vo.getNamaIbu()); } - if(CommonUtil.isNotNullOrEmpty(vo.getTitlePasien())){ + if (CommonUtil.isNotNullOrEmpty(vo.getTitlePasien())) { pasien.setTitlePasien(titlePasienConverter.transferVOToModel(vo.getTitlePasien(), new TitlePasien())); - } - - ListlistCatatanPasien=new ArrayList(); - for(CatatanPasienVO catatanPasienVO:vo.getCatatanPasien()){ - CatatanPasien catatanPasien=new CatatanPasien(); + } + + List listCatatanPasien = new ArrayList(); + for (CatatanPasienVO catatanPasienVO : vo.getCatatanPasien()) { + CatatanPasien catatanPasien = new CatatanPasien(); catatanPasien.setDeskripsi(catatanPasienVO.getDeskripsi()); catatanPasien.setPasien(pasien); listCatatanPasien.add(catatanPasien); } - - List listAlamat=new ArrayList(); - //add by askur 04102016 - if(vo.getAlamats().isEmpty()){ - Alamat alamat=new Alamat(); - if(CommonUtil.isNotNullOrEmpty(vo.getJenisAlamat())){ + + List listAlamat = new ArrayList(); + // add by askur 04102016 + if (vo.getAlamats().isEmpty()) { + Alamat alamat = new Alamat(); + if (CommonUtil.isNotNullOrEmpty(vo.getJenisAlamat())) { alamat.setJenisAlamat(jenisAlamatConverter.transferVOToModel(vo.getJenisAlamat(), new JenisAlamat())); } - - if(CommonUtil.isNotNullOrEmpty(vo.getPropinsi())){ + + if (CommonUtil.isNotNullOrEmpty(vo.getPropinsi())) { alamat.setPropinsi(propinsiConverter.transferVOToModel(vo.getPropinsi(), new Propinsi())); } - - if(CommonUtil.isNotNullOrEmpty(vo.getNegara())){ + + if (CommonUtil.isNotNullOrEmpty(vo.getNegara())) { alamat.setNegara(negaraConverter.transferVOToModel(vo.getNegara(), new Negara())); } - - if(CommonUtil.isNotNullOrEmpty(vo.getRekanan())){ + + if (CommonUtil.isNotNullOrEmpty(vo.getRekanan())) { alamat.setRekanan(rekananConverter.transferVOToModel(vo.getRekanan(), new Rekanan())); } - - if(CommonUtil.isNotNullOrEmpty(vo.getKecamatan())){ + + if (CommonUtil.isNotNullOrEmpty(vo.getKecamatan())) { alamat.setKecamatan(kecamatanConverter.transferVOToModel(vo.getKecamatan(), new Kecamatan())); } - - if(CommonUtil.isNotNullOrEmpty(vo.getDesaKelurahan())){ - alamat.setDesaKelurahan(desaKelurahanConverter.transferVOToModel(vo.getDesaKelurahan(), new DesaKelurahan())); + + if (CommonUtil.isNotNullOrEmpty(vo.getDesaKelurahan())) { + alamat.setDesaKelurahan( + desaKelurahanConverter.transferVOToModel(vo.getDesaKelurahan(), new DesaKelurahan())); alamat.setKodePos(vo.getDesaKelurahan().getKodePos()); } - - if(CommonUtil.isNotNullOrEmpty(vo.getHubunganKeluarga())){ - alamat.setHubunganKeluarga(hubunganKeluargaConverter.transferVOToModel(vo.getHubunganKeluarga(), new HubunganKeluarga())); + + if (CommonUtil.isNotNullOrEmpty(vo.getHubunganKeluarga())) { + alamat.setHubunganKeluarga( + hubunganKeluargaConverter.transferVOToModel(vo.getHubunganKeluarga(), new HubunganKeluarga())); } - - if(CommonUtil.isNotNullOrEmpty(vo.getKotaKabupaten())){ - alamat.setKotaKabupaten(kotaKabupatenConverter.transferVOToModel(vo.getKotaKabupaten(), new KotaKabupaten())); + + if (CommonUtil.isNotNullOrEmpty(vo.getKotaKabupaten())) { + alamat.setKotaKabupaten( + kotaKabupatenConverter.transferVOToModel(vo.getKotaKabupaten(), new KotaKabupaten())); } alamat.setPasien(pasien); - alamat.setAlamatLengkap(vo.getAlamatLengkap()); + alamat.setAlamatLengkap(vo.getAlamatLengkap()); pasien.getAlamats().add(alamat); - }else{ - // - for(AlamatVO alamatVo:vo.getAlamats()){ - Alamat alamat=new Alamat(); - if(CommonUtil.isNotNullOrEmpty(alamatVo)){ - alamat=alamatConverter.transferVOToModel(alamatVo, new Alamat()); + } else { + // + for (AlamatVO alamatVo : vo.getAlamats()) { + Alamat alamat = new Alamat(); + if (CommonUtil.isNotNullOrEmpty(alamatVo)) { + alamat = alamatConverter.transferVOToModel(alamatVo, new Alamat()); + } + + if (CommonUtil.isNotNullOrEmpty(vo.getJenisAlamat())) { + alamat.setJenisAlamat( + jenisAlamatConverter.transferVOToModel(vo.getJenisAlamat(), new JenisAlamat())); + } + + if (CommonUtil.isNotNullOrEmpty(vo.getPropinsi())) { + alamat.setPropinsi(propinsiConverter.transferVOToModel(vo.getPropinsi(), new Propinsi())); + } + + if (CommonUtil.isNotNullOrEmpty(vo.getNegara())) { + alamat.setNegara(negaraConverter.transferVOToModel(vo.getNegara(), new Negara())); + } + + if (CommonUtil.isNotNullOrEmpty(vo.getRekanan())) { + alamat.setRekanan(rekananConverter.transferVOToModel(vo.getRekanan(), new Rekanan())); + } + + if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) { + alamat.setPegawai(loginUserConverter.transferVOToModel(vo.getPegawai(), new LoginUser())); + } + + if (CommonUtil.isNotNullOrEmpty(vo.getKecamatan())) { + alamat.setKecamatan(kecamatanConverter.transferVOToModel(vo.getKecamatan(), new Kecamatan())); + } + + if (CommonUtil.isNotNullOrEmpty(vo.getDesaKelurahan())) { + alamat.setDesaKelurahan( + desaKelurahanConverter.transferVOToModel(vo.getDesaKelurahan(), new DesaKelurahan())); + } + + if (CommonUtil.isNotNullOrEmpty(vo.getHubunganKeluarga())) { + alamat.setHubunganKeluarga(hubunganKeluargaConverter.transferVOToModel(vo.getHubunganKeluarga(), + new HubunganKeluarga())); + } + + if (CommonUtil.isNotNullOrEmpty(vo.getKotaKabupaten())) { + alamat.setKotaKabupaten( + kotaKabupatenConverter.transferVOToModel(vo.getKotaKabupaten(), new KotaKabupaten())); + } + alamat.setIsPrimaryAddress(alamat.getIsPrimaryAddress()); + alamat.setPasien(pasien); + alamat.setAlamatLengkap(alamatVo.getAlamatLengkap()); + listAlamat.add(alamat); + } - - if(CommonUtil.isNotNullOrEmpty(vo.getJenisAlamat())){ - alamat.setJenisAlamat(jenisAlamatConverter.transferVOToModel(vo.getJenisAlamat(), new JenisAlamat())); - } - - if(CommonUtil.isNotNullOrEmpty(vo.getPropinsi())){ - alamat.setPropinsi(propinsiConverter.transferVOToModel(vo.getPropinsi(), new Propinsi())); - } - - if(CommonUtil.isNotNullOrEmpty(vo.getNegara())){ - alamat.setNegara(negaraConverter.transferVOToModel(vo.getNegara(), new Negara())); - } - - if(CommonUtil.isNotNullOrEmpty(vo.getRekanan())){ - alamat.setRekanan(rekananConverter.transferVOToModel(vo.getRekanan(), new Rekanan())); - } - - if(CommonUtil.isNotNullOrEmpty(vo.getPegawai())){ - alamat.setPegawai(loginUserConverter.transferVOToModel(vo.getPegawai(), new LoginUser())); - } - - if(CommonUtil.isNotNullOrEmpty(vo.getKecamatan())){ - alamat.setKecamatan(kecamatanConverter.transferVOToModel(vo.getKecamatan(), new Kecamatan())); - } - - if(CommonUtil.isNotNullOrEmpty(vo.getDesaKelurahan())){ - alamat.setDesaKelurahan(desaKelurahanConverter.transferVOToModel(vo.getDesaKelurahan(), new DesaKelurahan())); - } - - if(CommonUtil.isNotNullOrEmpty(vo.getHubunganKeluarga())){ - alamat.setHubunganKeluarga(hubunganKeluargaConverter.transferVOToModel(vo.getHubunganKeluarga(), new HubunganKeluarga())); - } - - if(CommonUtil.isNotNullOrEmpty(vo.getKotaKabupaten())){ - alamat.setKotaKabupaten(kotaKabupatenConverter.transferVOToModel(vo.getKotaKabupaten(), new KotaKabupaten())); - } - alamat.setIsPrimaryAddress(alamat.getIsPrimaryAddress()); - alamat.setPasien(pasien); - alamat.setAlamatLengkap(alamatVo.getAlamatLengkap()); - listAlamat.add(alamat); - - } - - pasien.getAlamats().addAll(listAlamat); - //add by askur 04102016 + + pasien.getAlamats().addAll(listAlamat); + // add by askur 04102016 } // pasien.getCatatanPasien().addAll(listCatatanPasien); - //add by askur 02082016 + // add by askur 02082016 pasien.setPaspor(vo.getPaspor()); pasien.setNoAditional(vo.getNoAditional()); // Pasien resultModel = pasienDao.save(pasien); runningNumberDao.save(runningNumber); - MapresultMap=new HashMap(); - if(CommonUtil.isNotNullOrEmpty(resultModel)){ + Map resultMap = new HashMap(); + if (CommonUtil.isNotNullOrEmpty(resultModel)) { resultMap.put("noCm", resultModel.getNoCm()); resultMap.put("id", resultModel.getId()); resultMap.put("namaPasien", resultModel.getNamaPasien()); } return resultMap; } - private String generatePasienCM() { - List nocmList =pasienDao.MaxNoCm(8);// IteratorUtils.toList(pasienDao.findAllNoCm().iterator()); - String noCM =null; - if(nocmList.size()!=0) - noCM=nocmList.get(nocmList.size()-1); - // generate cari no yang hilang - String missNoCm ="" ;//getCM(nocmList, 8); - if(noCM != null) - { - Integer maxNoCm=Integer.parseInt(noCM)+1; - missNoCm = StringUtil.formatNumber(maxNoCm.toString(), 8); + + @Override + public boolean saveRegistrasiPasine(RegistrasiPasienDto dto) { + try { + PasienDaftarVO pd = savePasienDaftar(dto.getPasienDaftar()); + dto.getAntrianDiperiksa().setPasienDaftar(pd); + saveAntrianDiperiksa(dto.getAntrianDiperiksa()); + return true; + } catch (Exception e) { + return false; } - else - { - Integer maxNoCm=Integer.parseInt("0")+1; - missNoCm = StringUtil.formatNumber(maxNoCm.toString(), 8); - - } - return missNoCm; } - - - + private PasienDaftarVO savePasienDaftar(PasienDaftarVO vo) { + KelompokPasien kp = converterKelompokPasien.transferVOToModel(vo.getKelompokPasien(), new KelompokPasien()); + Pasien ps = converterPasien.transferVOToModel(vo.getPasien(), new Pasien()); + Pegawai dp = converterPegawai.transferVOToModel(vo.getDokterPemeriksa(), new Pegawai()); + Pegawai dpjp = converterPegawai.transferVOToModel(vo.getDokterPenanggungJawab(), new Pegawai()); + PasienDaftar pd = converterPasienDaftar.transferVOToModel(vo, new PasienDaftar()); + pd.setKelompokPasien(kp); + pd.setPasien(ps); + pd.setDokterPemeriksa(dp); + pd.setDokterPenanggungJawab(dpjp); + PasienDaftar resultModel = pasienDaftarDao.save(pd); + PasienDaftarVO resultVO = new PasienDaftarVO(); + resultVO = converterPasienDaftar.transferModelToVO(resultModel, resultVO); + return resultVO; + } + private AntrianPasienDiPeriksaVO saveAntrianDiperiksa(AntrianPasienDiPeriksaVO vo) { + PasienDaftar pd = converterPasienDaftar.transferVOToModel(vo.getPasienDaftar(), new PasienDaftar()); + AntrianPasienDiPeriksa apd = converterAntrianDiperiksa.transferVOToModel(vo, new AntrianPasienDiPeriksa()); + apd.setPasienDaftar(pd); + AntrianPasienDiPeriksa resultModel = antrianDiperiksaDao.save(apd); + AntrianPasienDiPeriksaVO resultVO = new AntrianPasienDiPeriksaVO(); + resultVO = converterAntrianDiperiksa.transferModelToVO(resultModel, resultVO); + return resultVO; + } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/RegistrasiPasienDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/RegistrasiPasienDto.java new file mode 100644 index 00000000..cf75fcba --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/RegistrasiPasienDto.java @@ -0,0 +1,29 @@ +package com.jasamedika.medifirst2000.dto; + +import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO; +import com.jasamedika.medifirst2000.vo.PasienDaftarVO; + +/** + * @author salmanoe + * @since Dec 23, 2022 + */ +public class RegistrasiPasienDto { + private PasienDaftarVO pasienDaftar; + private AntrianPasienDiPeriksaVO antrianDiperiksa; + + public PasienDaftarVO getPasienDaftar() { + return pasienDaftar; + } + + public void setPasienDaftar(PasienDaftarVO pasienDaftar) { + this.pasienDaftar = pasienDaftar; + } + + public AntrianPasienDiPeriksaVO getAntrianDiperiksa() { + return antrianDiperiksa; + } + + public void setAntrianDiperiksa(AntrianPasienDiPeriksaVO antrianDiperiksa) { + this.antrianDiperiksa = antrianDiperiksa; + } +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java index d3472a9a..90688c33 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java @@ -4,7 +4,6 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -186,16 +185,16 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectHubunganKeluargaAmbilPasienFk", insertable = false, updatable = false) private Integer hubunganKeluargaId; - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pasienDaftar") + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasienDaftar") private Set antrianPasienDiPeriksaSet = new HashSet(); - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pasienDaftar") + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasienDaftar") private Set batalRegistrasiSet = new HashSet(); - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pasienDaftar") + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasienDaftar") private Set diputuskanDetailSet = new HashSet(); - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pasienDaftar") + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasienDaftar") private Set pemakaianAsuransiSet = new HashSet(); @ManyToOne(fetch = FetchType.LAZY) @@ -222,7 +221,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectDokterPemeriksaFk", insertable = false, updatable = false) private Integer dokterPemeriksaId; - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pasienDaftar") + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasienDaftar") private Set mapPasienDpjpToPasienDaftar = new HashSet(); @Caption(value = "emergensi") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RegistrasiPasienVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RegistrasiPasienVO.java index 1539968e..60d2b2f5 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RegistrasiPasienVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RegistrasiPasienVO.java @@ -4,20 +4,12 @@ import java.util.HashSet; import java.util.Set; import javax.persistence.CascadeType; -import javax.persistence.Column; import javax.persistence.FetchType; -import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; -import javax.persistence.OneToOne; import javax.validation.constraints.NotNull; -import com.fasterxml.jackson.annotation.JsonIdentityReference; -import com.fasterxml.jackson.annotation.JsonManagedReference; -import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; -import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.entities.Lokasi; import com.jasamedika.medifirst2000.helper.Caption; public class RegistrasiPasienVO extends BaseTransactionVO{