diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/DpjpPasien.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/DpjpPasien.java index f817f4da..47e9ef4f 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/DpjpPasien.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/DpjpPasien.java @@ -25,18 +25,20 @@ public class DpjpPasien extends BaseTransaction implements Serializable { private static final long serialVersionUID = 1837465073831420975L; @ManyToOne(fetch = LAZY) - @JoinColumn(name = "dokterfk") - @Caption(value = "Dokter") - private Pegawai dokter; + @JoinColumn(name = "dokterfk") + @Caption(value = "Dokter") + private Pegawai dokter; - @ManyToOne(fetch = LAZY) - @JoinColumn(name = "pasienfk") - @Caption(value = "Pasien") - private Pasien pasien; + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "pasienfk") + @Caption(value = "Pasien") + private Pasien pasien; - @Column(nullable = false) - @NotNull(message = "Tanggal awal tidak boleh kosong") - private Date tanggalAwal; + @Column(nullable = false) + @NotNull(message = "Tanggal awal tidak boleh kosong") + @Caption(value = "Tanggal Awal") + private Date tanggalAwal; - private Date tanggalAkhir; + @Caption(value = "Tanggal Akhir") + private Date tanggalAkhir; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java index 24333e1f..5b3688fe 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java @@ -1,23 +1,17 @@ package com.jasamedika.medifirst2000.entities; +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.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.jasamedika.medifirst2000.base.BaseTransaction; -import com.jasamedika.medifirst2000.helper.Caption; - -import lombok.Getter; -import lombok.Setter; +import static javax.persistence.FetchType.LAZY; @Getter @Setter @@ -26,7 +20,7 @@ import lombok.Setter; public class PasienDaftar extends BaseTransaction { private static final long serialVersionUID = -603798112476936636L; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectRekananFk") @Caption(value = "Object Rekanan") private Rekanan rekanan; @@ -38,7 +32,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "totalBiaya") private Double totalBiaya; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectStatusKeluarFk") @Caption(value = "Object Status Keluar") private StatusKeluar statusKeluar; @@ -69,7 +63,7 @@ public class PasienDaftar extends BaseTransaction { @Caption(value = "Is Registrasi Lengkap") private Byte isRegistrasiLengkap; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKasusPenyakitLastFk") @Caption(value = "Object Kasus Penyakit Last") private KasusPenyakit kasusPenyakit; @@ -77,7 +71,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectKasusPenyakitLastFk", insertable = false, updatable = false) private Integer kasusPenyakitId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectPegawaiFk") @Caption(value = "Penanggung Jawab pasien") private Pegawai dokterPenanggungJawab; @@ -85,7 +79,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectPegawaiFk", insertable = false, updatable = false) private Integer dokterPenanggungJawabId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelompokPasienLastFk") @NotNull(message = "Kd Kelompok Pasien Last tidak boleh kosong") @Caption(value = "Object Kelompok Pasien Last") @@ -94,7 +88,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectKelompokPasienLastFk", insertable = false, updatable = false, nullable = false) private Integer kelompokPasienId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectRuanganLastFk") @Caption(value = "Object Ruangan Last") private Ruangan ruangan; @@ -102,7 +96,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectRuanganLastFk", insertable = false, updatable = false) private Integer ruanganId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectRuanganAsalFk") @Caption(value = "Object Ruangan Asal") private Ruangan ruanganAsal; @@ -110,7 +104,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectRuanganAsalFk", insertable = false, updatable = false) private Integer ruanganAsalId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "RuanganNextSchedule") @Caption(value = "RuanganNextSchedule") private Ruangan ruanganNextSchedule; @@ -122,7 +116,7 @@ public class PasienDaftar extends BaseTransaction { @Caption(value = "StatusSchedule") private String statusSchedule; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "NoCMFk") @NotNull(message = "No C M Harus Diisi") @Caption(value = "No C M") @@ -131,7 +125,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "NoCMFk", insertable = false, updatable = false, nullable = false) private Integer pasienId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "NoRegistrasiFk") @Caption(value = "No Registrasi") private PenanggungJawabPasien penanggungJawabPasien; @@ -148,7 +142,7 @@ public class PasienDaftar extends BaseTransaction { @Caption(value = "Tanggal Registrasi") private Date tglRegistrasi; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectStatusPulangFk") @Caption(value = "Object Status Pulang") private StatusPulang statusPulang; @@ -156,7 +150,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectStatusPulangFk", insertable = false, updatable = false) private Integer statusPulangId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKondisiPasienFk") @Caption(value = "Object Kondisi Pasien") private KondisiPasien kondisiPasien; @@ -180,7 +174,7 @@ public class PasienDaftar extends BaseTransaction { @Caption(value = "Nama Lengkap Ambil Pasien") private String namaLengkapAmbilPasien; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectHubunganKeluargaAmbilPasienFk") @Caption(value = "Object Hubungan Keluarga Ambil Pasien") private HubunganKeluarga hubunganKeluarga; @@ -188,19 +182,19 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectHubunganKeluargaAmbilPasienFk", insertable = false, updatable = false) private Integer hubunganKeluargaId; - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasienDaftar") + @OneToMany(fetch = LAZY, mappedBy = "pasienDaftar") private Set antrianPasienDiPeriksaSet = new HashSet<>(); - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasienDaftar") + @OneToMany(fetch = LAZY, mappedBy = "pasienDaftar") private Set batalRegistrasiSet = new HashSet<>(); - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasienDaftar") + @OneToMany(fetch = LAZY, mappedBy = "pasienDaftar") private Set diputuskanDetailSet = new HashSet<>(); - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasienDaftar") + @OneToMany(fetch = LAZY, mappedBy = "pasienDaftar") private Set pemakaianAsuransiSet = new HashSet<>(); - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectKelasFk") @Caption(value = "Object Kelas") private Kelas kelas; @@ -208,7 +202,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectKelasFk", insertable = false, updatable = false) private Integer kelasId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectPenyebabKematianFk") @Caption(value = "Penyebab Kematian") private PenyebabKematian penyebabKematian; @@ -216,7 +210,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectPenyebabKematianFk", insertable = false, updatable = false) private Integer penyebabKematianId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ObjectDokterPemeriksaFk") @Caption(value = "Dokter Pemeriksa") private Pegawai dokterPemeriksa; @@ -224,14 +218,14 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "ObjectDokterPemeriksaFk", insertable = false, updatable = false) private Integer dokterPemeriksaId; - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pasienDaftar") + @OneToMany(fetch = LAZY, mappedBy = "pasienDaftar") private Set mapPasienDpjpToPasienDaftar = new HashSet<>(); @Caption(value = "emergensi") @Column(name = "Emergensi") private Boolean emergensi; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "NoStrukLastFk") @Caption(value = "No Struk Last") private StrukPelayanan strukPelayanan; @@ -239,7 +233,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "NoStrukLastFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false) private String strukPelayananId; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @JoinColumn(name = "NoSbmLastFk") @Caption(value = "No SBM Last") private StrukBuktiPenerimaan strukBuktiPenerimaan; @@ -251,7 +245,7 @@ public class PasienDaftar extends BaseTransaction { @Column(name = "diskonpegawai") private Integer diskonPegawai; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = LAZY) @Caption(value = "Voucher Paket") @JoinColumn(name = "voucherpaketfk") private VoucherPaket voucherPaket; @@ -260,4 +254,9 @@ public class PasienDaftar extends BaseTransaction { private String voucherPaketId; private Boolean isBatalPaket; + + @ManyToOne(fetch = LAZY) + @Caption(value = "DPJP") + @JoinColumn(name = "dpjpfk") + private DpjpPasien dpjpPasien; } diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DpjpPasienVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DpjpPasienVO.java new file mode 100644 index 00000000..f730eaf6 --- /dev/null +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DpjpPasienVO.java @@ -0,0 +1,29 @@ +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 java.util.Date; + +/** + * @author Salman + * @version 1.0.0 + * @since 26/12/2023 + */ +@Getter +@Setter +public class DpjpPasienVO extends BaseTransactionVO { + @Caption(value = "Dokter") + private PegawaiVO dokter; + + @Caption(value = "Pasien") + private PasienVO pasien; + + @Caption(value = "Tanggal Awal") + private Date tanggalAwal; + + @Caption(value = "Tanggal Akhir") + private Date tanggalAkhir; +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienDaftarVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienDaftarVO.java index fcc164c2..7cb520df 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienDaftarVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienDaftarVO.java @@ -1,17 +1,15 @@ package com.jasamedika.medifirst2000.vo; -import java.util.Date; -import java.util.HashSet; -import java.util.Set; - -import javax.validation.constraints.NotNull; - 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.util.HashSet; +import java.util.Set; + @Getter @Setter public class PasienDaftarVO extends BaseTransactionVO { @@ -125,4 +123,7 @@ public class PasienDaftarVO extends BaseTransactionVO { private String voucherPaketId; private Boolean isBatalPaket; + + @Caption(value = "DPJP") + private DpjpPasienVO dpjpPasien; }