salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update model entity

Browse Source 
Penyesuaian sync branch ddl
This commit is contained in:
Salman Manoe 2024-02-28 16:44:26 +07:00
parent b9ca0f1722
commit b889f78219
2 changed files with 91 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienDetail.java
View File

@ -1,39 +1,35 @@
package com.jasamedika.medifirst2000.entities; package com.jasamedika.medifirst2000.entities;
import java.util.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.helper.Caption; import com.jasamedika.medifirst2000.helper.Caption;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import static javax.persistence.FetchType.LAZY;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "PelayananPasienDetail_T") @Table(name = "PelayananPasienDetail_T")
public class PelayananPasienDetail extends MedicalRecordTransaction { public class PelayananPasienDetail extends MedicalRecordTransaction {
private static final long serialVersionUID = 6548818878995216019L;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "Generik") @JoinColumn(name = "Generik")
@Caption(value = "Generik") @Caption(value = "Generik")
private Generik generik; private Generik generik;
@Column(name = "Generik", insertable = false, updatable = false,nullable=true) @Column(name = "Generik", insertable = false, updatable = false)
private Integer generikId; private Integer generikId;
@Caption(value = "statusOrder") @Caption(value = "statusOrder")
@Column(name = "statusOrder") @Column(name = "statusOrder")
private Byte statusOrder; private Byte statusOrder;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "KomponenHargaFk") @JoinColumn(name = "KomponenHargaFk")
@NotNull(message = "Struk Order Harus Diisi") @NotNull(message = "Struk Order Harus Diisi")
@Caption(value = "Komponen Harga") @Caption(value = "Komponen Harga")
@ -62,6 +58,14 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
@Column(name = "NilaiNormal") @Column(name = "NilaiNormal")
private Boolean nilaiNormal; private Boolean nilaiNormal;
@Column(columnDefinition = "numeric(6,2)")
@Caption("Persen Diskon")
private BigDecimal persenDiskon;
@Column(columnDefinition = "numeric(6,2)")
@Caption("Persen Diskon Sayatan")
private BigDecimal persenDiskonSayatan;
@Caption(value = "Harga Discount") @Caption(value = "Harga Discount")
@Column(name = "hargaDiscount") @Column(name = "hargaDiscount")
private Double hargaDiscount; private Double hargaDiscount;
@ -74,7 +78,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
@Column(name = "piutangRumahSakit") @Column(name = "piutangRumahSakit")
private Double piutangRumahSakit; private Double piutangRumahSakit;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "StrukOrderFk") @JoinColumn(name = "StrukOrderFk")
@Caption(value = "Struk Order") @Caption(value = "Struk Order")
private StrukOrder strukOrder; private StrukOrder strukOrder;
@ -82,7 +86,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
@Column(name = "StrukOrderFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false) @Column(name = "StrukOrderFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
private String strukOrderId; private String strukOrderId;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "JenisObatFk") @JoinColumn(name = "JenisObatFk")
@Caption(value = "Jenis Obat") @Caption(value = "Jenis Obat")
private JenisObat jenisObat; private JenisObat jenisObat;
@ -90,7 +94,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
@Column(name = "JenisObatFk", insertable = false, updatable = false) @Column(name = "JenisObatFk", insertable = false, updatable = false)
private Integer jenisObatId; private Integer jenisObatId;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ProdukFk") @JoinColumn(name = "ProdukFk")
@NotNull(message = "Produk Harus Diisi") @NotNull(message = "Produk Harus Diisi")
@Caption(value = "Produk") @Caption(value = "Produk")
@ -99,29 +103,29 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
@Column(name = "ProdukFk", insertable = false, updatable = false) @Column(name = "ProdukFk", insertable = false, updatable = false)
private Integer produkId; private Integer produkId;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "PelayananPasien") @JoinColumn(name = "PelayananPasien")
@NotNull(message = "Pelayanan Pasien Tidak boleh Kosong") @NotNull(message = "Pelayanan Pasien Tidak boleh Kosong")
@Caption(value = "PelayananPasien") @Caption(value = "PelayananPasien")
private PelayananPasien pelayananPasien; private PelayananPasien pelayananPasien;
@Column(name = "PelayananPasien", columnDefinition = "CHAR(32)", insertable = false, updatable = false,nullable=false) @Column(name = "PelayananPasien", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false)
private String pelayananPasienId; private String pelayananPasienId;
@Column(name = "Stock", length = 100) @Column(name = "Stock", length = 100)
@Caption(value = "Stock") @Caption(value = "Stock")
private Integer stock; private Integer stock;
@NotNull(message="jumlah Tidak boleh Kosong") @NotNull(message = "jumlah Tidak boleh Kosong")
@Column(name = "Jumlah", nullable = false, length = 100) @Column(name = "Jumlah", nullable = false, length = 100)
@Caption(value = "Jumlah") @Caption(value = "Jumlah")
private Double jumlah; private Double jumlah;
@Column(name = "AturanPakai", length = 100) @Column(name = "AturanPakai", length = 100)
@Caption(value = "AturanPakai") @Caption(value = "AturanPakai")
private String aturanPakai; private String aturanPakai;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "RouteFk") @JoinColumn(name = "RouteFk")
@Caption(value = "Route") @Caption(value = "Route")
private RouteFarmasi route; private RouteFarmasi route;
@ -129,7 +133,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
@Column(name = "RouteFk", insertable = false, updatable = false) @Column(name = "RouteFk", insertable = false, updatable = false)
private Integer routeId; private Integer routeId;
@ManyToOne @ManyToOne(fetch = LAZY)
@JoinColumn(name = "KeteranganPakaiFk") @JoinColumn(name = "KeteranganPakaiFk")
@Caption(value = "Keterangan Pakai") @Caption(value = "Keterangan Pakai")
private Stigma keteranganPakai; private Stigma keteranganPakai;
@ -137,11 +141,11 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
@Column(name = "KeteranganPakaiFk", insertable = false, updatable = false) @Column(name = "KeteranganPakaiFk", insertable = false, updatable = false)
private Integer keteranganPakaiId; private Integer keteranganPakaiId;
@Column(name = "KeteranganPakai2", length = 100) @Column(name = "KeteranganPakai2", length = 100)
@Caption(value = "KeteranganPakai2") @Caption(value = "KeteranganPakai2")
private String keteranganPakai2; private String keteranganPakai2;
@Column(name = "KeteranganLain", length = 100) @Column(name = "KeteranganLain", length = 100)
@Caption(value = "KeteranganLain") @Caption(value = "KeteranganLain")
private String keteranganLain; private String keteranganLain;
@ -150,6 +154,6 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
private Double hargaNetto; private Double hargaNetto;
@Caption(value = "NoRecTriger") @Caption(value = "NoRecTriger")
@Column(name = "noRecTriger", nullable = true) @Column(name = "noRecTriger")
private String noRecTriger; private String noRecTriger;
} }

