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, "; 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 f4b39000..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 @@ -18,17 +18,17 @@ import static javax.persistence.FetchType.LAZY; public class PelayananPasienDetail extends MedicalRecordTransaction { @ManyToOne(fetch = LAZY) - @JoinColumn(name = "Generik") + @JoinColumn(name = "Generik") @Caption(value = "Generik") private Generik generik; @Column(name = "Generik", insertable = false, updatable = false) private Integer generikId; - + @Caption(value = "statusOrder") @Column(name = "statusOrder") private Byte statusOrder; - + @ManyToOne(fetch = LAZY) @JoinColumn(name = "KomponenHargaFk") @NotNull(message = "Struk Order Harus Diisi") @@ -38,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; @@ -65,7 +65,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @Column(columnDefinition = "numeric(6,2)") @Caption("Persen Diskon Sayatan") private BigDecimal persenDiskonSayatan; - + @Caption(value = "Harga Discount") @Column(name = "hargaDiscount") private Double hargaDiscount; @@ -73,11 +73,11 @@ 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(fetch = LAZY) @JoinColumn(name = "StrukOrderFk") @Caption(value = "Struk Order") @@ -85,7 +85,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @Column(name = "StrukOrderFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false) private String strukOrderId; - + @ManyToOne(fetch = LAZY) @JoinColumn(name = "JenisObatFk") @Caption(value = "Jenis Obat") @@ -99,29 +99,29 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @NotNull(message = "Produk Harus Diisi") @Caption(value = "Produk") private Produk produk; - + @Column(name = "ProdukFk", insertable = false, updatable = false) private Integer produkId; - + @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; @@ -132,7 +132,7 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @Column(name = "RouteFk", insertable = false, updatable = false) private Integer routeId; - + @ManyToOne(fetch = LAZY) @JoinColumn(name = "KeteranganPakaiFk") @Caption(value = "Keterangan Pakai") @@ -140,20 +140,20 @@ public class PelayananPasienDetail extends MedicalRecordTransaction { @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") 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 0a9ae443..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 @@ -13,44 +13,44 @@ import java.util.List; @Getter @Setter public class PelayananPasienDetailVO extends BaseTransactionVO { - + private List racikan = new ArrayList<>(); - - @Caption(value="Pasien Daftar") + + @Caption(value = "Pasien Daftar") private PasienDaftarVO pasienDaftar; private GenerikVO generik; private Integer generikId; - + private Byte statusOrder; - + private Double jasa; - + @Caption(value = "Is Pasien") private Boolean isPasien; - + @Caption(value = "Is Obat") private Boolean isObat; - + @Caption(value = "Is Dosis") private Boolean isDosis; - + @Caption(value = "Is Route") private Boolean isRoute; - + @Caption(value = "Is Dokumentasi") private Boolean isDokumentasi; - + @Caption(value = "Is Waktu") private Boolean isWaktu; - + @Caption(value = "Is Informasi") private Boolean isInformasi; @Caption(value = "Komponen Harga") private KomponenHargaVO komponenHarga; - + @Caption(value = "Tanggal Pelayanan") private Date tglPelayanan; @@ -58,7 +58,7 @@ public class PelayananPasienDetailVO extends BaseTransactionVO { @Caption(value = "Harga Satuan") private Double hargaSatuan; - + @Caption(value = "Harga Jual") private Double hargaJual; @@ -70,10 +70,10 @@ public class PelayananPasienDetailVO extends BaseTransactionVO { @Caption(value = "Nilai Normal") private Boolean nilaiNormal; - + @Caption(value = "Piutang Penjamin") private Double piutangPenjamin; - + @Caption(value = "Piutang Rumah Sakit") private Double piutangRumahSakit; @@ -132,8 +132,7 @@ public class PelayananPasienDetailVO extends BaseTransactionVO { @Caption(value = "Is Benar") private Boolean isBenar; - + @Caption(value = "ID Trigger") private String noRecTriger; } -