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

Merge branch 'dev/ddl' into dev/remun/diskon-dokter

Browse Source
This commit is contained in:
Salman Manoe 2024-02-28 16:46:24 +07:00
commit df269a5cc2
3 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekamDataPegawaiServiceImpl.java
View File

@ -1470,6 +1470,10 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
pegawai.setTglBerakhirSip(vo.getTglBerakhirSip()); pegawai.setTglBerakhirSip(vo.getTglBerakhirSip());
perubahan += "tanggal berakhir sip, "; perubahan += "tanggal berakhir sip, ";
} }
if (CommonUtil.isNotNullOrEmpty(vo.getIsSipSeumurHidup())) {
pegawai.setIsSipSeumurHidup(vo.getIsSipSeumurHidup());
perubahan += "status sip seumur hidup, ";
}
if (CommonUtil.isNotNullOrEmpty(vo.getNoStr())) { if (CommonUtil.isNotNullOrEmpty(vo.getNoStr())) {
pegawai.setNoStr(vo.getNoStr()); pegawai.setNoStr(vo.getNoStr());
perubahan += "no str, "; perubahan += "no str, ";
@ -1482,6 +1486,10 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
pegawai.setTglBerakhirStr(vo.getTglBerakhirStr()); pegawai.setTglBerakhirStr(vo.getTglBerakhirStr());
perubahan += "tanggal berakhir str, "; perubahan += "tanggal berakhir str, ";
} }
if (CommonUtil.isNotNullOrEmpty(vo.getIsStrSeumurHidup())) {
pegawai.setIsStrSeumurHidup(vo.getIsStrSeumurHidup());
perubahan += "status str seumur hidup, ";
}
if (CommonUtil.isNotNullOrEmpty(vo.getTypePegawai())) { if (CommonUtil.isNotNullOrEmpty(vo.getTypePegawai())) {
pegawai.setTypePegawai(typePegawaiConverter.transferVOToModel(vo.getTypePegawai(), new TypePegawai())); pegawai.setTypePegawai(typePegawaiConverter.transferVOToModel(vo.getTypePegawai(), new TypePegawai()));
perubahan += "tipe pegawai, "; perubahan += "tipe pegawai, ";

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

@ -109,19 +109,19 @@ public class PelayananPasienDetail extends MedicalRecordTransaction {
@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;
@ -141,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;

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

@ -16,7 +16,7 @@ public class PelayananPasienDetailVO extends BaseTransactionVO {
private List<RacikanDetailVO> racikan = new ArrayList<>(); 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;
@ -136,4 +136,3 @@ public class PelayananPasienDetailVO extends BaseTransactionVO {
@Caption(value = "ID Trigger") @Caption(value = "ID Trigger")
private String noRecTriger; private String noRecTriger;
} }