Update RegistrasiPasienService
Perbaikan set pasien saat pendaftaran antrean online dari mobile jkn
This commit is contained in:
parent
5aba8a2bfe
commit
e8a247f6ff
@ -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 <T>
|
||||
*/
|
||||
@Service("registrasiPasienService")
|
||||
@Transactional
|
||||
public class RegistrasiPasienServiceImpl extends BaseVoServiceImpl implements RegistrasiPasienService {
|
||||
@Autowired
|
||||
private BaseConverterImpl<KebangsaanVO, Kebangsaan> kebangsaanConverter;
|
||||
@ -124,9 +124,6 @@ public class RegistrasiPasienServiceImpl extends BaseVoServiceImpl implements Re
|
||||
@Autowired
|
||||
private BaseConverterImpl<KasusPenyakitVO, KasusPenyakit> converterKasusPenyakit;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl<PasienVO, Pasien> converterPasien;
|
||||
|
||||
@Autowired
|
||||
private BaseConverterImpl<PegawaiVO, Pegawai> 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);
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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<Alamat> alamats = new HashSet<Alamat>();
|
||||
|
||||
@JsonBackReference
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pasien")
|
||||
@OneToMany(fetch = FetchType.LAZY, mappedBy = "pasien")
|
||||
private Set<CatatanPasien> catatanPasien = new HashSet<CatatanPasien>();
|
||||
|
||||
@JsonBackReference
|
||||
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "pasien")
|
||||
@OneToMany(fetch = FetchType.LAZY, mappedBy = "pasien")
|
||||
private Set<AntrianPasienRegistrasi> antrianPasienRegistrasis = new HashSet<AntrianPasienRegistrasi>();
|
||||
|
||||
@Column(name = "noIdentitas")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user