From d969a52013e33df546a691fe9339542c1fe30da6 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 26 Feb 2024 10:31:48 +0700 Subject: [PATCH 1/2] Update RekamDataPegawaiServiceImpl.java Perbaikan simpan data pegawai baru --- .../service/impl/RekamDataPegawaiServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java index 1ff02b00..3946da92 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java @@ -1470,6 +1470,10 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re pegawai.setTglBerakhirSip(vo.getTglBerakhirSip()); perubahan += "tanggal berakhir sip, "; } + if (CommonUtil.isNotNullOrEmpty(vo.getIsSipSeumurHidup())) { + pegawai.setIsSipSeumurHidup(vo.getIsSipSeumurHidup()); + perubahan += "status sip seumur hidup, "; + } if (CommonUtil.isNotNullOrEmpty(vo.getNoStr())) { pegawai.setNoStr(vo.getNoStr()); perubahan += "no str, "; @@ -1482,6 +1486,10 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re pegawai.setTglBerakhirStr(vo.getTglBerakhirStr()); perubahan += "tanggal berakhir str, "; } + if (CommonUtil.isNotNullOrEmpty(vo.getIsStrSeumurHidup())) { + pegawai.setIsStrSeumurHidup(vo.getIsStrSeumurHidup()); + perubahan += "status str seumur hidup, "; + } if (CommonUtil.isNotNullOrEmpty(vo.getTypePegawai())) { pegawai.setTypePegawai(typePegawaiConverter.transferVOToModel(vo.getTypePegawai(), new TypePegawai())); perubahan += "tipe pegawai, "; From b889f78219fd1fb0f760436bfbaaf32bce3fabc8 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 28 Feb 2024 16:44:26 +0700 Subject: [PATCH 2/2] Update model entity Penyesuaian sync branch ddl --- .../entities/PelayananPasienDetail.java | 92 ++++++------ .../vo/PelayananPasienDetailVO.java | 133 ++++++------------ 2 files changed, 91 insertions(+), 134 deletions(-) diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienDetail.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienDetail.java index e2a4c7f1..2596b805 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienDetail.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienDetail.java @@ -1,39 +1,35 @@ 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 lombok.Getter; 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 @Setter @Entity @Table(name = "PelayananPasienDetail_T") public class PelayananPasienDetail extends MedicalRecordTransaction { - private static final long serialVersionUID = 6548818878995216019L; - @ManyToOne - @JoinColumn(name = "Generik") + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "Generik") @Caption(value = "Generik") private Generik generik; - @Column(name = "Generik", insertable = false, updatable = false,nullable=true) + @Column(name = "Generik", insertable = false, updatable = false) private Integer generikId; - + @Caption(value = "statusOrder") @Column(name = "statusOrder") private Byte statusOrder; - - @ManyToOne + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "KomponenHargaFk") @NotNull(message = "Struk Order Harus Diisi") @Caption(value = "Komponen Harga") @@ -42,18 +38,18 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @Caption(value = "Tanggal Pelayanan") @Column(name = "TglPelayanan") private Date tglPelayanan; - + @Caption(value = "jasa") @Column(name = "jasa") private Double jasa; - + @Column(name = "KomponenHargaFk", insertable = false, updatable = false) private Integer komponenHargaId; @Caption(value = "Harga Satuan") @Column(name = "hargaSatuan") private Double hargaSatuan; - + @Caption(value = "Harga Jual") @Column(name = "HargaJual") private Double hargaJual; @@ -61,7 +57,15 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @Caption(value = "Nilai Normal") @Column(name = "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") @Column(name = "hargaDiscount") private Double hargaDiscount; @@ -69,20 +73,20 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @Caption(value = "Piutang Penjamin") @Column(name = "piutangPenjamin") private Double piutangPenjamin; - + @Caption(value = "Piutang Rumah Sakit") @Column(name = "piutangRumahSakit") private Double piutangRumahSakit; - - @ManyToOne + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "StrukOrderFk") @Caption(value = "Struk Order") private StrukOrder strukOrder; @Column(name = "StrukOrderFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false) private String strukOrderId; - - @ManyToOne + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "JenisObatFk") @Caption(value = "Jenis Obat") private JenisObat jenisObat; @@ -90,66 +94,66 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @Column(name = "JenisObatFk", insertable = false, updatable = false) private Integer jenisObatId; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "ProdukFk") @NotNull(message = "Produk Harus Diisi") @Caption(value = "Produk") private Produk produk; - + @Column(name = "ProdukFk", insertable = false, updatable = false) private Integer produkId; - - @ManyToOne + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "PelayananPasien") @NotNull(message = "Pelayanan Pasien Tidak boleh Kosong") @Caption(value = "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; - - @Column(name = "Stock", length = 100) + + @Column(name = "Stock", length = 100) @Caption(value = "Stock") private Integer stock; - @NotNull(message="jumlah Tidak boleh Kosong") + @NotNull(message = "jumlah Tidak boleh Kosong") @Column(name = "Jumlah", nullable = false, length = 100) @Caption(value = "Jumlah") private Double jumlah; - @Column(name = "AturanPakai", length = 100) + @Column(name = "AturanPakai", length = 100) @Caption(value = "AturanPakai") private String aturanPakai; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "RouteFk") @Caption(value = "Route") private RouteFarmasi route; @Column(name = "RouteFk", insertable = false, updatable = false) private Integer routeId; - - @ManyToOne + + @ManyToOne(fetch = LAZY) @JoinColumn(name = "KeteranganPakaiFk") @Caption(value = "Keterangan Pakai") private Stigma keteranganPakai; @Column(name = "KeteranganPakaiFk", insertable = false, updatable = false) private Integer keteranganPakaiId; - - @Column(name = "KeteranganPakai2", length = 100) + + @Column(name = "KeteranganPakai2", length = 100) @Caption(value = "KeteranganPakai2") private String keteranganPakai2; - @Column(name = "KeteranganLain", length = 100) + @Column(name = "KeteranganLain", length = 100) @Caption(value = "KeteranganLain") private String keteranganLain; @Caption(value = "hargaNetto") @Column(name = "hargaNetto") private Double hargaNetto; - + @Caption(value = "NoRecTriger") - @Column(name = "noRecTriger", nullable = true) + @Column(name = "noRecTriger") private String noRecTriger; -} \ No newline at end of file +} diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienDetailVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienDetailVO.java index f8a080a4..7d87acdc 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienDetailVO.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienDetailVO.java @@ -1,171 +1,126 @@ 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.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.helper.Caption; - -import lombok.Getter; -import lombok.Setter; - @Getter @Setter public class PelayananPasienDetailVO extends BaseTransactionVO { - - private List racikan = new ArrayList(); - - @Caption(value="Pasien Daftar") - private PasienDaftarVO pasienDaftar; - private GenerikVO generik; - - @Column(name = "Generik", insertable = false, updatable = false,nullable=true) + private List racikan = new ArrayList<>(); + + @Caption(value = "Pasien Daftar") + private PasienDaftarVO pasienDaftar; + + private GenerikVO generik; + private Integer generikId; - + private Byte statusOrder; - + private Double jasa; - + @Caption(value = "Is Pasien") - @Column(name = "isPasien", nullable = true) private Boolean isPasien; - - @Caption(value = "Is Pasien") - @Column(name = "isObat", nullable = true) + + @Caption(value = "Is Obat") private Boolean isObat; - - @Caption(value = "Is Pasien") - @Column(name = "isDosis", nullable = true) + + @Caption(value = "Is Dosis") private Boolean isDosis; - - @Caption(value = "Is Pasien") - @Column(name = "isRoute", nullable = true) + + @Caption(value = "Is Route") private Boolean isRoute; - - @Caption(value = "Is Pasien") - @Column(name = "isDokumentasi", nullable = true) + + @Caption(value = "Is Dokumentasi") private Boolean isDokumentasi; - - @Caption(value = "Is Pasien") - @Column(name = "isWaktu", nullable = true) + + @Caption(value = "Is Waktu") private Boolean isWaktu; - - @Caption(value = "Is Pasien") - @Column(name = "isInformasi", nullable = true) + + @Caption(value = "Is Informasi") private Boolean isInformasi; - - @ManyToOne - @JoinColumn(name = "KomponenHargaFk") - @NotNull(message = "Struk Order Harus Diisi") + @Caption(value = "Komponen Harga") private KomponenHargaVO komponenHarga; - @Caption(value = "Tanggal Pelayanan") - @Column(name = "TglPelayanan", nullable = true) private Date tglPelayanan; - @Column(name = "KomponenHargaFk", insertable = false, updatable = false) + private Integer komponenHargaId; - @Caption(value = "Harga Satuan") - @Column(name = "hargaSatuan", nullable = true) private Double hargaSatuan; - + @Caption(value = "Harga Jual") - @Column(name = "HargaJual", nullable = true) private Double hargaJual; + @Caption("Persen Diskon") + private String persenDiskon; + + @Caption("Persen Diskon Sayatan") + private String persenDiskonSayatan; + @Caption(value = "Nilai Normal") - @Column(name = "NilaiNormal", nullable = true) private Boolean nilaiNormal; - - + @Caption(value = "Piutang Penjamin") - @Column(name = "piutangPenjamin", nullable = true) private Double piutangPenjamin; - + @Caption(value = "Piutang Rumah Sakit") - @Column(name = "piutangRumahSakit", nullable = true) private Double piutangRumahSakit; - - - @ManyToOne - @JoinColumn(name = "StrukOrderFk") @Caption(value = "Struk Order") private StrukOrderVO strukOrder; - @Column(name = "StrukOrderFk", insertable = false, updatable = false) private String strukOrderId; - @ManyToOne - @JoinColumn(name = "JenisObatFk") @Caption(value = "Jenis Obat") private JenisObatVO jenisObat; - @Column(name = "JenisObatFk", insertable = false, updatable = false) private String jenisObatId; - @ManyToOne - @JoinColumn(name = "ProdukFk") @NotNull(message = "Produk Harus Diisi") @Caption(value = "Produk") private ProdukVO produk; - @Column(name = "ProdukFk", insertable = false, updatable = false) private String produkId; - @Column(name = "Stock", nullable = true, length = 100) @Caption(value = "Stock") private Integer stock; - @Column(name = "Jumlah", nullable = false, length = 100) @Caption(value = "Jumlah") private Double jumlah; - @Column(name = "AturanPakai", nullable = true, length = 100) @Caption(value = "AturanPakai") private String aturanPakai; - @ManyToOne - @JoinColumn(name = "RouteFk") @Caption(value = "Route") private RouteFarmasiVO route; - @Column(name = "RouteFk", insertable = false, updatable = false) private String routeId; - - - @ManyToOne - @JoinColumn(name = "KeteranganPakaiFk") + @Caption(value = "Keterangan Pakai") private StigmaVO keteranganPakai; - @Column(name = "KeteranganPakaiFk", insertable = false, updatable = false) private Integer keteranganPakaiId; - - @Column(name = "KeteranganPakai2", nullable = true, length = 100) @Caption(value = "KeteranganPakai2") private String keteranganPakai2; - @Column(name = "KeteranganLain", nullable = true, length = 100) @Caption(value = "KeteranganLain") private String keteranganLain; @Caption(value = "Harga Discount") private Double hargaDiscount; - - @ManyToOne - @NotNull(message = "Pelayanan Pasien Tidak boleh Kosong") + @Caption(value = "PelayananPasien") private PelayananPasienVO pelayananPasien; @@ -177,9 +132,7 @@ public class PelayananPasienDetailVO extends BaseTransactionVO { @Caption(value = "Is Benar") private Boolean isBenar; - - @Caption(value = "NoRecTriger") + + @Caption(value = "ID Trigger") private String noRecTriger; - } -