91
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienDetailVO.java
View File

@ -1,32 +1,26 @@
package com.jasamedika.medifirst2000.vo; package com.jasamedika.medifirst2000.vo;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.persistence.Column;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO; import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
import com.jasamedika.medifirst2000.helper.Caption; import com.jasamedika.medifirst2000.helper.Caption;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Getter @Getter
@Setter @Setter
public class PelayananPasienDetailVO extends BaseTransactionVO { public class PelayananPasienDetailVO extends BaseTransactionVO {
private List<RacikanDetailVO> racikan = new ArrayList<RacikanDetailVO>(); private List<RacikanDetailVO> racikan = new ArrayList<>();
@Caption(value="Pasien Daftar") @Caption(value = "Pasien Daftar")
private PasienDaftarVO pasienDaftar; private PasienDaftarVO pasienDaftar;
private GenerikVO generik; private GenerikVO generik;
@Column(name = "Generik", insertable = false, updatable = false,nullable=true)
private Integer generikId; private Integer generikId;
private Byte statusOrder; private Byte statusOrder;
@ -34,138 +28,99 @@ public class PelayananPasienDetailVO extends BaseTransactionVO {
private Double jasa; private Double jasa;
@Caption(value = "Is Pasien") @Caption(value = "Is Pasien")
@Column(name = "isPasien", nullable = true)
private Boolean isPasien; private Boolean isPasien;
@Caption(value = "Is Pasien") @Caption(value = "Is Obat")
@Column(name = "isObat", nullable = true)
private Boolean isObat; private Boolean isObat;
@Caption(value = "Is Pasien") @Caption(value = "Is Dosis")
@Column(name = "isDosis", nullable = true)
private Boolean isDosis; private Boolean isDosis;
@Caption(value = "Is Pasien") @Caption(value = "Is Route")
@Column(name = "isRoute", nullable = true)
private Boolean isRoute; private Boolean isRoute;
@Caption(value = "Is Pasien") @Caption(value = "Is Dokumentasi")
@Column(name = "isDokumentasi", nullable = true)
private Boolean isDokumentasi; private Boolean isDokumentasi;
@Caption(value = "Is Pasien") @Caption(value = "Is Waktu")
@Column(name = "isWaktu", nullable = true)
private Boolean isWaktu; private Boolean isWaktu;
@Caption(value = "Is Pasien") @Caption(value = "Is Informasi")
@Column(name = "isInformasi", nullable = true)
private Boolean isInformasi; private Boolean isInformasi;
@ManyToOne
@JoinColumn(name = "KomponenHargaFk")
@NotNull(message = "Struk Order Harus Diisi")
@Caption(value = "Komponen Harga") @Caption(value = "Komponen Harga")
private KomponenHargaVO komponenHarga; private KomponenHargaVO komponenHarga;
@Caption(value = "Tanggal Pelayanan") @Caption(value = "Tanggal Pelayanan")
@Column(name = "TglPelayanan", nullable = true)
private Date tglPelayanan; private Date tglPelayanan;
@Column(name = "KomponenHargaFk", insertable = false, updatable = false)
private Integer komponenHargaId; private Integer komponenHargaId;
@Caption(value = "Harga Satuan") @Caption(value = "Harga Satuan")
@Column(name = "hargaSatuan", nullable = true)
private Double hargaSatuan; private Double hargaSatuan;
@Caption(value = "Harga Jual") @Caption(value = "Harga Jual")
@Column(name = "HargaJual", nullable = true)
private Double hargaJual; private Double hargaJual;
@Caption("Persen Diskon")
private String persenDiskon;
@Caption("Persen Diskon Sayatan")
private String persenDiskonSayatan;
@Caption(value = "Nilai Normal") @Caption(value = "Nilai Normal")
@Column(name = "NilaiNormal", nullable = true)
private Boolean nilaiNormal; private Boolean nilaiNormal;
@Caption(value = "Piutang Penjamin") @Caption(value = "Piutang Penjamin")
@Column(name = "piutangPenjamin", nullable = true)
private Double piutangPenjamin; private Double piutangPenjamin;
@Caption(value = "Piutang Rumah Sakit") @Caption(value = "Piutang Rumah Sakit")
@Column(name = "piutangRumahSakit", nullable = true)
private Double piutangRumahSakit; private Double piutangRumahSakit;
@ManyToOne
@JoinColumn(name = "StrukOrderFk")
@Caption(value = "Struk Order") @Caption(value = "Struk Order")
private StrukOrderVO strukOrder; private StrukOrderVO strukOrder;
@Column(name = "StrukOrderFk", insertable = false, updatable = false)
private String strukOrderId; private String strukOrderId;
@ManyToOne
@JoinColumn(name = "JenisObatFk")
@Caption(value = "Jenis Obat") @Caption(value = "Jenis Obat")
private JenisObatVO jenisObat; private JenisObatVO jenisObat;
@Column(name = "JenisObatFk", insertable = false, updatable = false)
private String jenisObatId; private String jenisObatId;
@ManyToOne
@JoinColumn(name = "ProdukFk")
@NotNull(message = "Produk Harus Diisi") @NotNull(message = "Produk Harus Diisi")
@Caption(value = "Produk") @Caption(value = "Produk")
private ProdukVO produk; private ProdukVO produk;
@Column(name = "ProdukFk", insertable = false, updatable = false)
private String produkId; private String produkId;
@Column(name = "Stock", nullable = true, length = 100)
@Caption(value = "Stock") @Caption(value = "Stock")
private Integer stock; private Integer stock;
@Column(name = "Jumlah", nullable = false, length = 100)
@Caption(value = "Jumlah") @Caption(value = "Jumlah")
private Double jumlah; private Double jumlah;
@Column(name = "AturanPakai", nullable = true, length = 100)
@Caption(value = "AturanPakai") @Caption(value = "AturanPakai")
private String aturanPakai; private String aturanPakai;
@ManyToOne
@JoinColumn(name = "RouteFk")
@Caption(value = "Route") @Caption(value = "Route")
private RouteFarmasiVO route; private RouteFarmasiVO route;
@Column(name = "RouteFk", insertable = false, updatable = false)
private String routeId; private String routeId;
@ManyToOne
@JoinColumn(name = "KeteranganPakaiFk")
@Caption(value = "Keterangan Pakai") @Caption(value = "Keterangan Pakai")
private StigmaVO keteranganPakai; private StigmaVO keteranganPakai;
@Column(name = "KeteranganPakaiFk", insertable = false, updatable = false)
private Integer keteranganPakaiId; private Integer keteranganPakaiId;
@Column(name = "KeteranganPakai2", nullable = true, length = 100)
@Caption(value = "KeteranganPakai2") @Caption(value = "KeteranganPakai2")
private String keteranganPakai2; private String keteranganPakai2;
@Column(name = "KeteranganLain", nullable = true, length = 100)
@Caption(value = "KeteranganLain") @Caption(value = "KeteranganLain")
private String keteranganLain; private String keteranganLain;
@Caption(value = "Harga Discount") @Caption(value = "Harga Discount")
private Double hargaDiscount; private Double hargaDiscount;
@ManyToOne
@NotNull(message = "Pelayanan Pasien Tidak boleh Kosong")
@Caption(value = "PelayananPasien") @Caption(value = "PelayananPasien")
private PelayananPasienVO pelayananPasien; private PelayananPasienVO pelayananPasien;
@ -178,8 +133,6 @@ public class PelayananPasienDetailVO extends BaseTransactionVO {
@Caption(value = "Is Benar") @Caption(value = "Is Benar")
private Boolean isBenar; private Boolean isBenar;
@Caption(value = "NoRecTriger") @Caption(value = "ID Trigger")
private String noRecTriger; private String noRecTriger;
} }