diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiHeader.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiHeader.java index 1b8583fd..8f2b5393 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiHeader.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiHeader.java @@ -1,19 +1,13 @@ package com.jasamedika.medifirst2000.entities; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.jasamedika.medifirst2000.base.BaseTransaction; import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.Date; + @Entity @Table(name = "AsuhanKeperawatanPeriOperasiHeader_T") @JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) @@ -27,8 +21,8 @@ public class AsuhanKeperawatanPeriOperasiHeader extends BaseTransaction { @NotNull(message = "Pasien tidak boleh kosong") private AntrianPasienDiPeriksa pasienDaftar; - @Column(name = "ObjectPasienFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false) - private String pasienId; +// @Column(name = "ObjectPasienFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false) +// private String pasienId; @Column(name = "checkInfk", insertable = false, updatable = false) private String pasienDaftarId; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Fakultas.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Fakultas.java index 035c7d2e..bc1c0c5d 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Fakultas.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Fakultas.java @@ -1,16 +1,11 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; +import javax.validation.constraints.NotNull; + /** * class AkibatHaid * @@ -20,7 +15,7 @@ import com.jasamedika.medifirst2000.helper.Caption; @Table(name = "SDM_Fakultas_M") public class Fakultas extends BaseMaster { @NotNull(message = "Name tidak boleh kosong") - @Column(name = "Name", nullable = false, length = 100) + @Column(name = "Name", nullable = true, length = 100) @Caption(value = "Name") private String name; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/InstitusiPendidikan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/InstitusiPendidikan.java index 43eb6bad..051dbe81 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/InstitusiPendidikan.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/InstitusiPendidikan.java @@ -1,16 +1,11 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; +import javax.validation.constraints.NotNull; + /** * class AkibatHaid * @@ -20,7 +15,7 @@ import com.jasamedika.medifirst2000.helper.Caption; @Table(name = "SDM_InstitusiPendidikan_M") public class InstitusiPendidikan extends BaseMaster { @NotNull(message="Name tidak boleh kosong") - @Column(name = "Name", nullable = false, length = 100) + @Column(name = "Name", nullable = true, length = 100) @Caption(value = "Name") private String name; public void setName(String name) diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JurusanPeminatan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JurusanPeminatan.java index 3768f056..14103126 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JurusanPeminatan.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JurusanPeminatan.java @@ -1,15 +1,10 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; + /** * class JurusanPeminatan * @@ -31,7 +26,7 @@ public class JurusanPeminatan extends BaseMaster { this.kode = kode; } - @Column(name = "Name", nullable = false, length = 100) + @Column(name = "Name", nullable = true, length = 100) @Caption(value = "Name") private String name; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KategoryProduk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KategoryProduk.java index 740821f7..aa554474 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KategoryProduk.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KategoryProduk.java @@ -1,23 +1,10 @@ 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 javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; + +import javax.persistence.*; +import javax.validation.constraints.NotNull; /** * class KategoryProduk @@ -59,7 +46,7 @@ public class KategoryProduk extends BaseMaster { private Integer departemenId; @NotNull(message = "Kd Kategory Produk tidak boleh kosong") - @Column(name = "KdKategoryProduk", nullable = false) + @Column(name = "KdKategoryProduk", nullable = true) @Caption(value = "Kode Kategory Produk") private Byte kdKategoryProduk; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Observasi.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Observasi.java index 2badd5ad..9e86deac 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Observasi.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Observasi.java @@ -1,18 +1,10 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - import com.jasamedika.medifirst2000.base.BaseMaster; import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; + @Entity // @Audited @Table(name = "Observasi_M") public class Observasi extends BaseMaster { @@ -48,7 +40,7 @@ public class Observasi extends BaseMaster { private Integer jenisObservasiId; @Caption(value="nilainormal ") - @Column(name="nilainormal ", nullable=true) + @Column(name="nilainormal", nullable=true) private String nilainormal ; public Observasi getObservasi() { diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ObservasiTransaksi.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ObservasiTransaksi.java index ff42261e..5ed82c48 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ObservasiTransaksi.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ObservasiTransaksi.java @@ -1,17 +1,11 @@ package com.jasamedika.medifirst2000.entities; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - import com.jasamedika.medifirst2000.base.BaseTransaction; import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; +import java.util.Date; + @Entity @Table(name="ObservasiTransaksi_T") public class ObservasiTransaksi extends BaseTransaction{ @@ -49,11 +43,11 @@ public class ObservasiTransaksi extends BaseTransaction{ private Integer pegawaiId; @Caption(value="tglInput ") - @Column(name="tglInput ", nullable=true) + @Column(name="tglInput", nullable=true) private Date tglInput ; @Caption(value="tglObservasi ") - @Column(name="tglObservasi ", nullable=true) + @Column(name="tglObservasi", nullable=true) private Date tglObservasi ; @Caption(value="valueI") diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TimeOutControl.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TimeOutControl.java index ad6532b2..8a9df679 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TimeOutControl.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TimeOutControl.java @@ -1,22 +1,14 @@ package com.jasamedika.medifirst2000.entities; -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.helper.Caption; +import javax.persistence.*; +import javax.validation.constraints.NotNull; +import java.util.HashSet; +import java.util.Set; + @Entity @Table(name = "TimeOutControl_T") public class TimeOutControl extends BaseTransaction { @@ -25,10 +17,10 @@ public class TimeOutControl extends BaseTransaction { @ManyToOne @JoinColumn(name = "ObjectPasienFk") - @NotNull(message = "Pasien tidak boleh kosong") - private AntrianPasienDiPeriksa pasienDaftar; +// @NotNull(message = "Pasien tidak boleh kosong") + private AntrianPasienDiPeriksa pasienDaftar; - @Column(name = "ObjectPasienFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false) + @Column(name = "ObjectPasienFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = true) private String pasienId; diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Variabel.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Variabel.java index e2ddd75b..e7685757 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Variabel.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Variabel.java @@ -1,22 +1,14 @@ package com.jasamedika.medifirst2000.entities; -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 com.fasterxml.jackson.annotation.JsonBackReference; import com.jasamedika.medifirst2000.base.BaseTransaction; import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + @Entity @Table(name="Variabel_T") public class Variabel extends BaseTransaction{ @@ -46,15 +38,15 @@ public class Variabel extends BaseTransaction{ private Integer jenisObservasiId; @Caption(value="tglInput ") - @Column(name="tglInput ") + @Column(name="tglInput") private Date tglInput ; @Caption(value="tglObservasi ") - @Column(name="tglObservasi ", nullable=false) + @Column(name="tglObservasi", nullable=false) private Date tglObservasi ; @Caption(value="variabel ") - @Column(name="variabel ") + @Column(name="variabel") private String variabel ; @JsonBackReference diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/VariabelD.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/VariabelD.java index e189689c..838261ce 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/VariabelD.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/VariabelD.java @@ -1,15 +1,10 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - import com.jasamedika.medifirst2000.base.BaseTransaction; import com.jasamedika.medifirst2000.helper.Caption; +import javax.persistence.*; + @Entity @Table(name="VariabelD_T") public class VariabelD extends BaseTransaction{ @@ -23,15 +18,15 @@ public class VariabelD extends BaseTransaction{ private String variabelId; @Caption(value="valueI ") - @Column(name="valueI ", nullable=true) + @Column(name="valueI", nullable=true) private String valueI ; @Caption(value="valueII ") - @Column(name="valueII ", nullable=true) + @Column(name="valueII", nullable=true) private String valueII ; @Caption(value="hasil ") - @Column(name="hasil ", nullable=true) + @Column(name="hasil", nullable=true) private String hasil ; public Variabel getVariabel() { diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/penerimaan_operasional_v.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/penerimaan_operasional_v.java index 9d4440b9..d8793bd4 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/penerimaan_operasional_v.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/penerimaan_operasional_v.java @@ -1,35 +1,19 @@ package com.jasamedika.medifirst2000.entities; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; - -import org.hibernate.annotations.Immutable; - -@Entity -@Immutable public class penerimaan_operasional_v { - - @Id - @Column(name = "norec") + private String norec; - - @Column(name = "totalbayar") + private Double totalBayar; - - @Column(name = "tahun") + private Double tahun; - - @Column(name = "bulan") + private Double bulan; - - @Column(name = "namaproduk") + private String namaproduk; - - @Column(name = "desckripsi") + private String desckripsi; - - @Column(name = "namaruangan") + private String namaruangan; public String getNorec() {