From 7006035982b6401ea422d0f0a81b7594be97bfad Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Fri, 23 Feb 2024 10:58:19 +0700 Subject: [PATCH] Clean code --- .../impl/PelayananPasienServiceImpl.java | 2 +- .../entities/JumlahDiskonDokter.java | 2 +- .../entities/PelayananPasienDetail.java | 42 ++++----- .../vo/PelayananPasienDetailVO.java | 93 +++++-------------- 4 files changed, 45 insertions(+), 94 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java index 645a0b7f..dc1567cd 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java @@ -154,7 +154,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel Map result = new HashMap<>(); PelayananPasien model = new PelayananPasien(); model = pelayananPasienConverter.transferVOToModel(vo, model); - model.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), + model.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi((short) 0, vo.getPasien().getId(), vo.getTglRegistrasi())); if (CommonUtil.isNotNullOrEmpty(vo.getJenisObat())) { model.setJenisObat(jenisObatConverter.transferVOToModel(vo.getJenisObat(), new JenisObat())); diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JumlahDiskonDokter.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JumlahDiskonDokter.java index 82867069..fa4c7732 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JumlahDiskonDokter.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/JumlahDiskonDokter.java @@ -36,7 +36,7 @@ public class JumlahDiskonDokter implements Serializable { private Short kdProfile; @Column(nullable = false, unique = true, columnDefinition = "numeric(6,2)") - @NotBlank + @NotBlank(message = "Persen diskon tidak boleh kosong") @Caption("Persen Diskon") private BigDecimal persenDiskon; } 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..c3d41f39 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 + @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") @@ -61,6 +57,10 @@ 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; @Caption(value = "Harga Discount") @Column(name = "hargaDiscount") @@ -74,7 +74,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @Column(name = "piutangRumahSakit") private Double piutangRumahSakit; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "StrukOrderFk") @Caption(value = "Struk Order") private StrukOrder strukOrder; @@ -82,7 +82,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @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,7 +90,7 @@ 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") @@ -99,7 +99,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @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") @@ -121,7 +121,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @Caption(value = "AturanPakai") private String aturanPakai; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "RouteFk") @Caption(value = "Route") private RouteFarmasi route; @@ -129,7 +129,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @Column(name = "RouteFk", insertable = false, updatable = false) private Integer routeId; - @ManyToOne + @ManyToOne(fetch = LAZY) @JoinColumn(name = "KeteranganPakaiFk") @Caption(value = "Keterangan Pakai") private Stigma keteranganPakai; @@ -150,6 +150,6 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { 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..0392550e 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,32 +1,26 @@ 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.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; + @Getter @Setter public class PelayananPasienDetailVO extends BaseTransactionVO { - private List racikan = new ArrayList(); + 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 GenerikVO generik; + private Integer generikId; private Byte statusOrder; @@ -34,138 +28,96 @@ public class PelayananPasienDetailVO extends BaseTransactionVO { 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(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; @@ -178,8 +130,7 @@ public class PelayananPasienDetailVO extends BaseTransactionVO { @Caption(value = "Is Benar") private Boolean isBenar; - @Caption(value = "NoRecTriger") + @Caption(value = "ID Trigger") private String noRecTriger; - }