diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java index 32a92eec..04ba1dfd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ResepDokterDao.java @@ -1,14 +1,13 @@ package com.jasamedika.medifirst2000.dao; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.entities.ResepDokter; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.jasamedika.medifirst2000.entities.ResepDokter; +import java.util.List; +import java.util.Map; /** * @author salmanoe @@ -26,8 +25,13 @@ public interface ResepDokterDao extends PagingAndSortingRepository findResepHeaderByStrukOrderId(@Param("strukOrderId") String strukOrderId); @Query("select new Map(rd.racikanKe as rKe," + "rd.namaObat as obat," + "rd.qtyProduk as jumlah," - + "rd.keteranganLainnya as instruksi," + "rd.keteranganPakai as aturanPakai) " + "from ResepDokter rd " - + "left join rd.strukOrder so " + "left join rd.ruangan ru " + "left join so.noRegistrasi pd " + + "rd.keteranganLainnya as instruksi,rd.aturanPakaiId as aturanId,rd.aturanPakaiSignaId as aturanSignaId," + + "rd.keteranganPakai as aturanPakai, ap.keteranganPakai as keteranganPakai," + + "jd.namaJumlah as jumlahSigna," + "sd.namaSatuan as satuanSigna," + "fp.namaFrekuensi as frekuensiSigna," + + "kp.namaKeterangan as keteranganSigna) " + "from ResepDokter rd " + "left join rd.strukOrder so " + + "left join rd.aturanPakai ap " + "left join rd.aturanPakaiSigna aps " + "left join aps.jumlahDosis jd " + + "left join aps.satuanDosis sd " + "left join aps.frekuensiPakaiObat fp " + + "left join aps.keteranganPakaiObat kp " + "left join rd.ruangan ru " + "left join so.noRegistrasi pd " + "left join so.noCm ps " + "inner join so.pegawaiOrder pg " + "where rd.strukOrderId = :strukOrderId " + "order by rd.racikanKe, rd.namaObat") List> findResepBodyByStrukOrderId(@Param("strukOrderId") String strukOrderId); diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ResepDokterService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ResepDokterService.java index 037c0244..6fcae433 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ResepDokterService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ResepDokterService.java @@ -1,22 +1,22 @@ package com.jasamedika.medifirst2000.service; -import java.util.List; -import java.util.Map; - import com.jasamedika.medifirst2000.entities.ResepDokter; import com.jasamedika.medifirst2000.vo.ResepDokterVO; +import java.util.List; +import java.util.Map; + /** * @author salmanoe * @since Aug 9, 2022 * */ public interface ResepDokterService extends BaseVoService { - - public Map findHeaderResep(String strukOrderId); - - public List> findResepSatuan(String strukOrderId); - - public List> findResepRacikan(String strukOrderId); - + + Map findHeaderResep(String strukOrderId); + + List> findResepSatuan(String strukOrderId); + + List> findResepRacikan(String strukOrderId); + } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResepDokterServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResepDokterServiceImpl.java index 198ca4d9..21067b3c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResepDokterServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResepDokterServiceImpl.java @@ -1,34 +1,17 @@ package com.jasamedika.medifirst2000.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.ResepDokterDao; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.ResepDokterService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.stereotype.Service; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.ResepDokterDao; -import com.jasamedika.medifirst2000.entities.JenisKemasan; -import com.jasamedika.medifirst2000.entities.JenisObat; -import com.jasamedika.medifirst2000.entities.Produk; -import com.jasamedika.medifirst2000.entities.ResepDokter; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.SatuanStandar; -import com.jasamedika.medifirst2000.entities.StrukOrder; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.ResepDokterService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.vo.JenisKemasanVO; -import com.jasamedika.medifirst2000.vo.JenisObatVO; -import com.jasamedika.medifirst2000.vo.ProdukVO; -import com.jasamedika.medifirst2000.vo.ResepDokterVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.SatuanStandarVO; -import com.jasamedika.medifirst2000.vo.StrukOrderVO; +import java.util.*; /** * @author salmanoe @@ -163,6 +146,14 @@ public class ResepDokterServiceImpl extends BaseVoServiceImpl implements ResepDo public List> findResepSatuan(String strukOrderId) { List> result = new ArrayList<>(); List> data = resepDokterDao.findResepBodyByStrukOrderId(strukOrderId); + data.forEach(d -> { + if (CommonUtil.isNotNullOrEmpty(d.get("aturanSignaId"))) { + d.put("instruksi", d.get("jumlahSigna").toString() + " " + d.get("satuanSigna").toString()); + d.put("aturanPakai", d.get("frekuensiSigna").toString() + " " + d.get("keteranganSigna").toString()); + } else if (CommonUtil.isNotNullOrEmpty(d.get("aturanId"))) { + d.put("aturanPakai", d.get("keteranganPakai")); + } + }); List listResepKe = new ArrayList<>(); for (Map map : data) { if (!listResepKe.contains(map.get("rKe"))) { @@ -191,6 +182,14 @@ public class ResepDokterServiceImpl extends BaseVoServiceImpl implements ResepDo public List> findResepRacikan(String strukOrderId) { List> result = new ArrayList<>(); List> data = resepDokterDao.findResepBodyByStrukOrderId(strukOrderId); + data.forEach(d -> { + if (CommonUtil.isNotNullOrEmpty(d.get("aturanSignaId"))) { + d.put("instruksi", d.get("jumlahSigna").toString() + " " + d.get("satuanSigna").toString()); + d.put("aturanPakai", d.get("frekuensiSigna").toString() + " " + d.get("keteranganSigna").toString()); + } else if (CommonUtil.isNotNullOrEmpty(d.get("aturanId"))) { + d.put("aturanPakai", d.get("keteranganPakai")); + } + }); List listResepKe = new ArrayList<>(); for (Map map : data) { if (!listResepKe.contains(map.get("rKe"))) { diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/DetailHasilTriase.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/DetailHasilTriase.java index 15e81834..1c1151b9 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/DetailHasilTriase.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/DetailHasilTriase.java @@ -1,74 +1,40 @@ package com.jasamedika.medifirst2000.entities; -import java.sql.Date; +import com.jasamedika.medifirst2000.base.BaseTransaction; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.NotNull; -import com.jasamedika.medifirst2000.base.BaseTransaction; -import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited; +import static javax.persistence.FetchType.LAZY; -@Entity //@Audited +/** + * @author Shakato + */ +@Getter +@Setter +@Entity @Table(name = "DetailHasilTriase_T") public class DetailHasilTriase extends BaseTransaction { - /** - * @author Shakato - */ - - @ManyToOne + private static final long serialVersionUID = -4635174138004339482L; + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectHasilTriaseFk") @Caption(value = "ID HasilTriase") @NotNull(message = "ID HasilTriase tidak boleh kosong") private HasilTriase hasilTriase; - + @Column(name = "ObjectHasilTriaseFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false) private String hasilTriaseId; - - @ManyToOne + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectPemeriksaanTriageFk") @Caption(value = "ID PemeriksaanTriage") @NotNull(message = "ID PemeriksaanTriage tidak boleh kosong") private PemeriksaanTriage pemeriksaanTriage; - + @Column(name = "ObjectPemeriksaanTriageFk", insertable = false, updatable = false, nullable = false) private Integer pemeriksaanTriageId; - - public HasilTriase getHasilTriase() { - return hasilTriase; - } - - public void setHasilTriase(HasilTriase hasilTriase) { - this.hasilTriase = hasilTriase; - } - - public String getHasilTriaseId() { - return hasilTriaseId; - } - - public void setHasilTriaseId(String hasilTriaseId) { - this.hasilTriaseId = hasilTriaseId; - } - - public PemeriksaanTriage getPemeriksaanTriage() { - return pemeriksaanTriage; - } - - public void setPemeriksaanTriage(PemeriksaanTriage pemeriksaanTriage) { - this.pemeriksaanTriage = pemeriksaanTriage; - } - - public Integer getPemeriksaanTriageId() { - return pemeriksaanTriageId; - } - - public void setPemeriksaanTriageId(Integer pemeriksaanTriageId) { - this.pemeriksaanTriageId = pemeriksaanTriageId; - } - - - } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HasilTriase.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HasilTriase.java index 4356de0f..3bff556b 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HasilTriase.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HasilTriase.java @@ -1,140 +1,98 @@ package com.jasamedika.medifirst2000.entities; +import com.fasterxml.jackson.annotation.JsonBackReference; +import com.jasamedika.medifirst2000.base.BaseTransaction; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; 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; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import static javax.persistence.CascadeType.ALL; +import static javax.persistence.FetchType.LAZY; -import com.fasterxml.jackson.annotation.JsonBackReference; -import com.jasamedika.medifirst2000.base.BaseTransaction; -import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited; - -@Entity //@Audited +/** + * @author Shakato + */ +@Getter +@Setter +@Entity @Table(name = "HasilTriase_T") public class HasilTriase extends BaseTransaction { - /** - * @author Shakato - */ - @ManyToOne + private static final long serialVersionUID = 6096591359258862048L; + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "Pasien") - @Caption(value = "Pasien") + @Caption(value = "Pasien") private Pasien pasien; - public Pasien getPasien() { - return pasien; - } - public void setPasien(Pasien pasien) { - this.pasien = pasien; - } - - @Column(name = "Pasien", insertable = false, updatable = false, nullable = true) + @Column(name = "Pasien", insertable = false, updatable = false) private Integer pasienId; - - @ManyToOne + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKategoriHasilTriaseFk") @Caption(value = "ID KategoriHasilTriasev") @NotNull(message = "ID KategoriHasilTriase tidak boleh kosong") private KategoriHasilTriase kategoriHasilTriase; - + @Column(name = "ObjectKategoriHasilTriaseFk", insertable = false, updatable = false, nullable = false) private Integer kategoriHasilTriaseId; - - @Column(name = "hasilTriaseWaktu", nullable = true) + + @Column(name = "hasilTriaseWaktu") @Caption(value = "hasilTriaseWaktu") private String hasilTriaseWaktu; - - @Column(name = "tanggalMasuk", nullable = true) + + @Column(name = "tanggalMasuk") @Caption(value = "tanggalMasuk") private Date tanggalMasuk; - - @Column(name = "generateTriase", nullable = true) + + @Column(name = "generateTriase") @Caption(value = "generateTriase") private String generateTriase; @JsonBackReference - @OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "hasilTriase") - private Set detailHasilTriase=new HashSet(); - - @Column(name = "namaPasien", nullable = true) + @OneToMany(cascade = ALL, fetch = LAZY, mappedBy = "hasilTriase") + private Set detailHasilTriase = new HashSet<>(); + + @Column(name = "namaPasien") @Caption(value = "namaPasien") private String namaPasien; - - @Column(name = "statusPasien", nullable = true) + + @Column(name = "statusPasien") @Caption(value = "statusPasien") private String statusPasien; - public Date getTanggalMasuk() { - return tanggalMasuk; - } + @Column(name = "beratbadan", length = 10) + @Caption(value = "Berat Badan") + private String beratBadan; - public void setTanggalMasuk(Date tanggalMasuk) { - this.tanggalMasuk = tanggalMasuk; - } + @Column(name = "tekanandarah", length = 10) + @Caption(value = "Tekanan Darah") + private String tekananDarah; - public KategoriHasilTriase getKategoriHasilTriase() { - return kategoriHasilTriase; - } + @Column(length = 10) + @Caption(value = "Suhu") + private String suhu; - public void setKategoriHasilTriase(KategoriHasilTriase kategoriHasilTriase) { - this.kategoriHasilTriase = kategoriHasilTriase; - } + @Column(length = 10) + @Caption(value = "Nadi") + private String nadi; - public Integer getKategoriHasilTriaseId() { - return kategoriHasilTriaseId; - } + @Column(length = 10) + @Caption(value = "Pernapasan") + private String pernapasan; - public void setKategoriHasilTriaseId(Integer kategoriHasilTriaseId) { - this.kategoriHasilTriaseId = kategoriHasilTriaseId; - } + @Column(name = "noregistrasifk", length = 40) + @Caption(value = "No registrasi") + private String noRegistrasi; - public String getHasilTriaseWaktu() { - return hasilTriaseWaktu; - } + @Column(name = "tgl_diputuskan") + private Date tglDiputuskan; - public void setHasilTriaseWaktu(String hasilTriaseWaktu) { - this.hasilTriaseWaktu = hasilTriaseWaktu; - } - - public Set getDetailHasilTriase() { - return detailHasilTriase; - } - - public void setDetailHasilTriase(Set detailHasilTriase) { - this.detailHasilTriase = detailHasilTriase; - } - - public String getGenerateTriase() { - return generateTriase; - } - - public void setGenerateTriase(String generateTriase) { - this.generateTriase = generateTriase; - } - - public String getNamaPasien() { - return namaPasien; - } - - public void setNamaPasien(String namaPasien) { - this.namaPasien = namaPasien; - } - - public String getStatusPasien() { - return statusPasien; - } - - public void setStatusPasien(String statusPasien) { - this.statusPasien = statusPasien; - } - - + @Column(name = "tgl_diperiksa_dokter") + private Date tglDiperiksaDokter; } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KategoriHasilTriase.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KategoriHasilTriase.java index ca507d8a..ce583dee 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KategoriHasilTriase.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KategoriHasilTriase.java @@ -1,28 +1,27 @@ package com.jasamedika.medifirst2000.entities; -import java.io.Serializable; -import org.hibernate.envers.Audited; -import javax.persistence.*; - -import org.hibernate.validator.constraints.NotEmpty; - -import com.jasamedika.medifirst2000.base.BaseMaster; -import javax.validation.constraints.NotNull; -import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.internal.util.logging.Messages; - -import com.fasterxml.jackson.annotation.JsonManagedReference; import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; -import org.hibernate.envers.Audited; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; /** * * @author Shakato */ -@Entity // @Audited +@Getter +@Setter +@Entity @Table(name = "HasilKategoriTriase_M") public class KategoriHasilTriase extends BaseMaster { + private static final long serialVersionUID = 7170817369628812008L; + @NotNull(message = "Kd Triase tidak boleh kosong") @Column(name = "KdHasilKategoriTriase", nullable = false) @Caption(value = "Kode HasilKategoriTriase") @@ -38,41 +37,7 @@ public class KategoriHasilTriase extends BaseMaster { @Caption(value = "QHasilKategoriTriase") private short qHasilKategoriTriase; - public short getKdHasilKategoriTriase() { - return kdHasilKategoriTriase; - } - - public void setKdHasilKategoriTriase(short kdHasilKategoriTriase) { - this.kdHasilKategoriTriase = kdHasilKategoriTriase; - } - - public String getNamaHasilKategoriTriase() { - return namaHasilKategoriTriase; - } - - public void setNamaHasilKategoriTriase(String namaHasilKategoriTriase) { - this.namaHasilKategoriTriase = namaHasilKategoriTriase; - } - - public short getqHasilKategoriTriase() { - return qHasilKategoriTriase; - } - - public void setqHasilKategoriTriase(short qHasilKategoriTriase) { - this.qHasilKategoriTriase = qHasilKategoriTriase; - } - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.HasilKategoriTriase_M") - @javax.persistence.SequenceGenerator(name = "public.HasilKategoriTriase_M", sequenceName = "public.HasilKategoriTriase_M", allocationSize = 1) - @Column(name = "id") + @Column(name = "id", columnDefinition = "serial4") protected Integer id; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PemeriksaanTriage.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PemeriksaanTriage.java index 7f1fd768..619c8826 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PemeriksaanTriage.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PemeriksaanTriage.java @@ -1,76 +1,44 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; -import org.hibernate.envers.Audited; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.Column; +import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; /** * class PemeriksaanTriage * * @author Generator */ -@Entity // @Audited +@Getter +@Setter +@Entity @Table(name = "RM_PemeriksaanTriage_M") public class PemeriksaanTriage extends BaseMaster { + private static final long serialVersionUID = -7006702836258405722L; + @NotNull(message = "KdTriage tidak boleh kosong") @Column(name = "KdTriage", nullable = false, length = 100) @Caption(value = "KdTriage") private String kdTriage; - public void setKdTriage(String kdTriage) { - this.kdTriage = kdTriage; - } - - public String getKdTriage() { - return this.kdTriage; - } - @NotNull(message = "NamaTriage tidak boleh kosong") @Column(name = "NamaTriage", nullable = false, length = 100) @Caption(value = "NamaTriage") private String namaTriage; - public void setNamaTriage(String namaTriage) { - this.namaTriage = namaTriage; - } - - public String getNamaTriage() { - return this.namaTriage; - } - @NotNull(message = "JenisPemeriksaan tidak boleh kosong") @Column(name = "JenisPemeriksaan", nullable = false, length = 100) @Caption(value = "JenisPemeriksaan") private String jenisPemeriksaan; - public void setJenisPemeriksaan(String jenisPemeriksaan) { - this.jenisPemeriksaan = jenisPemeriksaan; - } - - public String getJenisPemeriksaan() { - return this.jenisPemeriksaan; - } - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.pemeriksaantriage_m_id_seq") - @javax.persistence.SequenceGenerator(name = "public.pemeriksaantriage_m_id_seq", sequenceName = "public.pemeriksaantriage_m_id_seq", allocationSize = 1) - @Column(name = "id") + @Column(name = "id", columnDefinition = "serial4") protected Integer id; - - public Integer getId() { - - return id; - } - - public void setId(Integer id) { - this.id = id; - } } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailHasilTriaseVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailHasilTriaseVO.java index cdc77537..aeb256bc 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailHasilTriaseVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailHasilTriaseVO.java @@ -1,50 +1,23 @@ package com.jasamedika.medifirst2000.vo; -import java.sql.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - -import com.jasamedika.medifirst2000.base.BaseTransaction; import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; +import javax.validation.constraints.NotNull; + +/** + * @author Shakato + */ +@Getter +@Setter public class DetailHasilTriaseVO extends BaseTransactionVO { - /** - * @author Shakato - */ - - @ManyToOne - @JoinColumn(name = "ObjectHasilTriaseFk") @Caption(value = "ID HasilTriase") @NotNull(message = "ID HasilTriase tidak boleh kosong") private HasilTriaseVO hasilTriase; - - @ManyToOne - @JoinColumn(name = "ObjectPemeriksaanTriageFk") + @Caption(value = "ID PemeriksaanTriage") @NotNull(message = "ID PemeriksaanTriage tidak boleh kosong") private PemeriksaanTriageVO pemeriksaanTriage; - - public HasilTriaseVO getHasilTriase() { - return hasilTriase; - } - - public void setHasilTriase(HasilTriaseVO hasilTriase) { - this.hasilTriase = hasilTriase; - } - - public PemeriksaanTriageVO getPemeriksaanTriage() { - return pemeriksaanTriage; - } - - public void setPemeriksaanTriage(PemeriksaanTriageVO pemeriksaanTriageVO) { - this.pemeriksaanTriage = pemeriksaanTriageVO; - } - - } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilTriaseVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilTriaseVO.java index ef178c21..65dd2d98 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilTriaseVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilTriaseVO.java @@ -1,114 +1,39 @@ package com.jasamedika.medifirst2000.vo; +import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.NotNull; import java.util.Date; -//import java.sql.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; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - -import com.fasterxml.jackson.annotation.JsonBackReference; -import com.jasamedika.medifirst2000.base.BaseTransaction; -import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; -import com.jasamedika.medifirst2000.helper.Caption; - +/** + * @author Shakato + */ +@Getter +@Setter public class HasilTriaseVO extends BaseTransactionVO { - /** - * @author Shakato - */ - - @ManyToOne - @JoinColumn(name = "ObjectKategoriHasilTriaseFk") @Caption(value = "ID KategoriHasilTriasev") @NotNull(message = "ID KategoriHasilTriase tidak boleh kosong") private KategoriHasilTriaseVO kategoriHasilTriase; - - @Column(name = "hasilTriaseWaktu", nullable = true) + @Caption(value = "hasilTriaseWaktu") private String hasilTriaseWaktu; - - //@JsonBackReference - @OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "hasilTriase") - private Set detailHasilTriase=new HashSet(); - - @Column(name = "tanggalMasuk", nullable = true) + + private Set detailHasilTriase = new HashSet<>(); + @Caption(value = "tanggalMasuk") private Date tanggalMasuk; - - @Column(name = "generateTriase", nullable = true) + @Caption(value = "generateTriase") private String generateTriase; - - @Column(name = "namaPasien", nullable = true) + @Caption(value = "namaPasien") private String namaPasien; - - @Column(name = "statusPasien", nullable = true) + @Caption(value = "statusPasien") private String statusPasien; - - public Date getTanggalMasuk() { - return tanggalMasuk; - } - - public void setTanggalMasuk(Date tanggalMasuk) { - this.tanggalMasuk = tanggalMasuk; - } - - public KategoriHasilTriaseVO getKategoriHasilTriase() { - return kategoriHasilTriase; - } - - public void setKategoriHasilTriase(KategoriHasilTriaseVO kategoriHasilTriase) { - this.kategoriHasilTriase = kategoriHasilTriase; - } - - public String getHasilTriaseWaktu() { - return hasilTriaseWaktu; - } - - public void setHasilTriaseWaktu(String hasilTriaseWaktu) { - this.hasilTriaseWaktu = hasilTriaseWaktu; - } - - public Set getDetailHasilTriase() { - return detailHasilTriase; - } - - public void setDetailHasilTriase(Set detailHasilTriase) { - this.detailHasilTriase = detailHasilTriase; - } - - public String getGenerateTriase() { - return generateTriase; - } - - public void setGenerateTriase(String generateTriase) { - this.generateTriase = generateTriase; - } - - public String getNamaPasien() { - return namaPasien; - } - - public void setNamaPasien(String namaPasien) { - this.namaPasien = namaPasien; - } - - public String getStatusPasien() { - return statusPasien; - } - - public void setStatusPasien(String statusPasien) { - this.statusPasien = statusPasien; - } - } \ No newline at end of file diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/KategoriHasilTriaseVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/KategoriHasilTriaseVO.java index 4e946f17..a48221c5 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/KategoriHasilTriaseVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/KategoriHasilTriaseVO.java @@ -1,64 +1,28 @@ package com.jasamedika.medifirst2000.vo; -import java.io.Serializable; -import javax.persistence.*; - -import org.hibernate.validator.constraints.NotEmpty; - -import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotNull; -import org.hibernate.validator.constraints.Length; -import org.hibernate.validator.internal.util.logging.Messages; - -import com.fasterxml.jackson.annotation.JsonManagedReference; -import com.jasamedika.medifirst2000.helper.Caption; /** * * @author Shakato */ +@Getter +@Setter public class KategoriHasilTriaseVO extends BaseMasterVO { - @NotNull(message="Kd Triase tidak boleh kosong") - @Column(name = "KdHasilKategoriTriase", nullable = false ) - @Caption(value="Kode HasilKategoriTriase") + @NotNull(message = "Kd Triase tidak boleh kosong") + @Caption(value = "Kode HasilKategoriTriase") private short kdHasilKategoriTriase; - - @NotNull(message="Nama HasilKategoriTriase tidak boleh kosong") - @Column(name = "NamaHasilKategoriTriase", nullable = false , length = 20) - @Caption(value="Nama HasilKategoriTriase") + @NotNull(message = "Nama HasilKategoriTriase tidak boleh kosong") + @Caption(value = "Nama HasilKategoriTriase") private String namaHasilKategoriTriase; - @NotNull(message="QHasilKategoriTriase tidak boleh kosong") - @Column(name = "QHasilKategoriTriase", nullable = false ) - @Caption(value="QHasilKategoriTriase") + @NotNull(message = "QHasilKategoriTriase tidak boleh kosong") + @Caption(value = "QHasilKategoriTriase") private short qHasilKategoriTriase; - - public short getKdHasilKategoriTriase() { - return kdHasilKategoriTriase; - } - - public void setKdHasilKategoriTriase(short kdHasilKategoriTriase) { - this.kdHasilKategoriTriase = kdHasilKategoriTriase; - } - - public String getNamaHasilKategoriTriase() { - return namaHasilKategoriTriase; - } - - public void setNamaHasilKategoriTriase(String namaHasilKategoriTriase) { - this.namaHasilKategoriTriase = namaHasilKategoriTriase; - } - - public short getqHasilKategoriTriase() { - return qHasilKategoriTriase; - } - - public void setqHasilKategoriTriase(short qHasilKategoriTriase) { - this.qHasilKategoriTriase = qHasilKategoriTriase; - } - } - diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemeriksaanTriageVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemeriksaanTriageVO.java index 477f3194..d4a95141 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemeriksaanTriageVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemeriksaanTriageVO.java @@ -1,61 +1,29 @@ package com.jasamedika.medifirst2000.vo; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; +import com.jasamedika.medifirst2000.helper.Caption; +import lombok.Getter; +import lombok.Setter; + import javax.validation.constraints.NotNull; -import com.jasamedika.medifirst2000.base.BaseMaster; -import com.jasamedika.medifirst2000.helper.Caption; -import com.jasamedika.medifirst2000.base.vo.BaseMasterVO; /** - * class PemeriksaanTriage + * class PemeriksaanTriage * * @author Generator */ - +@Getter +@Setter public class PemeriksaanTriageVO extends BaseMasterVO { - @NotNull(message="KdTriage tidak boleh kosong") - @Column(name = "KdTriage", nullable = false, length = 100) + @NotNull(message = "KdTriage tidak boleh kosong") @Caption(value = "KdTriage") private String kdTriage; - public void setKdTriage(String kdTriage) - { - this.kdTriage = kdTriage; - } - public String getKdTriage() - { - return this.kdTriage; - } - - @NotNull(message="NamaTriage tidak boleh kosong") - @Column(name = "NamaTriage", nullable = false, length = 100) + @NotNull(message = "NamaTriage tidak boleh kosong") @Caption(value = "NamaTriage") private String namaTriage; - public void setNamaTriage(String namaTriage) - { - this.namaTriage = namaTriage; - } - public String getNamaTriage() - { - return this.namaTriage; - } - - @NotNull(message="JenisPemeriksaan tidak boleh kosong") - @Column(name = "JenisPemeriksaan", nullable = false, length = 100) + @NotNull(message = "JenisPemeriksaan tidak boleh kosong") @Caption(value = "JenisPemeriksaan") private String jenisPemeriksaan; - public void setJenisPemeriksaan(String jenisPemeriksaan) - { - this.jenisPemeriksaan = jenisPemeriksaan; - } - public String getJenisPemeriksaan() - { - return this.jenisPemeriksaan; - } - - - } \ No newline at end of file diff --git a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java index 98db7ca7..89ce011c 100644 --- a/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java +++ b/jasamedika-reporting/src/main/java/com/jasamedika/medifirst2000/controller/ReportingController.java @@ -1690,7 +1690,7 @@ public class ReportingController extends LocaleController dto.setLamaDirawatPenderitaMasuk( AgeCalculator.calculateAge2(df.parse(tglKeluar), df.parse(tglMasuk)).toString()); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } dto.setStatusKeluar(statusKeluar); @@ -4376,7 +4376,7 @@ public class ReportingController extends LocaleController m.addObject("endDate", DateUtil.getIndonesianStringDate(sdf.parse(endDate))); m.addObject("startDate", DateUtil.getIndonesianStringDate(sdf.parse(startDate))); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } m.addObject("idFinger", temp.get("idFinger")); m.addObject("jmlterlambat", ((Long) kehadiran.get("jumlahTerlambat")).toString()); @@ -5672,7 +5672,7 @@ public class ReportingController extends LocaleController m.addObject("endDate", ed); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } Map resultSimpan = neracaLimbahService.findReportNeracaLimbahB3(noRec); @@ -6667,7 +6667,7 @@ public class ReportingController extends LocaleController getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } return RestUtil.getJsonResponse(result, HttpStatus.OK); } @@ -6827,7 +6827,7 @@ public class ReportingController extends LocaleController m.addObject("endDate", ed); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } m.addObject("dataSource", dataSource.get("dataSource")); @@ -6862,7 +6862,7 @@ public class ReportingController extends LocaleController m.addObject("endDate", ed); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } m.addObject("dsRekapLayananLaundry", dsRekapLayananLaundry); @@ -6900,7 +6900,7 @@ public class ReportingController extends LocaleController m.addObject("endDate", ed); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } m.addObject("dsRekapLayananSterilisasi", dsRekapLayananSterilisasi); @@ -6941,7 +6941,7 @@ public class ReportingController extends LocaleController m.addObject("endDate", ed); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } m.addObject("dsRekapPengirimanSterilisasi", dsRekapPengirimanSterilisasi); @@ -7025,7 +7025,7 @@ public class ReportingController extends LocaleController periode = DateUtil.getIndonesianStringDate(sd) + " s/d " + DateUtil.getIndonesianStringDate(ed); } } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } if (CommonUtil.isNotNullOrEmpty(ruanganId)) { m.addObject("ruangan", ruanganDao.findOne(ruanganId).getNamaRuangan()); @@ -7093,7 +7093,7 @@ public class ReportingController extends LocaleController m.addObject("endDate", ed); } catch (ParseException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } m.addObject("dsRekapLayananLaundry", dsRekapCuciLinen);