From e8a247f6ffb06dff4a6a9d1406e9b2a2fb36a864 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Wed, 28 Dec 2022 11:11:36 +0700 Subject: [PATCH] Update RegistrasiPasienService Perbaikan set pasien saat pendaftaran antrean online dari mobile jkn --- .../service/impl/RegistrasiPasienServiceImpl.java | 8 +++----- .../jasamedika/medifirst2000/base/vo/BaseMasterVO.java | 7 +------ .../com/jasamedika/medifirst2000/entities/Pasien.java | 7 ++++--- 3 files changed, 8 insertions(+), 14 deletions(-) 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 386ea48a..fac77335 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 @@ -33,7 +33,6 @@ import com.jasamedika.medifirst2000.converter.TitlePasienConverter; import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; import com.jasamedika.medifirst2000.dao.PasienDaftarDao; import com.jasamedika.medifirst2000.dao.PasienDao; -import com.jasamedika.medifirst2000.dao.PegawaiDao; import com.jasamedika.medifirst2000.dao.PemakaianAsuransiDao; import com.jasamedika.medifirst2000.dao.RunningNumberDao; import com.jasamedika.medifirst2000.dto.RegistrasiPasienDto; @@ -93,6 +92,7 @@ import com.jasamedika.medifirst2000.vo.RuanganVO; * @param */ @Service("registrasiPasienService") +@Transactional public class RegistrasiPasienServiceImpl extends BaseVoServiceImpl implements RegistrasiPasienService { @Autowired private BaseConverterImpl kebangsaanConverter; @@ -124,9 +124,6 @@ public class RegistrasiPasienServiceImpl extends BaseVoServiceImpl implements Re @Autowired private BaseConverterImpl converterKasusPenyakit; - @Autowired - private BaseConverterImpl converterPasien; - @Autowired private BaseConverterImpl converterPegawai; @@ -401,6 +398,7 @@ public class RegistrasiPasienServiceImpl extends BaseVoServiceImpl implements Re AntrianPasienDiPeriksaVO apd = saveAntrianDiperiksa(dto.getAntrianDiperiksa()); return apd.getNoRec(); } catch (Exception e) { + e.printStackTrace(); return null; } } @@ -439,7 +437,7 @@ public class RegistrasiPasienServiceImpl extends BaseVoServiceImpl implements Re Ruangan ru = converterRuangan.transferVOToModel(vo.getRuangan(), new Ruangan()); KasusPenyakit kap = converterKasusPenyakit.transferVOToModel(vo.getKasusPenyakit(), new KasusPenyakit()); Kelas kls = converterKelas.transferVOToModel(vo.getKelas(), new Kelas()); - Pasien ps = converterPasien.transferVOToModel(vo.getPasien(), new Pasien()); + Pasien ps = pasienDao.findById(vo.getPasien().getId()); Pegawai dp = converterPegawai.transferVOToModel(vo.getDokterPemeriksa(), new Pegawai()); PasienDaftar pd = converterPasienDaftar.transferVOToModel(vo, new PasienDaftar()); pd.setRekanan(rk); diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMasterVO.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMasterVO.java index 10350d92..3d447d4b 100644 --- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMasterVO.java +++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/vo/BaseMasterVO.java @@ -1,7 +1,5 @@ package com.jasamedika.medifirst2000.base.vo; -import java.io.Serializable; - import javax.persistence.MappedSuperclass; /** @@ -10,10 +8,7 @@ import javax.persistence.MappedSuperclass; * @author Adik */ @MappedSuperclass -public abstract class BaseMasterVO extends BaseActiveVO implements Serializable { - - private static final long serialVersionUID = 3408886721062001433L; - +public abstract class BaseMasterVO extends BaseActiveVO { protected Integer id; protected String noRec; protected String reportDisplay; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pasien.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pasien.java index f54c7f3d..0b0c8aee 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pasien.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Pasien.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.EntityListeners; @@ -35,6 +34,8 @@ import com.jasamedika.medifirst2000.util.AgeCalculator; @Table(name = "Pasien_M") public class Pasien extends BaseMaster { + private static final long serialVersionUID = -7771356073340836706L; + @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.pasien_m_id_seq") @SequenceGenerator(name = "public.pasien_m_id_seq", sequenceName = "public.pasien_m_id_seq", allocationSize = 1) @@ -175,11 +176,11 @@ public class Pasien extends BaseMaster { private Set alamats = new HashSet(); @JsonBackReference - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pasien") + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasien") private Set catatanPasien = new HashSet(); @JsonBackReference - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pasien") + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasien") private Set antrianPasienRegistrasis = new HashSet(); @Column(name = "noIdentitas")