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 f3214d1a..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 @@ -23,7 +23,7 @@ import static javax.persistence.FetchType.LAZY; @Entity @Table(name = "HasilTriase_T") public class HasilTriase extends BaseTransaction { - private static final long serialVersionUID = -2273466592746481666L; + private static final long serialVersionUID = 6096591359258862048L; @ManyToOne(fetch = LAZY) @JoinColumn(name = "Pasien") @@ -65,4 +65,34 @@ public class HasilTriase extends BaseTransaction { @Column(name = "statusPasien") @Caption(value = "statusPasien") private String statusPasien; + + @Column(name = "beratbadan", length = 10) + @Caption(value = "Berat Badan") + private String beratBadan; + + @Column(name = "tekanandarah", length = 10) + @Caption(value = "Tekanan Darah") + private String tekananDarah; + + @Column(length = 10) + @Caption(value = "Suhu") + private String suhu; + + @Column(length = 10) + @Caption(value = "Nadi") + private String nadi; + + @Column(length = 10) + @Caption(value = "Pernapasan") + private String pernapasan; + + @Column(name = "noregistrasifk", length = 40) + @Caption(value = "No registrasi") + private String noRegistrasi; + + @Column(name = "tgl_diputuskan") + private Date tglDiputuskan; + + @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 aa0be00c..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 @@ -5,11 +5,12 @@ import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; import javax.validation.constraints.NotNull; -import static javax.persistence.GenerationType.SEQUENCE; - /** * * @author Shakato @@ -37,8 +38,6 @@ public class KategoriHasilTriase extends BaseMaster { private short qHasilKategoriTriase; @Id - @GeneratedValue(strategy = SEQUENCE, generator = "public.HasilKategoriTriase_M") - @SequenceGenerator(name = "public.HasilKategoriTriase_M", sequenceName = "public.HasilKategoriTriase_M", allocationSize = 1) - @Column(name = "id") + @Column(name = "id", columnDefinition = "serial4") protected Integer 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 51bce3aa..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 @@ -5,11 +5,12 @@ import com.jasamedika.medifirst2000.helper.Caption; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; import javax.validation.constraints.NotNull; -import static javax.persistence.GenerationType.SEQUENCE; - /** * class PemeriksaanTriage * @@ -38,8 +39,6 @@ public class PemeriksaanTriage extends BaseMaster { private String jenisPemeriksaan; @Id - @GeneratedValue(strategy = SEQUENCE, generator = "public.pemeriksaantriage_m_id_seq") - @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; } \ No newline at end of file