Merge branch 'dev/base' into dev/integrasi/minio

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapKeluhanTambahanServiceImpl.java

@@ -1,30 +1,25 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.stereotype.Service;
-
 import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
 import com.jasamedika.medifirst2000.converter.PapKeluhanTambahanConverter;
-import com.jasamedika.medifirst2000.converter.PasienDaftarConverter;
 import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
 import com.jasamedika.medifirst2000.dao.PapKeluhanTambahanDao;
 import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
 import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
 import com.jasamedika.medifirst2000.entities.PapKeluhanTambahan;
-import com.jasamedika.medifirst2000.entities.PapKeluhanUtama;
 import com.jasamedika.medifirst2000.entities.PasienDaftar;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapKeluhanTambahanService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.vo.PapKeluhanTambahanVO;
-import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Implement class for PAPKeluhanTambahanService
@@ -48,7 +43,7 @@ public class PapKeluhanTambahanServiceImpl implements PapKeluhanTambahanService
 	public Map<String,Object> addKeluhanTambahan(PapKeluhanTambahanVO vo) throws JpaSystemException, ServiceVOException {
 		Map<String,Object> result=new HashMap<String,Object>();
 		PapKeluhanTambahan model=papKeluhanTambahanConverter.transferVOToModel(vo, new PapKeluhanTambahan());
-		AntrianPasienDiPeriksa antrian=antrianPasienDiPeriksaDao.findOne(vo.getPasien().getNoRec());
+		AntrianPasienDiPeriksa antrian=antrianPasienDiPeriksaDao.findOne(vo.getPasienDaftar().getNoRec());
 		PasienDaftar pasienDaftar=antrian.getPasienDaftar();
 		model.setPasienDaftar(pasienDaftar);
 		PapKeluhanTambahan resultModel=papKeluhanTambahanDao.save(model);

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapKeluhanUtamaServiceImpl.java

@@ -47,7 +47,7 @@ public class PapKeluhanUtamaServiceImpl implements PapKeluhanUtamaService {
 	public Map<String,Object> addKeluhanUtama(PapKeluhanUtamaVO vo) throws JpaSystemException, ServiceVOException {
 		Map<String,Object> result=new HashMap<String,Object>();
 		PapKeluhanUtama model=papKeluhanUtamaConverter.transferVOToModel(vo, new PapKeluhanUtama());
-		AntrianPasienDiPeriksa pasienDaftar = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec());
+		AntrianPasienDiPeriksa pasienDaftar = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasienDaftar().getNoRec());
 		model.setPasienDaftar(pasienDaftar);
 		PapKeluhanUtama resultModel=papKeluhanUtamaDao.save(model);
 		if(CommonUtil.isNotNullOrEmpty(resultModel)){

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MorfologiNeoplasmaVO.java

@@ -1,81 +1,34 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.io.Serializable;
-import javax.persistence.*;
-import java.util.Date;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
 
 /**
- *  class MorfologiNeoplasma
+ * class MorfologiNeoplasma
  * 
  * @author Generator
  */
-//@Entity
+@Getter
-//@Table(name = "MorfologiNeoplasma_M")
+@Setter
 public class MorfologiNeoplasmaVO extends BaseMasterVO {
-	@ManyToOne
+
-	@JoinColumn(name = "ObjectDiagnosaFk")
+	@NotNull(message = "Object DiagnosaVO Harus Diisi")
-	@NotNull(message="Object DiagnosaVO Harus Diisi")
+	@Caption(value = "Object Diagnosa")
-	@Caption(value="Object Diagnosa")
 	private DiagnosaVO diagnosa;
 
-	public void setDiagnosa(DiagnosaVO diagnosa) {
-		this.diagnosa = diagnosa;
-	}
-
-	@Column(name = "KdDiagnosa", nullable = false , length = 10)
-	public DiagnosaVO getDiagnosa(){
-		return this.diagnosa;
-	}
-
-	@Column(name = "ObjectDiagnosaFk", insertable=false,updatable=false)
 	private Integer diagnosaId;
 
-	@Caption(value="Kode Morfologi Neoplasma")
+	@Caption(value = "Kode Morfologi Neoplasma")
 	private Byte kdMorfologiNeoplasma;
 
-	public void setKdMorfologiNeoplasma(Byte kdMorfologiNeoplasma) {
+	@Caption(value = "Morfologi Neoplasma")
-		this.kdMorfologiNeoplasma = kdMorfologiNeoplasma;
-	}
-
-	@Column(name = "KdMorfologiNeoplasma", nullable = false )
-	public Byte getKdMorfologiNeoplasma(){
-		return this.kdMorfologiNeoplasma;
-	}
-
-	@Caption(value="Morfologi Neoplasma")
 	private String morfologiNeoplasma;
 
-	public void setMorfologiNeoplasma(String morfologiNeoplasma) {
+	@Caption(value = "QMorfologi Neoplasma")
-		this.morfologiNeoplasma = morfologiNeoplasma;
-	}
-
-	@Column(name = "MorfologiNeoplasma", nullable = false , length = 100)
-	public String getMorfologiNeoplasma(){
-		return this.morfologiNeoplasma;
-	}
-
-	@Caption(value="QMorfologi Neoplasma")
 	private Byte qMorfologiNeoplasma;
 
-	public void setqMorfologiNeoplasma(Byte qMorfologiNeoplasma) {
-		this.qMorfologiNeoplasma = qMorfologiNeoplasma;
-	}
-
-	@Column(name = "QMorfologiNeoplasma", nullable = false )
-	public Byte getqMorfologiNeoplasma(){
-		return this.qMorfologiNeoplasma;
-	}
-
-
 }
-

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NamaAsuransiVO.java

@@ -1,44 +1,23 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.*;
-
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import javax.validation.constraints.NotNull;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
- *  class NamaAsuransiVOVO
+ * class NamaAsuransiVOVO
  * 
  * @author Generator
  */
-public class NamaAsuransiVO  extends BaseMasterVO{
+@Getter
-	
+@Setter
+public class NamaAsuransiVO extends BaseMasterVO {
 
-	@Column(name = "Kode", nullable = false , length = 100)
+	@Caption(value = "Kode")
-	 @Caption(value = "Kode")
+	private Integer kode;
-	private Integer kode ;
-	public Integer getKode() {
-		return kode ;
-	}
-	public void setKode(Integer kode ) {
-		this.kode  = kode ;
-	}
-
-	@Column(name = "Name", nullable = false , length = 100)
-	 @Caption(value = "Name")
-	private String name ;
-	public String getName() {
-		return name ;
-	}
-	public void setName(String name ) {
-		this.name  = name ;
-	}
 
+	@Caption(value = "Name")
+	private String name;
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NamaObatStokVO.java

@@ -2,28 +2,17 @@ package com.jasamedika.medifirst2000.vo;
 
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class NamaObatStokVO extends BaseMasterVO{
+@Getter
-	@Caption(value="Nama Obat")
+@Setter
+public class NamaObatStokVO extends BaseMasterVO {
+
+	@Caption(value = "Nama Obat")
 	private String namaObat;
-	
+
-	@Caption(value="stok")
+	@Caption(value = "stok")
 	private String stok;
 
-	public String getNamaObat() {
-		return namaObat;
-	}
-
-	public void setNamaObat(String namaObat) {
-		this.namaObat = namaObat;
-	}
-
-	public String getStok() {
-		return stok;
-	}
-
-	public void setStok(String stok) {
-		this.stok = stok;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NamaPegawaiVO.java

@@ -1,96 +1,38 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.*;
-
-
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import javax.validation.constraints.NotNull;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
- *  class NamaPegawaiVOVO
+ * class NamaPegawaiVOVO
  * 
  * @author Generator
  */
-public class NamaPegawaiVO  extends BaseTransactionVO{
+@Getter
-	@Column(name = "Id", nullable = false , length = 100)
+@Setter
-	 @Caption(value = "Id")
+public class NamaPegawaiVO extends BaseTransactionVO {
-	private Integer id ;
-	public Integer getId() {
-		return id ;
-	}
-	public void setId(Integer id ) {
-		this.id  = id ;
-	}
 
-	
+	@Caption(value = "Id")
+	private Integer id;
 
-	@Column(name = "NamaExternal", nullable = false , length = 100)
+	@Caption(value = "NamaExternal")
-	 @Caption(value = "NamaExternal")
+	private String namaExternal;
-	private String namaExternal ;
-	public String getNamaExternal() {
-		return namaExternal ;
-	}
-	public void setNamaExternal(String namaExternal ) {
-		this.namaExternal  = namaExternal ;
-	}
 
-	@Column(name = "NoRec", nullable = false , length = 100)
+	@Caption(value = "NoRec")
-	 @Caption(value = "NoRec")
+	private String noRec;
-	private String noRec ;
-	public String getNoRec() {
-		return noRec ;
-	}
-	public void setNoRec(String noRec ) {
-		this.noRec  = noRec ;
-	}
 
-	
+	@Caption(value = "Name")
+	private String name;
 
-	@Column(name = "Name", nullable = false , length = 100)
+	@Caption(value = "Kode")
-	 @Caption(value = "Name")
+	private Integer kode;
-	private String name ;
-	public String getName() {
-		return name ;
-	}
-	public void setName(String name ) {
-		this.name  = name ;
-	}
 
-	@Column(name = "Kode", nullable = false , length = 100)
+	@Caption(value = "KodeExternal")
-	 @Caption(value = "Kode")
+	private Integer kodeExternal;
-	private Integer kode ;
-	public Integer getKode() {
-		return kode ;
-	}
-	public void setKode(Integer kode ) {
-		this.kode  = kode ;
-	}
-
-	@Column(name = "KodeExternal", nullable = false , length = 100)
-	 @Caption(value = "KodeExternal")
-	private Integer kodeExternal ;
-	public Integer getKodeExternal() {
-		return kodeExternal ;
-	}
-	public void setKodeExternal(Integer kodeExternal ) {
-		this.kodeExternal  = kodeExternal ;
-	}
-
-	@Column(name = "ReportDisplay", nullable = false , length = 100)
-	 @Caption(value = "ReportDisplay")
-	private String reportDisplay ;
-	public String getReportDisplay() {
-		return reportDisplay ;
-	}
-	public void setReportDisplay(String reportDisplay ) {
-		this.reportDisplay  = reportDisplay ;
-	}
 
+	@Caption(value = "ReportDisplay")
+	private String reportDisplay;
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NamaPembimbingVO.java

@@ -1,43 +1,23 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.*;
-
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import javax.validation.constraints.NotNull;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
- *  class NamaPembimbingVOVO
+ * class NamaPembimbingVOVO
  * 
  * @author Generator
  */
-public class NamaPembimbingVO  extends BaseMasterVO{
+@Getter
-	
+@Setter
-	@Column(name = "Kode", nullable = false , length = 100)
+public class NamaPembimbingVO extends BaseMasterVO {
-	 @Caption(value = "Kode")
-	private Integer kode ;
-	public Integer getKode() {
-		return kode ;
-	}
-	public void setKode(Integer kode ) {
-		this.kode  = kode ;
-	}
 
-	@Column(name = "Name", nullable = false , length = 100)
+	@Caption(value = "Kode")
-	 @Caption(value = "Name")
+	private Integer kode;
-	private String name ;
-	public String getName() {
-		return name ;
-	}
-	public void setName(String name ) {
-		this.name  = name ;
-	}
 
+	@Caption(value = "Name")
+	private String name;
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NegaraVO.java

@@ -1,52 +1,26 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
- *  class Negara
+ * class Negara
  * 
  * @author Generator
  */
+@Getter
+@Setter
 public class NegaraVO extends BaseMasterVO {
-	
+
-	@Caption(value="Kode Negara")
+	@Caption(value = "Kode Negara")
 	private Byte kdNegara;
 
-	public void setKdNegara(Byte kdNegara) {
+	@Caption(value = "Nama Negara")
-		this.kdNegara = kdNegara;
-	}
-
-	@Column(name = "KdNegara", nullable = false )
-	public Byte getKdNegara(){
-		return this.kdNegara;
-	}
-
-	@Caption(value="Nama Negara")
 	private String namaNegara;
 
-	public void setNamaNegara(String namaNegara) {
+	@Caption(value = "QNegara")
-		this.namaNegara = namaNegara;
-	}
-
-	@Column(name = "NamaNegara", nullable = false , length = 50)
-	public String getNamaNegara(){
-		return this.namaNegara;
-	}
-
-	@Caption(value="QNegara")
 	private Byte qNegara;
 
-	public void setqNegara(Byte qNegara) {
-		this.qNegara = qNegara;
-	}
-
-	@Column(name = "QNegara", nullable = false )
-	public Byte getqNegara(){
-		return this.qNegara;
-	}
-	
 }
-

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NeurologiKejangVO.java

@@ -1,25 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class NeurologiKejangVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NeurologiKomponenVO.java

@@ -1,25 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class NeurologiKomponenVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NilaiHarapanVO.java

@@ -1,26 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class NilaiHarapanVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NilaiIndexKinerjaIndividuVO.java

@@ -1,119 +1,40 @@
 package com.jasamedika.medifirst2000.vo;
 
-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;
+
+@Getter
+@Setter
 public class NilaiIndexKinerjaIndividuVO extends BaseTransactionVO {
-	
+
-	@ManyToOne
-	@JoinColumn(name = "ObjectPegawaiFk")
 	@Caption(value = "Object Pegawai")
 	private PegawaiVO pegawai;
-	
+
-	@Column(name = "ObjectPegawaiFk", insertable = false, updatable = false, nullable = false)
 	private Integer pegawaiId;
-	
+
 	@Caption(value = "periode")
 	@NotNull(message = "Periode tidak boleh kosong")
-	@Column(name = "periode", nullable = false)
 	private String periode;
-	
+
 	@Caption(value = "totalKuantitas")
-	@Column(name = "totalKuantitas", nullable = true)
 	private Double totalKuantitas;
-	
+
 	@Caption(value = "totalKualitas")
-	@Column(name = "totalKualitas", nullable = true)
 	private Double totalKualitas;
-	
+
 	@Caption(value = "totalPerilaku")
-	@Column(name = "totalPerilaku", nullable = true)
 	private Double totalPerilaku;
-	
+
 	@Caption(value = "totalInovasi")
-	@Column(name = "totalInovasi", nullable = true)
 	private Double totalInovasi;
-	
+
 	private Double iki;
-	
+
 	@Caption(value = "totalIKI")
-	@Column(name = "totalIKI", nullable = true)
 	private Double totalIKI;
 
-	public PegawaiVO getPegawai() {
-		return pegawai;
-	}
-
-	public void setPegawai(PegawaiVO pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public Integer getPegawaiId() {
-		return pegawaiId;
-	}
-
-	public void setPegawaiId(Integer pegawaiId) {
-		this.pegawaiId = pegawaiId;
-	}
-
-	public String getPeriode() {
-		return periode;
-	}
-
-	public void setPeriode(String periode) {
-		this.periode = periode;
-	}
-
-	public Double getTotalKuantitas() {
-		return totalKuantitas;
-	}
-
-	public void setTotalKuantitas(Double totalKuantitas) {
-		this.totalKuantitas = totalKuantitas;
-	}
-
-	public Double getTotalKualitas() {
-		return totalKualitas;
-	}
-
-	public void setTotalKualitas(Double totalKualitas) {
-		this.totalKualitas = totalKualitas;
-	}
-
-	public Double getTotalPerilaku() {
-		return totalPerilaku;
-	}
-
-	public void setTotalPerilaku(Double totalPerilaku) {
-		this.totalPerilaku = totalPerilaku;
-	}
-
-	public Double getTotalInovasi() {
-		return totalInovasi;
-	}
-
-	public void setTotalInovasi(Double totalInovasi) {
-		this.totalInovasi = totalInovasi;
-	}
-
-	public Double getTotalIKI() {
-		return totalIKI;
-	}
-
-	public void setTotalIKI(Double totalIKI) {
-		this.totalIKI = totalIKI;
-	}
-
-	public Double getIki() {
-		return iki;
-	}
-
-	public void setIki(Double iki) {
-		this.iki = iki;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NilaiKelompokJabatanVO.java

@@ -2,12 +2,16 @@ package com.jasamedika.medifirst2000.vo;
 
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * class KelompokJabatanVOVO
  * 
  * @author Generator
  */
+@Getter
+@Setter
 public class NilaiKelompokJabatanVO extends BaseMasterVO {
 
 	@Caption(value = "KelompokJabatan")
@@ -40,92 +44,4 @@ public class NilaiKelompokJabatanVO extends BaseMasterVO {
 	@Caption(value = "Maksimal Total Remunerasi")
 	private Double maxTotalRemunerasi;
 
-	public KelompokJabatanVO getKelompokJabatan() {
-		return kelompokJabatan;
-	}
-
-	public void setKelompokJabatan(KelompokJabatanVO kelompokJabatan) {
-		this.kelompokJabatan = kelompokJabatan;
-	}
-
-	public String getDetailKelompokJabatan() {
-		return detailKelompokJabatan;
-	}
-
-	public void setDetailKelompokJabatan(String detailKelompokJabatan) {
-		this.detailKelompokJabatan = detailKelompokJabatan;
-	}
-
-	public GradeRemunerasiVO getGrade() {
-		return grade;
-	}
-
-	public void setGrade(GradeRemunerasiVO grade) {
-		this.grade = grade;
-	}
-
-	public Integer getGradeId() {
-		return gradeId;
-	}
-
-	public void setGradeId(Integer gradeId) {
-		this.gradeId = gradeId;
-	}
-
-	public String getGradeDesc() {
-		return gradeDesc;
-	}
-
-	public void setGradeDesc(String gradeDesc) {
-		this.gradeDesc = gradeDesc;
-	}
-
-	public Integer getNilaiTerendah() {
-		return nilaiTerendah;
-	}
-
-	public void setNilaiTerendah(Integer nilaiTerendah) {
-		this.nilaiTerendah = nilaiTerendah;
-	}
-
-	public Integer getNilaiTertinggi() {
-		return nilaiTertinggi;
-	}
-
-	public void setNilaiTertinggi(Integer nilaiTertinggi) {
-		this.nilaiTertinggi = nilaiTertinggi;
-	}
-
-	public Double getGajiHonorarium() {
-		return gajiHonorarium;
-	}
-
-	public void setGajiHonorarium(Double gajiHonorarium) {
-		this.gajiHonorarium = gajiHonorarium;
-	}
-
-	public Double getMinInsentif() {
-		return minInsentif;
-	}
-
-	public void setMinInsentif(Double minInsentif) {
-		this.minInsentif = minInsentif;
-	}
-
-	public Double getMaxInsentif() {
-		return maxInsentif;
-	}
-
-	public void setMaxInsentif(Double maxInsentif) {
-		this.maxInsentif = maxInsentif;
-	}
-
-	public Double getMaxTotalRemunerasi() {
-		return maxTotalRemunerasi;
-	}
-
-	public void setMaxTotalRemunerasi(Double maxTotalRemunerasi) {
-		this.maxTotalRemunerasi = maxTotalRemunerasi;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NilaiNilaiVO.java

@@ -1,72 +1,31 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class NilaiNilaiVO extends BaseTransactionVO{
+import javax.validation.constraints.NotNull;
-	@ManyToOne
+import java.util.Date;
-	@JoinColumn(name = "ObjectPasienDaftarFk")
+
-	@NotNull(message="PasienDaftar Harus Diisi")
+@Getter
-	@Caption(value="PasienDaftar")
+@Setter
+public class NilaiNilaiVO extends BaseTransactionVO {
+
+	@NotNull(message = "PasienDaftar Harus Diisi")
+	@Caption(value = "PasienDaftar")
 	private AntrianPasienDiPeriksaVO pasienDaftar;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
 
-	@ManyToOne
+	@NotNull(message = "Object MengatasiPenyakit Harus Diisi")
-	@JoinColumn(name = "ObjectMengatasiPenyakitFk")
+	@Caption(value = "Object MengatasiPenyakit")
-	@NotNull(message="Object MengatasiPenyakit Harus Diisi")
-	@Caption(value="Object MengatasiPenyakit")	
 	private StatusMengatasiPenyakitVO mengatasiPenyakit;
-	
+
-	@ManyToOne
+	@NotNull(message = "Object HarapanPasien Harus Diisi")
-	@JoinColumn(name = "ObjectHarapanPasienFk")
+	@Caption(value = "Object HarapanPasien")
-	@NotNull(message="Object HarapanPasien Harus Diisi")
-	@Caption(value="Object HarapanPasien")
 	private StatusHarapanPasienVO harapanPasien;
 
-	public AntrianPasienDiPeriksaVO getPasienDaftar() {
-		return pasienDaftar;
-	}
-
-	public void setPasienDaftar(AntrianPasienDiPeriksaVO pasienDaftar) {
-		this.pasienDaftar = pasienDaftar;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public StatusMengatasiPenyakitVO getMengatasiPenyakit() {
-		return mengatasiPenyakit;
-	}
-
-	public void setMengatasiPenyakit(StatusMengatasiPenyakitVO mengatasiPenyakit) {
-		this.mengatasiPenyakit = mengatasiPenyakit;
-	}
-
-	public StatusHarapanPasienVO getHarapanPasien() {
-		return harapanPasien;
-	}
-
-	public void setHarapanPasien(StatusHarapanPasienVO harapanPasien) {
-		this.harapanPasien = harapanPasien;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NilaiPertolonganVO.java

@@ -1,26 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class NilaiPertolonganVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotaDinasJabatanVO.java

@@ -1,63 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-@Entity
+@Getter
-@Table(name = "NotaDinasJabatan_T")
+@Setter
 public class NotaDinasJabatanVO extends BaseTransactionVO {
-	
+
-	 
+	@Caption(value = "NotaDinas")
-	@Caption(value="NotaDinas")
 	private NotaDinasVO notaDinas;
-	
+
-	 
+	@Caption(value = "jabatan")
-	@Caption(value="jabatan")
 	private JabatanVO jabatan;
-	
+
-	 
+	@Caption(value = "pegawai")
-	@Caption(value="pegawai")
 	private PegawaiVO pegawai;
-	
+
 	@Caption("Is Nota Dinas/ Disposisi was read")
 	public Boolean isRead;
-	public NotaDinasVO getNotaDinas() {
-		return notaDinas;
-	}
 
-	public void setNotaDinas(NotaDinasVO notaDinas) {
-		this.notaDinas = notaDinas;
-	}
-
-	public JabatanVO getJabatan() {
-		return jabatan;
-	}
-
-	public void setJabatan(JabatanVO jabatan) {
-		this.jabatan = jabatan;
-	}
-
-	public PegawaiVO getPegawai() {
-		return pegawai;
-	}
-
-	public void setPegawai(PegawaiVO pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public Boolean getIsRead() {
-		return isRead;
-	}
-
-	public void setIsRead(Boolean isRead) {
-		this.isRead = isRead;
-	}
-	
-	
-
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotaDinasVO.java

@@ -1,147 +1,47 @@
 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;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Entity;
+@Getter
-import javax.persistence.Table;
+@Setter
+public class NotaDinasVO extends BaseTransactionVO {
 
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+	@Caption(value = "noSurat")
-import com.jasamedika.medifirst2000.helper.Caption;
-
- 
-public class NotaDinasVO extends BaseTransactionVO{
-	
-	
-	@Caption(value="noSurat")
 	private String noSurat;
-	
+
-	@Caption(value="judul")
+	@Caption(value = "judul")
 	private String hal;
-	
+
-	@Caption(value="Jabatan")
+	@Caption(value = "Jabatan")
 	private JabatanVO jabatan;
-	
+
 	private Integer jabatanId;
-	
+
-	@Caption(value="isiSurat")
+	@Caption(value = "isiSurat")
 	private String isiSurat;
-	
+
-	private Set<NotaDinasJabatanVO> notaDinasJabatan=new HashSet<NotaDinasJabatanVO>();
+	private Set<NotaDinasJabatanVO> notaDinasJabatan = new HashSet<>();
-	
+
-	@Caption(value="Tanggal")
+	@Caption(value = "Tanggal")
 	private Date tanggal;
-	
+
-	 
-	 
 	@Caption(value = "Object Pegawai Pembuat")
 	private PegawaiVO pegawaiPembuat;
-	
+
-	 private Integer pegawaiPembuatId;
+	private Integer pegawaiPembuatId;
-	
+
-	 	@Caption(value = "Object Jenis Surat")
+	@Caption(value = "Object Jenis Surat")
 	private JenisSuratVO jenisSurat;
-	
+
-	 private String jenisSuratString;	
+	private String jenisSuratString;
+
 	private Integer jenisSuratId;
-	public String getNoSurat() {
-		return noSurat;
-	}
-
-	public void setNoSurat(String noSurat) {
-		this.noSurat = noSurat;
-	}
-
-	public String getHal() {
-		return hal;
-	}
-
-	public void setHal(String hal) {
-		this.hal = hal;
-	}
-
-	public JabatanVO getJabatan() {
-		return jabatan;
-	}
-
-	public void setJabatan(JabatanVO jabatan) {
-		this.jabatan = jabatan;
-	}
-
-	public Integer getJabatanId() {
-		return jabatanId;
-	}
-
-	public void setJabatanId(Integer jabatanId) {
-		this.jabatanId = jabatanId;
-	}
-
-	public String getIsiSurat() {
-		return isiSurat;
-	}
-
-	public void setIsiSurat(String isiSurat) {
-		this.isiSurat = isiSurat;
-	}
-
-	public Set<NotaDinasJabatanVO> getNotaDinasJabatan() {
-		return notaDinasJabatan;
-	}
-
-	public void setNotaDinasJabatan(Set<NotaDinasJabatanVO> notaDinasJabatan) {
-		this.notaDinasJabatan = notaDinasJabatan;
-	}
-
-	public Date getTanggal() {
-		return tanggal;
-	}
-
-	public void setTanggal(Date tanggal) {
-		this.tanggal = tanggal;
-	}
-
-	public PegawaiVO getPegawaiPembuat() {
-		return pegawaiPembuat;
-	}
-
-	public void setPegawaiPembuat(PegawaiVO pegawaiPembuat) {
-		this.pegawaiPembuat = pegawaiPembuat;
-	}
-
-	public Integer getPegawaiPembuatId() {
-		return pegawaiPembuatId;
-	}
-
-	public void setPegawaiPembuatId(Integer pegawaiPembuatId) {
-		this.pegawaiPembuatId = pegawaiPembuatId;
-	}
-
-	public JenisSuratVO getJenisSurat() {
-		return jenisSurat;
-	}
-
-	public void setJenisSurat(JenisSuratVO jenisSurat) {
-		this.jenisSurat = jenisSurat;
-	}
-
-	public Integer getJenisSuratId() {
-		return jenisSuratId;
-	}
-
-	public void setJenisSuratId(Integer jenisSuratId) {
-		this.jenisSuratId = jenisSuratId;
-	}
-
-	public String getJenisSuratString() {
-		return jenisSuratString;
-	}
-
-	public void setJenisSuratString(String jenisSuratString) {
-		this.jenisSuratString = jenisSuratString;
-	}
-
- 
-	
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NutrisiMualVO.java

@@ -1,25 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class NutrisiMualVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NutrisiMukosaVO.java

@@ -1,25 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class NutrisiMukosaVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NutrisiMuntahVO.java

@@ -1,25 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class NutrisiMuntahVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NutrisiStomatitisVO.java

@@ -1,25 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class NutrisiStomatitisVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ObatObatanVO.java

@@ -1,23 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class ObatObatanVO extends BaseMasterVO{
+import javax.validation.constraints.NotNull;
-	@NotNull(message="Name tidak boleh kosong")
+
-	@Column(name = "Name", nullable = false, length = 100)
+@Getter
+@Setter
+public class ObatObatanVO extends BaseMasterVO {
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Caption(value = "Name")
 	private String name;
-	
+
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ObatVO.java

@@ -1,22 +1,15 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class ObatVO  extends BaseMasterVO {
+@Getter
-	
+@Setter
-	@Column(name = "NamaObat", nullable = false , length = 100)
+public class ObatVO extends BaseMasterVO {
-	@Caption(value="Nama Obat")
+
+	@Caption(value = "Nama Obat")
 	private String namaObat;
 
-	public String getNamaObat() {
-		return namaObat;
-	}
-
-	public void setNamaObat(String namaObat) {
-		this.namaObat = namaObat;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ObjekPajakVO.java

@@ -2,6 +2,8 @@ package com.jasamedika.medifirst2000.vo;
 
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
 
@@ -10,6 +12,8 @@ import javax.validation.constraints.NotNull;
  * 
  * @author Generator
  */
+@Getter
+@Setter
 public class ObjekPajakVO extends BaseMasterVO {
 
 	@Caption(value = "Deskripsi")

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ObservasiCustomVO.java

@@ -1,27 +1,16 @@
 package com.jasamedika.medifirst2000.vo;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.List;
 
+@Getter
+@Setter
 public class ObservasiCustomVO {
-	
+
 	private List<ObservasiTransaksiVO> listObservasi;
-	
+
 	private List<VariabelVO> listVariabel;
 
-	public List<ObservasiTransaksiVO> getListObservasi() {
-		return listObservasi;
-	}
-
-	public void setListObservasi(List<ObservasiTransaksiVO> listObservasi) {
-		this.listObservasi = listObservasi;
-	}
-
-	public List<VariabelVO> getListVariabel() {
-		return listVariabel;
-	}
-
-	public void setListVariabel(List<VariabelVO> listVariabel) {
-		this.listVariabel = listVariabel;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ObservasiIGDVOCustom.java

@@ -1,28 +1,18 @@
 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.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
+@Getter
-import javax.persistence.FetchType;
+@Setter
-import javax.persistence.OneToMany;
-
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.helper.Caption;
-
 public class ObservasiIGDVOCustom extends BaseTransactionVO {
-	
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY)
-	@Caption(value="Object ObservasiIGD")
-	private Set<ObservasiIGDVO> observasiIGD=new HashSet<ObservasiIGDVO>();
 
-	public Set<ObservasiIGDVO> getObservasiIGD() {
+	@Caption(value = "Object ObservasiIGD")
-		return observasiIGD;
+	private Set<ObservasiIGDVO> observasiIGD = new HashSet<>();
-	}
-
-	public void setObservasiIGD(Set<ObservasiIGDVO> observasiIGD) {
-		this.observasiIGD = observasiIGD;
-	}
-	
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ObservasiTerintegrasiPasienVO.java

@@ -1,225 +1,71 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class ObservasiTerintegrasiPasienVO extends BaseTransactionVO{
+import java.util.Date;
 
-	@Caption(value="kdObservasiTerintegrasiPasein")
+@Getter
+@Setter
+public class ObservasiTerintegrasiPasienVO extends BaseTransactionVO {
+
+	@Caption(value = "kdObservasiTerintegrasiPasein")
 	private String kdObservasiTerintegrasiPasein;
-	
+
-	@Caption(value="TekananDarahS")
+	@Caption(value = "TekananDarahS")
 	private String tekananDarahS;
-	
+
-	@Caption(value="TekananDarahD")
+	@Caption(value = "TekananDarahD")
 	private String tekananDarahD;
-	
+
-	@Caption(value="Fn")
+	@Caption(value = "Fn")
 	private String fn;
-	
+
-	@Caption(value="Fp")
+	@Caption(value = "Fp")
 	private String fp;
-	
+
-	@Caption(value="Sa02")
+	@Caption(value = "Sa02")
 	private String saO2;
-	
+
-	@Caption(value="SkalaNyeri")
+	@Caption(value = "SkalaNyeri")
 	private String skalaNyeri;
-	
+
-	@Caption(value="SkalaJatuh")
+	@Caption(value = "SkalaJatuh")
 	private String skalaJatuh;
-	
+
-	@Caption(value="Gcs")
+	@Caption(value = "Gcs")
 	private String gcs;
-	
+
-	@Caption(value="PupilK1")
+	@Caption(value = "PupilK1")
 	private String pupilK1;
-	
+
-	@Caption(value="PupilK2")
+	@Caption(value = "PupilK2")
 	private String pupilK2;
-	
+
-	@Caption(value="Ekg")
+	@Caption(value = "Ekg")
 	private String ekg;
-	
+
-	@Caption(value="Masalah")
+	@Caption(value = "Masalah")
 	private String masalah;
-	
+
-	@Caption(value="Intervensi")
+	@Caption(value = "Intervensi")
 	private String intervensi;
-	
+
-	@ManyToOne(fetch=FetchType.LAZY)
+	@Caption(value = "KonfirmasiPerawat")
-	@Caption(value="KonfirmasiPerawat")
 	private PegawaiVO konfirmasiPerawat;
-	
+
-	@ManyToOne(fetch=FetchType.LAZY)
+	@Caption(value = "KonfirmasiDokter")
-	@Caption(value="KonfirmasiDokter")
 	private PegawaiVO konfirmasiDokter;
-	
+
-	@ManyToOne(fetch=FetchType.LAZY)
+	@Caption(value = "Pasien")
-	@Caption(value="Pasien")
 	private AntrianPasienDiPeriksaVO pasien;
-	
+
-	@Caption(value="HariJamInput")
+	@Caption(value = "HariJamInput")
 	private Date hariJamInput;
-	
+
-	@ManyToOne(fetch=FetchType.LAZY)
+	@Caption(value = "PegawaiInput")
-	@Caption(value="PegawaiInput")
 	private PegawaiVO pegawaiInput;
 
-	public String getKdObservasiTerintegrasiPasein() {
-		return kdObservasiTerintegrasiPasein;
-	}
-
-	public void setKdObservasiTerintegrasiPasein(String kdObservasiTerintegrasiPasein) {
-		this.kdObservasiTerintegrasiPasein = kdObservasiTerintegrasiPasein;
-	}
-
-	public String getTekananDarahS() {
-		return tekananDarahS;
-	}
-
-	public void setTekananDarahS(String tekananDarahS) {
-		this.tekananDarahS = tekananDarahS;
-	}
-
-	public String getTekananDarahD() {
-		return tekananDarahD;
-	}
-
-	public void setTekananDarahD(String tekananDarahD) {
-		this.tekananDarahD = tekananDarahD;
-	}
-
-	public String getFn() {
-		return fn;
-	}
-
-	public void setFn(String fn) {
-		this.fn = fn;
-	}
-
-	public String getFp() {
-		return fp;
-	}
-
-	public void setFp(String fp) {
-		this.fp = fp;
-	}
-
-	public String getSaO2() {
-		return saO2;
-	}
-
-	public void setSaO2(String saO2) {
-		this.saO2 = saO2;
-	}
-
-	public String getSkalaNyeri() {
-		return skalaNyeri;
-	}
-
-	public void setSkalaNyeri(String skalaNyeri) {
-		this.skalaNyeri = skalaNyeri;
-	}
-
-	public String getSkalaJatuh() {
-		return skalaJatuh;
-	}
-
-	public void setSkalaJatuh(String skalaJatuh) {
-		this.skalaJatuh = skalaJatuh;
-	}
-
-	public String getGcs() {
-		return gcs;
-	}
-
-	public void setGcs(String gcs) {
-		this.gcs = gcs;
-	}
-
-	public String getPupilK1() {
-		return pupilK1;
-	}
-
-	public void setPupilK1(String pupilK1) {
-		this.pupilK1 = pupilK1;
-	}
-
-	public String getPupilK2() {
-		return pupilK2;
-	}
-
-	public void setPupilK2(String pupilK2) {
-		this.pupilK2 = pupilK2;
-	}
-
-	public String getEkg() {
-		return ekg;
-	}
-
-	public void setEkg(String ekg) {
-		this.ekg = ekg;
-	}
-
-	public String getMasalah() {
-		return masalah;
-	}
-
-	public void setMasalah(String masalah) {
-		this.masalah = masalah;
-	}
-
-	public String getIntervensi() {
-		return intervensi;
-	}
-
-	public void setIntervensi(String intervensi) {
-		this.intervensi = intervensi;
-	}
-
-	public PegawaiVO getKonfirmasiPerawat() {
-		return konfirmasiPerawat;
-	}
-
-	public void setKonfirmasiPerawat(PegawaiVO konfirmasiPerawat) {
-		this.konfirmasiPerawat = konfirmasiPerawat;
-	}
-
-	public PegawaiVO getKonfirmasiDokter() {
-		return konfirmasiDokter;
-	}
-
-	public void setKonfirmasiDokter(PegawaiVO konfirmasiDokter) {
-		this.konfirmasiDokter = konfirmasiDokter;
-	}
-
-	public AntrianPasienDiPeriksaVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(AntrianPasienDiPeriksaVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getHariJamInput() {
-		return hariJamInput;
-	}
-
-	public void setHariJamInput(Date hariJamInput) {
-		this.hariJamInput = hariJamInput;
-	}
-
-	public PegawaiVO getPegawaiInput() {
-		return pegawaiInput;
-	}
-
-	public void setPegawaiInput(PegawaiVO pegawaiInput) {
-		this.pegawaiInput = pegawaiInput;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OksigenasiBatukVO.java

@@ -1,25 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class OksigenasiBatukVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OksigenasiPolaNafasVO.java

@@ -1,26 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class OksigenasiPolaNafasVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OksigenasiSianosisVO.java

@@ -1,26 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class OksigenasiSianosisVO extends BaseMasterVO {
+
 	@NotNull(message = "Name tidak boleh kosong")
-	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OrderAmbulanceVO.java

@@ -1,40 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class OrderAmbulanceVO extends BaseTransactionVO {
 
-	private static final long serialVersionUID = 6639729407772537356L;
-
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "ObjectStrukOrderFk")
 	@Caption(value = "strukOrder")
 	private StrukOrderVO strukOrder;
 
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "ObjectOrderPelayananFk")
 	@Caption(value = "orderPelayanan")
 	private OrderPelayananVO orderPelayanan;
 
-	public StrukOrderVO getStrukOrder() {
-		return strukOrder;
-	}
-
-	public void setStrukOrder(StrukOrderVO strukOrder) {
-		this.strukOrder = strukOrder;
-	}
-
-	public OrderPelayananVO getOrderPelayanan() {
-		return orderPelayanan;
-	}
-
-	public void setOrderPelayanan(OrderPelayananVO orderPelayanan) {
-		this.orderPelayanan = orderPelayanan;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OrderKendaraanDinasVO.java

@@ -1,40 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class OrderKendaraanDinasVO extends BaseMasterVO {
 
-	private static final long serialVersionUID = 9154432385487000010L;
-
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "ObjectStrukOrderFk")
 	@Caption(value = "strukOrder")
 	private StrukOrderVO strukOrder;
 
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "ObjectOrderPelayananFk")
 	@Caption(value = "orderPelayanan")
 	private OrderPelayananVO orderPelayanan;
 
-	public StrukOrderVO getStrukOrder() {
-		return strukOrder;
-	}
-
-	public void setStrukOrder(StrukOrderVO strukOrder) {
-		this.strukOrder = strukOrder;
-	}
-
-	public OrderPelayananVO getOrderPelayanan() {
-		return orderPelayanan;
-	}
-
-	public void setOrderPelayanan(OrderPelayananVO orderPelayanan) {
-		this.orderPelayanan = orderPelayanan;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OrderPelayananDietVO.java

@@ -1,148 +1,58 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.*;
-
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import javax.validation.constraints.NotNull;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /**
  * class OrderPelayananDietVOVO
  * 
  * @author Generator
  */
+@Getter
+@Setter
 public class OrderPelayananDietVO extends MedicalRecordTransactionVO {
-	@Column(name = "NamaPemesan", nullable = false, length = 100)
+
 	@Caption(value = "NamaPemesan")
 	private String namaPemesan;
 
-	public String getNamaPemesan() {
-		return namaPemesan;
-	}
-
-	public void setNamaPemesan(String namaPemesan) {
-		this.namaPemesan = namaPemesan;
-	}
-
-	@Column(name = "TglPesan", nullable = false, length = 100)
 	@Caption(value = "TglPesan")
 	private Date tglPesan;
 
-	public Date getTglPesan() {
-		return tglPesan;
-	}
-
-	public void setTglPesan(Date tglPesan) {
-		this.tglPesan = tglPesan;
-	}
-
-	@ManyToOne
-	@JoinColumn(name = "JenisWaktuFk")
 	@NotNull(message = "Jenis Waktu Harus Diisi")
 	@Caption(value = "Jenis Waktu")
 	private JenisWaktuVO jenisWaktu;
 
-	public JenisWaktuVO getJenisWaktu() {
-		return jenisWaktu;
-	}
-
-	public void setJenisWaktu(JenisWaktuVO jenisWaktu) {
-		this.jenisWaktu = jenisWaktu;
-	}
-
-	@Column(name = "JenisWaktuFk", insertable = false, updatable = false)
 	private Integer jenisWaktuId;
 
-	@ManyToOne
-	@JoinColumn(name = "JenisDietFk")
 	@NotNull(message = "Jenis Diet Harus Diisi")
 	@Caption(value = "Jenis Diet")
 	private JenisDietVO jenisDiet;
 
-	public JenisDietVO getJenisDiet() {
-		return jenisDiet;
-	}
-
-	public void setJenisDiet(JenisDietVO jenisDiet) {
-		this.jenisDiet = jenisDiet;
-	}
-
-	@Column(name = "JenisDietFk", insertable = false, updatable = false)
 	private Integer jenisDietId;
 
-	@ManyToOne
-	@JoinColumn(name = "NamaMenuFk")
 	@NotNull(message = "Nama Menu Harus Diisi")
 	@Caption(value = "Nama Menu")
 	private ProdukVO namaMenu;
 
-	public ProdukVO getNamaMenu() {
-		return namaMenu;
-	}
-
-	public void setNamaMenu(ProdukVO namaMenu) {
-		this.namaMenu = namaMenu;
-	}
-
-	@Column(name = "NamaMenuFk", insertable = false, updatable = false)
 	private Integer namaMenuId;
 
-	@Column(name = "TipeMakanan", nullable = false, length = 100)
 	@Caption(value = "TipeMakanan")
 	private String tipeMakanan;
 
-	public String getTipeMakanan() {
-		return tipeMakanan;
-	}
-
-	public void setTipeMakanan(String tipeMakanan) {
-		this.tipeMakanan = tipeMakanan;
-	}
-
-	@Column(name = "Minum", nullable = false, length = 100)
 	@Caption(value = "Minum")
 	private String minum;
 
-	public String getMinum() {
-		return minum;
-	}
-
-	public void setMinum(String minum) {
-		this.minum = minum;
-	}
-
-	@ManyToOne
-	@JoinColumn(name = "FrekuensiFk")
 	@NotNull(message = "Frekuensi Harus Diisi")
 	@Caption(value = "Frekuensi")
 	private SatuanWaktuVO frekuensi;
 
-	public SatuanWaktuVO getFrekuensi() {
-		return frekuensi;
-	}
-
-	public void setFrekuensi(SatuanWaktuVO frekuensi) {
-		this.frekuensi = frekuensi;
-	}
-
-	@Column(name = "FrekuensiFk", insertable = false, updatable = false)
 	private Integer frekuensiId;
 
-	@Column(name = "Volume", nullable = false, length = 100)
 	@Caption(value = "Volume")
 	private String volume;
 
-	public String getVolume() {
-		return volume;
-	}
-
-	public void setVolume(String volume) {
-		this.volume = volume;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OrderPelayananSistemVO.java

@@ -1,38 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class OrderPelayananSistemVO extends BaseTransactionVO {
 
-public class OrderPelayananSistemVO extends BaseTransactionVO{
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "ObjectStrukOrderFk")
 	@Caption(value = "strukOrder")
 	private StrukOrderVO strukOrder;
 
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "ObjectOrderPelayananFk")
 	@Caption(value = "orderPelayanan")
 	private OrderPelayananVO orderPelayanan;
 
-	public StrukOrderVO getStrukOrder() {
-		return strukOrder;
-	}
-
-	public void setStrukOrder(StrukOrderVO strukOrder) {
-		this.strukOrder = strukOrder;
-	}
-
-	public OrderPelayananVO getOrderPelayanan() {
-		return orderPelayanan;
-	}
-
-	public void setOrderPelayanan(OrderPelayananVO orderPelayanan) {
-		this.orderPelayanan = orderPelayanan;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OrderPemakaianRuangRapatVO.java

@@ -1,50 +1,20 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class OrderPemakaianRuangRapatVO extends BaseTransactionVO {
 
-	private static final long serialVersionUID = 3808124027307193872L;
-
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "ObjectStrukOrderFk")
 	@Caption(value = "strukOrder")
 	private StrukOrderVO strukOrder;
 
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "ObjectOrderPelayananFk")
 	@Caption(value = "orderPelayanan")
 	private OrderPelayananVO orderPelayanan;
-	
+
 	private String noRecStrukOrder;
-	
-	public String getNoRecStrukOrder() {
-		return noRecStrukOrder;
-	}
-
-	public void setNoRecStrukOrder(String noRecStrukOrder) {
-		this.noRecStrukOrder = noRecStrukOrder;
-	}
-
-	public StrukOrderVO getStrukOrder() {
-		return strukOrder;
-	}
-
-	public void setStrukOrder(StrukOrderVO strukOrder) {
-		this.strukOrder = strukOrder;
-	}
-
-	public OrderPelayananVO getOrderPelayanan() {
-		return orderPelayanan;
-	}
-
-	public void setOrderPelayanan(OrderPelayananVO orderPelayanan) {
-		this.orderPelayanan = orderPelayanan;
-	}
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OrderProdukGiziVO.java

@@ -1,177 +1,54 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.ArrayList;
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.Date;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
-import javax.persistence.*;
-
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import javax.validation.constraints.NotNull;
-import com.jasamedika.medifirst2000.helper.Caption;
 
 /**
  * class OrderProdukVOVO
  * 
  * @author Generator
  */
- 
+@Getter
+@Setter
 public class OrderProdukGiziVO extends BaseTransactionVO {
-	@ManyToOne
+
-	@JoinColumn(name = "AntrianPasienDiPeriksaFk")
 	@Caption(value = "AntrianPasienDiPeriksa")
 	private AntrianPasienDiPeriksaVO antrianPasienDiPeriksa;
 
-	@ManyToOne
-	@JoinColumn(name = "RuanganFk")
 	@Caption(value = "Ruangan")
 	private RuanganVO ruanganAsal;
 
-	@ManyToOne
-	@JoinColumn(name = "StrukOrderFk")
 	@Caption(value = "Struk Order")
 	private StrukOrderVO strukOrder;
 
-	@ManyToOne
-	@JoinColumn(name = "OrderPelayananFk")
 	@Caption(value = "Order Pelayanan")
 	private OrderPelayananVO orderPelayanan;
 
-	@Column(name = "keteranganOrder")	
 	@Caption(value = "keteranganOrder")
 	private String keteranganOrder;
-	
+
-	@ManyToOne
-	@JoinColumn(name = "siklusGiziFk")
 	@Caption(value = "siklusGizi")
 	private SiklusGiziVO siklusGizi;
-	
-	@OneToMany
-	private Set<SiklusGiziVO> menuTambahan=new HashSet<SiklusGiziVO>();
 
-	@OneToMany
+	private Set<SiklusGiziVO> menuTambahan = new HashSet<>();
-	private Set<AntrianPasienDiPeriksaVO> antrianPasien=new HashSet<AntrianPasienDiPeriksaVO>();
 
-	@OneToMany
+	private Set<AntrianPasienDiPeriksaVO> antrianPasien = new HashSet<>();
-	private Set<ProdukVO> produks=new HashSet<ProdukVO>();
 
-	@OneToMany
+	private Set<ProdukVO> produks = new HashSet<>();
-	private Set<StrukOrderVO> strukOrders=new HashSet<StrukOrderVO>();
 
-	@OneToMany
+	private Set<StrukOrderVO> strukOrders = new HashSet<>();
-	private Set<ProdukVO> produkBahans=new HashSet<ProdukVO>();
 
-	@OneToMany
+	private Set<ProdukVO> produkBahans = new HashSet<>();
-	private Set<OrderPelayananVO> orderPelayanans=new HashSet<OrderPelayananVO>();
+
+	private Set<OrderPelayananVO> orderPelayanans = new HashSet<>();
 
-	@Column(name = "tanggalPelayanan")	
 	@Caption(value = "tanggalPelayanan")
 	private Date tanggalPelayanan;
 
-	public String getKeteranganOrder() {
-		return keteranganOrder;
-	}
-
-	public void setKeteranganOrder(String keteranganOrder) {
-		this.keteranganOrder = keteranganOrder;
-	}
-
-	public RuanganVO getRuanganAsal() {
-		return ruanganAsal;
-	}
-
-	public void setRuanganAsal(RuanganVO ruanganAsal) {
-		this.ruanganAsal = ruanganAsal;
-	}
-
-	public StrukOrderVO getStrukOrder() {
-		return strukOrder;
-	}
-
-	public void setStrukOrder(StrukOrderVO strukOrder) {
-		this.strukOrder = strukOrder;
-	}
-
-	public OrderPelayananVO getOrderPelayanan() {
-		return orderPelayanan;
-	}
-
-	public void setOrderPelayanan(OrderPelayananVO orderPelayanan) {
-		this.orderPelayanan = orderPelayanan;
-	}
-
-	public AntrianPasienDiPeriksaVO getAntrianPasienDiPeriksa() {
-		return antrianPasienDiPeriksa;
-	}
-
-	public void setAntrianPasienDiPeriksa(AntrianPasienDiPeriksaVO antrianPasienDiPeriksa) {
-		this.antrianPasienDiPeriksa = antrianPasienDiPeriksa;
-	}
-
-	public SiklusGiziVO getSiklusGizi() {
-		return siklusGizi;
-	}
-
-	public void setSiklusGizi(SiklusGiziVO siklusGizi) {
-		this.siklusGizi = siklusGizi;
-	}
-
-	public Set<SiklusGiziVO> getMenuTambahan() {
-		return menuTambahan;
-	}
-
-	public void setMenuTambahan(Set<SiklusGiziVO> menuTambahan) {
-		this.menuTambahan = menuTambahan;
-	}
-
-	public Set<AntrianPasienDiPeriksaVO> getAntrianPasien() {
-		return antrianPasien;
-	}
-
-	public void setAntrianPasien(Set<AntrianPasienDiPeriksaVO> antrianPasien) {
-		this.antrianPasien = antrianPasien;
-	}
-
-	public Date getTanggalPelayanan() {
-		return tanggalPelayanan;
-	}
-
-	public void setTanggalPelayanan(Date tanggalPelayanan) {
-		this.tanggalPelayanan = tanggalPelayanan;
-	}
-
-	public Set<ProdukVO> getProduks() {
-		return produks;
-	}
-
-	public void setProduks(Set<ProdukVO> produks) {
-		this.produks = produks;
-	}
-
-	public Set<StrukOrderVO> getStrukOrders() {
-		return strukOrders;
-	}
-
-	public void setStrukOrders(Set<StrukOrderVO> strukOrders) {
-		this.strukOrders = strukOrders;
-	}
-
-	public Set<ProdukVO> getProdukBahans() {
-		return produkBahans;
-	}
-
-	public void setProdukBahans(Set<ProdukVO> produkBahans) {
-		this.produkBahans = produkBahans;
-	}
-
-	public Set<OrderPelayananVO> getOrderPelayanans() {
-		return orderPelayanans;
-	}
-
-	public void setOrderPelayanans(Set<OrderPelayananVO> orderPelayanans) {
-		this.orderPelayanans = orderPelayanans;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OrderProdukVO.java

@@ -1,85 +1,35 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
 import java.util.HashSet;
 import java.util.Set;
-import javax.persistence.*;
-
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import javax.validation.constraints.NotNull;
-import com.jasamedika.medifirst2000.helper.Caption;
 
 /**
  * class OrderProdukVOVO
  * 
  * @author Generator
  */
- 
+@Getter
+@Setter
 public class OrderProdukVO extends MedicalRecordTransactionVO {
+
 	private String keteranganOrder;
-	
-	
-	//@JsonBackReference
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "orderProduk")
-	private Set<DetailOrderTindakanVO> orderTindakan = new HashSet<DetailOrderTindakanVO>();
 
-	public Set<DetailOrderTindakanVO> getOrderTindakan() {
+	private Set<DetailOrderTindakanVO> orderTindakan = new HashSet<>();
-		return orderTindakan;
-	}
 
-	public void setOrderTindakan(Set<DetailOrderTindakanVO> orderTindakan) {
-		this.orderTindakan = orderTindakan;
-	}
-	@ManyToOne
-	@JoinColumn(name = "RuanganFk")
 	@Caption(value = "Ruangan")
 	private RuanganVO ruangan;
-	public RuanganVO getRuangan() {
-		return ruangan;
-	}
 
-	public void setRuangan(RuanganVO ruangan) {
-		this.ruangan = ruangan;
-	}
-	@ManyToOne
-	@JoinColumn(name = "StrukOrderFk")
 	@NotNull(message = "Struk Order Harus Diisi")
 	@Caption(value = "Struk Order")
 	private StrukOrderVO strukOrder;
 
-	public StrukOrderVO getStrukOrder() {
-		return strukOrder;
-	}
-
-	public void setStrukOrder(StrukOrderVO strukOrder) {
-		this.strukOrder = strukOrder;
-	}
-
-	public DetailRadiologiVO getDetailRadiologi() {
-		return detailRadiologi;
-	}
-
-	public void setDetailRadiologi(DetailRadiologiVO detailRadiologi) {
-		this.detailRadiologi = detailRadiologi;
-	}
-
-	public String getKeteranganOrder() {
-		return keteranganOrder;
-	}
-
-	public void setKeteranganOrder(String keteranganOrder) {
-		this.keteranganOrder = keteranganOrder;
-	}
-
-	@Column(name = "StrukOrderFk", insertable = false, updatable = false)
 	private String strukOrderId;
-	
+
-	
-	
 	private DetailRadiologiVO detailRadiologi;
 
-	
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OrderRadiologiVO.java

@@ -1,188 +1,63 @@
 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.ArrayList;
 import java.util.List;
 
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+@Getter
-import com.jasamedika.medifirst2000.helper.Caption;
+@Setter
+public class OrderRadiologiVO extends BaseTransactionVO {
 
-public class OrderRadiologiVO extends BaseTransactionVO{
+	@Caption(value = "Pasien")
-	
-	@Caption(value="Pasien")
 	private PasienVO pasien;
-	
+
-	@Caption(value="Ruangan")
+	@Caption(value = "Ruangan")
 	private RuanganVO ruangan;
-	
+
-	@Caption(value="Asal Rujukan")
+	@Caption(value = "Asal Rujukan")
 	private AsalRujukanVO asalRujukan;
-	
+
-	@Caption(value="Pasien Daftar")
+	@Caption(value = "Pasien Daftar")
 	private PasienDaftarVO pasienDaftar;
-	
+
-	@Caption(value="Struk Order")
+	@Caption(value = "Struk Order")
 	private StrukOrderVO strukOrder;
-	
+
-	@Caption(value="Produk")
+	@Caption(value = "Produk")
 	private List<ProdukVO> produk = new ArrayList<>();
-	
+
-	@Caption(value="Dokter Radilogi")
+	@Caption(value = "Dokter Radilogi")
 	private PegawaiVO dokterRadilogi;
-	
+
-	@Caption(value="Dokter Order")
+	@Caption(value = "Dokter Order")
 	private PegawaiVO dokterOrder;
-	
+
-	@Caption(value="Pegawai Verifikasi")
+	@Caption(value = "Pegawai Verifikasi")
 	private PegawaiVO pegawaiVerifikasi;
-	
+
-	@Caption(value="Ruangan Pengirim")
+	@Caption(value = "Ruangan Pengirim")
 	private RuanganVO ruanganPengirim;
-	
+
-	@Caption(value="Diagnosa")
+	@Caption(value = "Diagnosa")
 	private DiagnosaVO diagnosa;
-	
+
-	@Caption(value="Kelompok Pasien")
+	@Caption(value = "Kelompok Pasien")
 	private KelompokPasienVO kelompokPasienVO;
-	
+
-	@Caption(value="Hasil Pemeriksaan")
+	@Caption(value = "Hasil Pemeriksaan")
-	List<HasilPemeriksaanVO> hasilPemeriksaan = new ArrayList<>();
+	private List<HasilPemeriksaanVO> hasilPemeriksaan = new ArrayList<>();
-	
+
-	@Caption(value="No Order")
+	@Caption(value = "No Order")
 	private String noOrder;
-	
+
-	@Caption(value="NoRec Pelayanan")
+	@Caption(value = "NoRec Pelayanan")
 	private String noRecPelayanan;
-	
+
-	@Caption(value="noRecAntrian")
+	@Caption(value = "noRecAntrian")
 	private String noRecAntrian;
 
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public RuanganVO getRuangan() {
-		return ruangan;
-	}
-
-	public void setRuangan(RuanganVO ruangan) {
-		this.ruangan = ruangan;
-	}
-
-	public AsalRujukanVO getAsalRujukan() {
-		return asalRujukan;
-	}
-
-	public void setAsalRujukan(AsalRujukanVO asalRujukan) {
-		this.asalRujukan = asalRujukan;
-	}
-
-	public PasienDaftarVO getPasienDaftar() {
-		return pasienDaftar;
-	}
-
-	public void setPasienDaftar(PasienDaftarVO pasienDaftar) {
-		this.pasienDaftar = pasienDaftar;
-	}
-
-	public StrukOrderVO getStrukOrder() {
-		return strukOrder;
-	}
-
-	public void setStrukOrder(StrukOrderVO strukOrder) {
-		this.strukOrder = strukOrder;
-	}
-
-	public List<ProdukVO> getProduk() {
-		return produk;
-	}
-
-	public void setProduk(List<ProdukVO> produk) {
-		this.produk = produk;
-	}
-
-	public PegawaiVO getDokterRadilogi() {
-		return dokterRadilogi;
-	}
-
-	public void setDokterRadilogi(PegawaiVO dokterRadilogi) {
-		this.dokterRadilogi = dokterRadilogi;
-	}
-
-	public PegawaiVO getDokterOrder() {
-		return dokterOrder;
-	}
-
-	public void setDokterOrder(PegawaiVO dokterOrder) {
-		this.dokterOrder = dokterOrder;
-	}
-
-	public PegawaiVO getPegawaiVerifikasi() {
-		return pegawaiVerifikasi;
-	}
-
-	public void setPegawaiVerifikasi(PegawaiVO pegawaiVerifikasi) {
-		this.pegawaiVerifikasi = pegawaiVerifikasi;
-	}
-
-	public RuanganVO getRuanganPengirim() {
-		return ruanganPengirim;
-	}
-
-	public void setRuanganPengirim(RuanganVO ruanganPengirim) {
-		this.ruanganPengirim = ruanganPengirim;
-	}
-
-	public DiagnosaVO getDiagnosa() {
-		return diagnosa;
-	}
-
-	public void setDiagnosa(DiagnosaVO diagnosa) {
-		this.diagnosa = diagnosa;
-	}
-
-	public KelompokPasienVO getKelompokPasienVO() {
-		return kelompokPasienVO;
-	}
-
-	public void setKelompokPasienVO(KelompokPasienVO kelompokPasienVO) {
-		this.kelompokPasienVO = kelompokPasienVO;
-	}
-
-	public List<HasilPemeriksaanVO> getHasilPemeriksaan() {
-		return hasilPemeriksaan;
-	}
-
-	public void setHasilPemeriksaan(List<HasilPemeriksaanVO> hasilPemeriksaan) {
-		this.hasilPemeriksaan = hasilPemeriksaan;
-	}
-
-	public String getNoOrder() {
-		return noOrder;
-	}
-
-	public void setNoOrder(String noOrder) {
-		this.noOrder = noOrder;
-	}
-
-	public String getNoRecPelayanan() {
-		return noRecPelayanan;
-	}
-
-	public void setNoRecPelayanan(String noRecPelayanan) {
-		this.noRecPelayanan = noRecPelayanan;
-	}
-
-	public String getNoRecAntrian() {
-		return noRecAntrian;
-	}
-
-	public void setNoRecAntrian(String noRecAntrian) {
-		this.noRecAntrian = noRecAntrian;
-	}
-
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OrderTpnVO.java

@@ -1,30 +1,23 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
 
 /**
- *  class AkibatHaid
+ * class AkibatHaid
  * 
  * @author Generator
  */
+@Getter
+@Setter
 public class OrderTpnVO extends BaseMasterVO {
-	@NotNull(message="Name tidak boleh kosong")
+
-	@Column(name = "Name", nullable = false, length = 100)
+	@NotNull(message = "Name tidak boleh kosong")
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
+
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/OutputVO.java

@@ -1,48 +1,26 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class OutputVO extends BaseMasterVO{
+import javax.validation.constraints.NotNull;
-	
+
-	@NotNull(message="Output tidak boleh kosong")
+@Getter
+@Setter
+public class OutputVO extends BaseMasterVO {
+
+	@NotNull(message = "Output tidak boleh kosong")
 	@Caption(value = "Output")
 	private String namaOutput;
-	
+
-	@NotNull(message = "Kode Output tidak boleh kosong") 
+	@NotNull(message = "Kode Output tidak boleh kosong")
 	@Caption(value = "Kode Output")
 	private String kodeOutput;
-	
+
-	@NotNull(message = "Keterangan tidak boleh kosong") 
+	@NotNull(message = "Keterangan tidak boleh kosong")
 	@Caption(value = "Keterangan")
 	private String ketOutput;
 
-	public String getNamaOutput() {
-		return namaOutput;
-	}
-
-	public void setNamaOutput(String namaOutput) {
-		this.namaOutput = namaOutput;
-	}
-
-	public String getKodeOutput() {
-		return kodeOutput;
-	}
-
-	public void setKodeOutput(String kodeOutput) {
-		this.kodeOutput = kodeOutput;
-	}
-
-	public String getKetOutput() {
-		return ketOutput;
-	}
-
-	public void setKetOutput(String ketOutput) {
-		this.ketOutput = ketOutput;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PMAnamnesisUmumVO.java

@@ -1,76 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class PMAnamnesisUmumVO extends BaseTransactionVO {
-	/**
-	 * @author Shakato
-	 */
-	private static final long serialVersionUID = 1L;
 
-	@Column(name = "inputanSuster", nullable = true)
 	@Caption(value = "inputanSuster")
 	private String inputanSuster;
-	
+
-	@Column(name = "inputanDokter", nullable = true)
 	@Caption(value = "inputanDokter")
 	private String inputanDokter;
-	
+
-	@Column(name = "riwayatPenyakit", nullable = true)
 	@Caption(value = "riwayatPenyakit")
 	private String riwayatPenyakit;
-	
+
-	@Column(name = "riwayatPengobatanYangDiterima", nullable = true)
 	@Caption(value = "riwayatPengobatanYangDiterima")
 	private String riwayatPengobatanYangDiterima;
 
-	public String getInputanSuster() {
-		return inputanSuster;
-	}
-
-	public void setInputanSuster(String inputanSuster) {
-		this.inputanSuster = inputanSuster;
-	}
-
-	public String getInputanDokter() {
-		return inputanDokter;
-	}
-
-	public void setInputanDokter(String inputanDokter) {
-		this.inputanDokter = inputanDokter;
-	}
-
-	public String getRiwayatPenyakit() {
-		return riwayatPenyakit;
-	}
-
-	public void setRiwayatPenyakit(String riwayatPenyakit) {
-		this.riwayatPenyakit = riwayatPenyakit;
-	}
-
-	public String getRiwayatPengobatanYangDiterima() {
-		return riwayatPengobatanYangDiterima;
-	}
-
-	public void setRiwayatPengobatanYangDiterima(String riwayatPengobatanYangDiterima) {
-		this.riwayatPengobatanYangDiterima = riwayatPengobatanYangDiterima;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PajakVO.java

@@ -1,92 +1,34 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.io.Serializable;
-import javax.persistence.*;
-import java.util.Date;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
- *  class Pajak
+ * class Pajak
  * 
  * @author Generator
  */
-//@Entity
+@Getter
-//@Table(name = "Pajak_M")
+@Setter
 public class PajakVO extends BaseMasterVO {
-	@Caption(value="Deskripsi")
+
+	@Caption(value = "Deskripsi")
 	private String deskripsi;
 
-	public void setDeskripsi(String deskripsi) {
+	@Caption(value = "Object Jenis Pajak")
-		this.deskripsi = deskripsi;
-	}
-
-	@Column(name = "Deskripsi", nullable = false , length = 300)
-	public String getDeskripsi(){
-		return this.deskripsi;
-	}
-
-	@ManyToOne
-	@JoinColumn(name = "ObjectJenisPajakFk")
-	@Caption(value="Object Jenis Pajak")
 	private JenisPajakVO jenisPajak;
 
-	public void setJenisPajak(JenisPajakVO jenisPajak) {
-		this.jenisPajak = jenisPajak;
-	}
-
-	@Column(name = "KdJenisPajak", nullable = true )
-	public JenisPajakVO getJenisPajak(){
-		return this.jenisPajak;
-	}
-
-	@Column(name = "ObjectJenisPajakFk", insertable=false,updatable=false)
 	private Integer jenisPajakId;
 
-	@Caption(value="Kode Pajak")
+	@Caption(value = "Kode Pajak")
 	private Byte kdPajak;
 
-	public void setKdPajak(Byte kdPajak) {
+	@Caption(value = "Pajak")
-		this.kdPajak = kdPajak;
-	}
-
-	@Column(name = "KdPajak", nullable = false )
-	public Byte getKdPajak(){
-		return this.kdPajak;
-	}
-
-	@Caption(value="Pajak")
 	private String pajak;
 
-	public void setPajak(String pajak) {
+	@Caption(value = "QPajak")
-		this.pajak = pajak;
-	}
-
-	@Column(name = "Pajak", nullable = false , length = 50)
-	public String getPajak(){
-		return this.pajak;
-	}
-
-	@Caption(value="QPajak")
 	private Byte qPajak;
 
-	public void setqPajak(Byte qPajak) {
-		this.qPajak = qPajak;
-	}
-
-	@Column(name = "QPajak", nullable = false )
-	public Byte getqPajak(){
-		return this.qPajak;
-	}
-
-
 }
-

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PaketKunjunganPasienVO.java

@@ -1,99 +1,43 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
-import javax.persistence.FetchType;
-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;
 
-public class PaketKunjunganPasienVO extends BaseTransactionVO{
+import javax.validation.constraints.NotNull;
+import java.util.Date;
 
-	@ManyToOne(fetch=FetchType.LAZY)
+@Getter
-	@NotNull(message="Object Paket Harus Diisi")
+@Setter
-	@Caption(value="Object Paket")
+public class PaketKunjunganPasienVO extends BaseTransactionVO {
+
+	@NotNull(message = "Object Paket Harus Diisi")
+	@Caption(value = "Object Paket")
 	private PaketVO paket;
 
-	@ManyToOne(fetch=FetchType.LAZY)
+	@NotNull(message = "No C M Harus Diisi")
-	@NotNull(message="No C M Harus Diisi")
+	@Caption(value = "No C M")
-	@Caption(value="No C M")
 	private PasienVO pasien;
 
-	@Caption(value="No Paket")
+	@Caption(value = "No Paket")
-	@NotNull(message="No Paket Harus Diisi")
+	@NotNull(message = "No Paket Harus Diisi")
 	private String noPaket;
 
-	@Caption(value="Qty Kunjungan Ke")
+	@Caption(value = "Qty Kunjungan Ke")
-	@NotNull(message="Qty Kunjungan Ke Harus Diisi")
+	@NotNull(message = "Qty Kunjungan Ke Harus Diisi")
 	private Byte qtyKunjunganKe;
 
-	@Caption(value="Qty Maks Kunjungan")
+	@Caption(value = "Qty Maks Kunjungan")
-	@NotNull(message="Qty Maks Kunjungan Harus Diisi")
+	@NotNull(message = "Qty Maks Kunjungan Harus Diisi")
 	private Byte qtyMaksKunjungan;
 
-	@Caption(value="Tanggal Akhir Paket")
+	@Caption(value = "Tanggal Akhir Paket")
-	@NotNull(message="Tanggal Ahir Paket Harus Diisi")
+	@NotNull(message = "Tanggal Ahir Paket Harus Diisi")
 	private Date tglAkhirPaket;
 
-	@Caption(value="Tanggal Mulai Paket")
+	@Caption(value = "Tanggal Mulai Paket")
-	@NotNull(message="Tanggal Mulai Paket Harus Diisi")
+	@NotNull(message = "Tanggal Mulai Paket Harus Diisi")
 	private Date tglMulaiPaket;
 
-	public PaketVO getPaket() {
-		return paket;
-	}
-
-	public void setPaket(PaketVO paket) {
-		this.paket = paket;
-	}
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public String getNoPaket() {
-		return noPaket;
-	}
-
-	public void setNoPaket(String noPaket) {
-		this.noPaket = noPaket;
-	}
-
-	public Byte getQtyKunjunganKe() {
-		return qtyKunjunganKe;
-	}
-
-	public void setQtyKunjunganKe(Byte qtyKunjunganKe) {
-		this.qtyKunjunganKe = qtyKunjunganKe;
-	}
-
-	public Byte getQtyMaksKunjungan() {
-		return qtyMaksKunjungan;
-	}
-
-	public void setQtyMaksKunjungan(Byte qtyMaksKunjungan) {
-		this.qtyMaksKunjungan = qtyMaksKunjungan;
-	}
-
-	public Date getTglAkhirPaket() {
-		return tglAkhirPaket;
-	}
-
-	public void setTglAkhirPaket(Date tglAkhirPaket) {
-		this.tglAkhirPaket = tglAkhirPaket;
-	}
-
-	public Date getTglMulaiPaket() {
-		return tglMulaiPaket;
-	}
-
-	public void setTglMulaiPaket(Date tglMulaiPaket) {
-		this.tglMulaiPaket = tglMulaiPaket;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PaketVO.java

@@ -1,134 +1,41 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.*;
-import java.util.Date;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
 
 /**
- *  class Paket
+ * class Paket
  * 
  * @author Generator
  */
-//@Entity
+@Getter
-//@Table(name = "Paket_M")
+@Setter
 public class PaketVO extends BaseMasterVO {
-	@ManyToOne
+
-	@JoinColumn(name = "ObjectJenisPaketFk")
+	@NotNull(message = "Object Jenis PaketVO Harus Diisi")
-	@NotNull(message="Object Jenis PaketVO Harus Diisi")
+	@Caption(value = "Object Jenis Paket")
-	@Caption(value="Object Jenis Paket")
 	private JenisPaketVO jenisPaket;
 
-	public void setJenisPaket(JenisPaketVO jenisPaket) {
-		this.jenisPaket = jenisPaket;
-	}
-
-	@Column(name = "KdJenisPaket", nullable = false )
-	public JenisPaketVO getJenisPaket(){
-		return this.jenisPaket;
-	}
-
-	@Column(name = "ObjectJenisPaketFk", insertable=false,updatable=false)
 	private Integer jenisPaketId;
 
-	@ManyToOne
+	@Caption(value = "Object Jenis Transaksi")
-	@JoinColumn(name = "ObjectJenisTransaksiFk")
-	@Caption(value="Object Jenis Transaksi")
 	private JenisTransaksiVO jenisTransaksi;
 
-	public void setJenisTransaksi(JenisTransaksiVO jenisTransaksi) {
-		this.jenisTransaksi = jenisTransaksi;
-	}
-
-	@Column(name = "KdJenisTransaksi", nullable = false )
-	public JenisTransaksiVO getJenisTransaksi(){
-		return this.jenisTransaksi;
-	}
-
-	@Column(name = "ObjectJenisTransaksiFk", insertable=false,updatable=false)
 	private Integer jenisTransaksiId;
 
-	@Caption(value="Kode Paket")
+	@Caption(value = "Kode Paket")
 	private Byte kdPaket;
-	
-	public void setKdPaket(Byte kdPaket) {
-		this.kdPaket = kdPaket;
-	}
 
-	@Column(name = "KdPaket", nullable = false )
+	@Caption(value = "Nama Paket")
-	public Byte getKdPaket(){
-		return this.kdPaket;
-	}
-
-	@Caption(value="Nama Paket")
 	private String namaPaket;
 
-	public void setNamaPaket(String namaPaket) {
+	@Caption(value = "QPaket")
-		this.namaPaket = namaPaket;
-	}
-
-	@Column(name = "NamaPaket", nullable = false , length = 50)
-	public String getNamaPaket(){
-		return this.namaPaket;
-	}
-
-	@Caption(value="QPaket")
 	private Byte qPaket;
 
-	public void setqPaket(Byte qPaket) {
-		this.qPaket = qPaket;
-	}
-
-	@Column(name = "QPaket", nullable = false )
-	public Byte getqPaket(){
-		return this.qPaket;
-	}
-	
 	private Double harga;
 
-	public Double getHarga() {
-		return harga;
-	}
-
-	public void setHarga(Double harga) {
-		this.harga = harga;
-	}
-		
-	/*//
-	@OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdpaket")
-	private Set<HargaPaketPenjamin> HargaPaketPenjaminSet = new HashSet<HargaPaketPenjamin>();
-
-	public Set<HargaPaketPenjamin> getHargaPaketPenjaminSet() {
-		return HargaPaketPenjaminSet;
-	}
-
-	public void setHargaPaketPenjaminSet(Set<HargaPaketPenjamin> hargaPaketPenjaminSet) {
-		HargaPaketPenjaminSet = hargaPaketPenjaminSet;
-	}
-	
-
-	//
-	@OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdpaket")
-	private Set<HargaPaketPenjaminLuarPaket> HargaPaketPenjaminLuarPaketSet = new HashSet<HargaPaketPenjaminLuarPaket>();
-
-	public Set<HargaPaketPenjaminLuarPaket> getHargaPaketPenjaminLuarPaketSet() {
-		return HargaPaketPenjaminLuarPaketSet;
-	}
-
-	public void setHargaPaketPenjaminLuarPaketSet(Set<HargaPaketPenjaminLuarPaket> hargaPaketPenjaminLuarPaketSet) {
-		HargaPaketPenjaminLuarPaketSet = hargaPaketPenjaminLuarPaketSet;
-	}*/
 }
-

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PangkatVO.java

@@ -1,98 +1,37 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
- *  class Pangkat
+ * class Pangkat
  * 
  * @author Generator
  */
-//@Entity
+@Getter
-//@Table(name = "Pangkat_M")
+@Setter
 public class PangkatVO extends BaseMasterVO {
-	@ManyToOne
+
-	@JoinColumn(name = "ObjectGolonganPegawaiFk")
+	@Caption(value = "Object Golongan Pegawai")
-	@Caption(value="Object Golongan Pegawai")
 	private GolonganPegawaiVO kdGolonganPegawai;
 
-	public void setGolonganPegawai(GolonganPegawaiVO kdGolonganPegawai) {
-		this.kdGolonganPegawai = kdGolonganPegawai;
-	}
-
-	@Column(name = "KdGolonganPegawai", nullable = true )
-	public GolonganPegawaiVO getGolonganPegawai(){
-		return this.kdGolonganPegawai;
-	}
-
-	@Column(name = "ObjectGolonganPegawaiFk", insertable=false,updatable=false)
 	private Integer golonganPegawaiId;
 
-	@Caption(value="Kode Pangkat")
+	@Caption(value = "Kode Pangkat")
 	private Byte kdPangkat;
 
-	public void setKdPangkat(Byte kdPangkat) {
+	@Caption(value = "Nama Pangkat")
-		this.kdPangkat = kdPangkat;
-	}
-
-	@Column(name = "KdPangkat", nullable = false )
-	public Byte getKdPangkat(){
-		return this.kdPangkat;
-	}
-
-	@Caption(value="Nama Pangkat")
 	private String namaPangkat;
 
-	public void setNamaPangkat(String namaPangkat) {
+	@Caption(value = "No Urut")
-		this.namaPangkat = namaPangkat;
-	}
-
-	@Column(name = "NamaPangkat", nullable = false , length = 30)
-	public String getNamaPangkat(){
-		return this.namaPangkat;
-	}
-
-	@Caption(value="No Urut")
 	private Byte noUrut;
 
-	public void setNoUrut(Byte noUrut) {
+	@Caption(value = "QPangkat")
-		this.noUrut = noUrut;
-	}
-
-	@Column(name = "NoUrut", nullable = false )
-	public Byte getNoUrut(){
-		return this.noUrut;
-	}
-
-	@Caption(value="QPangkat")
 	private Byte qPangkat;
 
-	public void setqPangkat(Byte qPangkat) {
+	@Caption(value = "Ruang")
-		this.qPangkat = qPangkat;
-	}
-
-	@Column(name = "QPangkat", nullable = false )
-	public Byte getqPangkat(){
-		return this.qPangkat;
-	}
-
-	@Caption(value="Ruang")
 	private String ruang;
 
-	public void setRuang(String ruang) {
-		this.ruang = ruang;
-	}
-
-	@Column(name = "Ruang", nullable = true , length = 1)
-	public String getRuang(){
-		return this.ruang;
-	}
-
-
 }
-

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapAlergiVO.java

@@ -1,102 +1,40 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 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;
+
+/**
+ * @author Andri
+ */
+@Getter
+@Setter
 public class PapAlergiVO extends BaseTransactionVO {
 
-	/**
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
-	 * @author Andri
-	 */
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
-
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private AntrianPasienDiPeriksaVO pasienDaftar;	
+	private AntrianPasienDiPeriksaVO pasienDaftar;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectAlergiFk")
 	@NotNull(message = "alergi tidak boleh kosong")
 
 	@Caption(value = "Object alergi")
 	private AlergiVO alergi;
 
 	@NotNull(message = "Keterangan Data tidak boleh kosong")
-	@Column(name = "keteranganData", nullable = false)
 	@Caption(value = "Keterangan Data")
 	private String keteranganData;
 
 	@NotNull(message = "Reaksi tidak boleh kosong")
-	@Column(name = "reaksi", nullable = false)
 	@Caption(value = "Reaksi")
 	private String reaksi;
 
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
-		return registrasiPelayananPasien;
-	}
-
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-
-	public AntrianPasienDiPeriksaVO getPasien() {
-		return pasienDaftar;
-	}
-
-	public void setPasien(AntrianPasienDiPeriksaVO pasien) {
-		this.pasienDaftar = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public AlergiVO getAlergi() {
-		return alergi;
-	}
-
-	public void setAlergi(AlergiVO alergi) {
-		this.alergi = alergi;
-	}
-
-	public String getKeteranganData() {
-		return keteranganData;
-	}
-
-	public void setKeteranganData(String keteranganData) {
-		this.keteranganData = keteranganData;
-	}
-
-	public String getReaksi() {
-		return reaksi;
-	}
-
-	public void setReaksi(String reaksi) {
-		this.reaksi = reaksi;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapBahanRestorasiVO.java

@@ -1,23 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class PapBahanRestorasiVO extends BaseMasterVO{
+import javax.validation.constraints.NotNull;
-	@NotNull(message="Name tidak boleh kosong")
+
-	@Column(name = "Name", nullable = false, length = 100)
+@Getter
+@Setter
+public class PapBahanRestorasiVO extends BaseMasterVO {
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapCatatanVO.java

@@ -1,69 +1,26 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PapCatatanVO extends BaseTransactionVO {
 
-public class PapCatatanVO extends BaseTransactionVO{
-	
 	private Integer id;
-	
+
-	@ManyToOne
 	@Caption(value = "Object antrianPasienDiPeriksa")
 	private AntrianPasienDiPeriksaVO antrianPasienDiPeriksa;
 
-	@ManyToOne
+	@Caption(value = "Object Rujukan")
-	@Caption(value="Object Rujukan")
 	private CatatanVO rujukan;
-	
+
-	@Caption(value="isNilai")
+	@Caption(value = "isNilai")
 	private Boolean isNilai;
 
-	@Caption(value="lainLain")
+	@Caption(value = "lainLain")
 	private String lainLain;
 
-	public AntrianPasienDiPeriksaVO getAntrianPasienDiPeriksa() {
-		return antrianPasienDiPeriksa;
-	}
-
-	public void setAntrianPasienDiPeriksa(AntrianPasienDiPeriksaVO antrianPasienDiPeriksa) {
-		this.antrianPasienDiPeriksa = antrianPasienDiPeriksa;
-	}
-
-	public CatatanVO getRujukan() {
-		return rujukan;
-	}
-
-	public void setRujukan(CatatanVO rujukan) {
-		this.rujukan = rujukan;
-	}
-
-	public Boolean getIsNilai() {
-		return isNilai;
-	}
-
-	public void setIsNilai(Boolean isNilai) {
-		this.isNilai = isNilai;
-	}
-
-	public String getLainLain() {
-		return lainLain;
-	}
-
-	public void setLainLain(String lainLain) {
-		this.lainLain = lainLain;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapDataAplasnasiVO.java

@@ -1,54 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.fasterxml.jackson.annotation.JsonBackReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapDataAplasnasiVO extends BaseTransactionVO {
 
-public class PapDataAplasnasiVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapMataFk")
 	@NotNull(message = "PapMata tidak boleh kosong")
 	private PapMataVO papMata;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectDataAplasnasiFk")
 	@NotNull(message = "DataAplasnasi tidak boleh kosong")
 	private DataAplasnasiVO dataAplasnasi;
-		
+
 	@NotNull(message = "isNilai tidak boleh kosong")
-	@Column(name = "isNilai", nullable = false)
 	@Caption(value = "isNilai")
 	private Boolean isNilai;
 
-	public PapMataVO getPapMata() {
-		return papMata;
-	}
-
-	public void setPapMata(PapMataVO papMata) {
-		this.papMata = papMata;
-	}
-
-	public DataAplasnasiVO getDataAplasnasi() {
-		return dataAplasnasi;
-	}
-
-	public void setDataAplasnasi(DataAplasnasiVO dataAplasnasi) {
-		this.dataAplasnasi = dataAplasnasi;
-	}
-
-	public Boolean getIsNilai() {
-		return isNilai;
-	}
-
-	public void setIsNilai(Boolean isNilai) {
-		this.isNilai = isNilai;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapDataKoreksiVO.java

@@ -1,62 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.fasterxml.jackson.annotation.JsonBackReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapDataKoreksiVO extends BaseTransactionVO {
 
-public class PapDataKoreksiVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapMataFk")
 	@NotNull(message = "PapMata tidak boleh kosong")
 	private PapMataVO papMata;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectDataKoreksiFk")
 	@NotNull(message = "DataKoreksi tidak boleh kosong")
 	private DataKoreksiVO dataKoreksi;
-	
+
-	
 	@NotNull(message = "isNilai tidak boleh kosong")
-	@Column(name = "isNilai", nullable = false)
 	@Caption(value = "isNilai")
 	private Boolean isNilai;
 
-
-	public PapMataVO getPapMata() {
-		return papMata;
-	}
-
-
-	public void setPapMata(PapMataVO papMata) {
-		this.papMata = papMata;
-	}
-
-
-	public DataKoreksiVO getDataKoreksi() {
-		return dataKoreksi;
-	}
-
-
-	public void setDataKoreksi(DataKoreksiVO dataKoreksi) {
-		this.dataKoreksi = dataKoreksi;
-	}
-
-
-	public Boolean getIsNilai() {
-		return isNilai;
-	}
-
-
-	public void setIsNilai(Boolean isNilai) {
-		this.isNilai = isNilai;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapDataTandaVitalVO.java

@@ -1,66 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import javax.persistence.Entity;
+import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.JoinColumn;
+import lombok.Getter;
-import javax.persistence.ManyToOne;
+import lombok.Setter;
-import javax.persistence.Table;
+
 import javax.validation.constraints.NotNull;
 
-import com.fasterxml.jackson.annotation.JsonBackReference;
+@Getter
-import com.jasamedika.medifirst2000.base.BaseTransaction;
+@Setter
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+public class PapDataTandaVitalVO extends BaseTransactionVO {
-import com.jasamedika.medifirst2000.vo.PapGinekologiVO;
-import com.jasamedika.medifirst2000.helper.Caption;
 
-public class PapDataTandaVitalVO extends BaseTransactionVO{
+	private PapTandaVitalVO papTandaVital;
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapTandaVitalFk")
-	private PapTandaVitalVO papTandaVital;	
 
-	@ManyToOne
+	private PapGinekologiVO papGinekologi;
-	@JoinColumn(name = "ObjectPapGinekologiFk")
-	private PapGinekologiVO papGinekologi;	
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectDataTandaVitalFk")
 	@NotNull(message = "DataTandaVital tidak boleh kosong")
-	private DataTandaVitalVO dataTandaVital;	
+	private DataTandaVitalVO dataTandaVital;
-	
+
-	@Column(name = "nilai", nullable = false)
 	@Caption(value = "nilai")
 	private String nilai;
 
-	public PapTandaVitalVO getPapTandaVital() {
-		return papTandaVital;
-	}
-
-	public void setPapTandaVital(PapTandaVitalVO papTandaVital) {
-		this.papTandaVital = papTandaVital;
-	}
-
-	public PapGinekologiVO getPapGinekologi() {
-		return papGinekologi;
-	}
-
-	public void setPapGinekologi(PapGinekologiVO papGinekologi) {
-		this.papGinekologi = papGinekologi;
-	}
-
-	public DataTandaVitalVO getDataTandaVital() {
-		return dataTandaVital;
-	}
-
-	public void setDataTandaVital(DataTandaVitalVO dataTandaVital) {
-		this.dataTandaVital = dataTandaVital;
-	}
-
-	public String getNilai() {
-		return nilai;
-	}
-
-	public void setNilai(String nilai) {
-		this.nilai = nilai;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapDataTonometriVO.java

@@ -1,55 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapDataTonometriVO extends BaseTransactionVO {
 
-public class PapDataTonometriVO extends BaseTransactionVO{
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapMataFk")
 	@NotNull(message = "PapMata tidak boleh kosong")
 	private PapMataVO papMata;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectDataTonometriFk")
 	@NotNull(message = "DataTonometri tidak boleh kosong")
 	private DataTonometriVO dataTonometri;
-	
+
 	@NotNull(message = "isNilai tidak boleh kosong")
-	@Column(name = "isNilai", nullable = false)
 	@Caption(value = "isNilai")
 	private Boolean isNilai;
 
-	public PapMataVO getPapMata() {
-		return papMata;
-	}
-
-	public void setPapMata(PapMataVO papMata) {
-		this.papMata = papMata;
-	}
-
-	public DataTonometriVO getDataTonometri() {
-		return dataTonometri;
-	}
-
-	public void setDataTonometri(DataTonometriVO dataTonometri) {
-		this.dataTonometri = dataTonometri;
-	}
-
-	public Boolean getIsNilai() {
-		return isNilai;
-	}
-
-	public void setIsNilai(Boolean isNilai) {
-		this.isNilai = isNilai;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapDataVisusVO.java

@@ -1,54 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapDataVisusVO extends BaseTransactionVO {
 
-public class PapDataVisusVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapMataFk")
 	@NotNull(message = "PapMata tidak boleh kosong")
 	private PapMataVO papMata;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectDataVisusFk")
 	@NotNull(message = "DataVisus tidak boleh kosong")
-	private DataVisusVO dataVisus;	
+	private DataVisusVO dataVisus;
 
 	@NotNull(message = "isNilai tidak boleh kosong")
-	@Column(name = "isNilai", nullable = false)
 	@Caption(value = "isNilai")
 	private Boolean isNilai;
 
-	public PapMataVO getPapMata() {
-		return papMata;
-	}
-
-	public void setPapMata(PapMataVO papMata) {
-		this.papMata = papMata;
-	}
-
-	public DataVisusVO getDataVisus() {
-		return dataVisus;
-	}
-
-	public void setDataVisus(DataVisusVO dataVisus) {
-		this.dataVisus = dataVisus;
-	}
-
-	public Boolean getIsNilai() {
-		return isNilai;
-	}
-
-	public void setIsNilai(Boolean isNilai) {
-		this.isNilai = isNilai;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapDetailRiwayatImunisasiDasarVO.java

@@ -1,79 +1,29 @@
 package com.jasamedika.medifirst2000.vo;
 
-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;
+
+@Getter
+@Setter
+public class PapDetailRiwayatImunisasiDasarVO extends BaseTransactionVO {
 
- 
-public class PapDetailRiwayatImunisasiDasarVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectPAPriwayatImunisasiDasarFk")
 	@NotNull(message = "paPriwayatImunisasiDasar tidak boleh kosong")
-
 	@Caption(value = "Object paPriwayatImunisasiDasar")
 	private PapRiwayatImunisasiDasarVO paPriwayatImunisasiDasar;
 
-	@Column(name = "ObjectPAPriwayatImunisasiDasarFk", insertable = false, updatable = false, nullable = false)
 	private Integer paPriwayatImunisasiDasarId;
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectImunisasiFk")
-	@NotNull(message = "imunisasi tidak boleh kosong")
 
+	@NotNull(message = "imunisasi tidak boleh kosong")
 	@Caption(value = "Object imunisasi")
 	private GenericViewVO imunisasi;
 
-	@Column(name = "ObjectImunisasiFk", insertable = false, updatable = false, nullable = false)
 	private Integer imunisasiId;
-	
+
-	//@NotNull(message = "keterangan tidak boleh kosong")
-	@Column(name = "keterangan")
 	@Caption(value = "keterangan")
 	private String keterangan;
 
-	public PapRiwayatImunisasiDasarVO getPaPriwayatImunisasiDasar() {
-		return paPriwayatImunisasiDasar;
-	}
-
-	public void setPaPriwayatImunisasiDasar(PapRiwayatImunisasiDasarVO paPriwayatImunisasiDasar) {
-		this.paPriwayatImunisasiDasar = paPriwayatImunisasiDasar;
-	}
-
-	public Integer getPaPriwayatImunisasiDasarId() {
-		return paPriwayatImunisasiDasarId;
-	}
-
-	public void setPaPriwayatImunisasiDasarId(Integer paPriwayatImunisasiDasarId) {
-		this.paPriwayatImunisasiDasarId = paPriwayatImunisasiDasarId;
-	}
-
-	public GenericViewVO getImunisasi() {
-		return imunisasi;
-	}
-
-	public void setImunisasi(GenericViewVO imunisasi) {
-		this.imunisasi = imunisasi;
-	}
-
-	public Integer getImunisasiId() {
-		return imunisasiId;
-	}
-
-	public void setImunisasiId(Integer imunisasiId) {
-		this.imunisasiId = imunisasiId;
-	}
-
-	public String getKeterangan() {
-		return keterangan;
-	}
-
-	public void setKeterangan(String keterangan) {
-		this.keterangan = keterangan;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapDiagnosisPrimerVO.java

@@ -1,65 +1,26 @@
 package com.jasamedika.medifirst2000.vo;
- 
-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;
+
+@Getter
+@Setter
 public class PapDiagnosisPrimerVO extends BaseTransactionVO {
-	@ManyToOne
-	@JoinColumn(name = "ObjectPAPpengkajianMedisFk")
-	@NotNull(message = "PAPpengkajianMedis tidak boleh kosong")
 
+	@NotNull(message = "PAPpengkajianMedis tidak boleh kosong")
 	@Caption(value = "Object PAPpengkajianMedis")
 	private PapPengkajianMedisVO paPpengkajianMedis;
 
-	@Column(name = "ObjectPAPpengkajianMedisFk", insertable = false, updatable = false, nullable = false)
 	private String paPpengkajianMedisId;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectDiagnosaFk")
 	@NotNull(message = "Diagnosa tidak boleh kosong")
-
 	@Caption(value = "Object Diagnosa")
 	private DiagnosaVO diagnosa;
 
-	@Column(name = "ObjectDiagnosaFk", insertable = false, updatable = false, nullable = false)
 	private Integer diagnosaId;
 
-	public PapPengkajianMedisVO getPaPpengkajianMedis() {
-		return paPpengkajianMedis;
-	}
-
-	public void setPaPpengkajianMedis(PapPengkajianMedisVO paPpengkajianMedis) {
-		this.paPpengkajianMedis = paPpengkajianMedis;
-	}
-
-	public String getPaPpengkajianMedisId() {
-		return paPpengkajianMedisId;
-	}
-
-	public void setPaPpengkajianMedisId(String paPpengkajianMedisId) {
-		this.paPpengkajianMedisId = paPpengkajianMedisId;
-	}
-
-	public DiagnosaVO getDiagnosa() {
-		return diagnosa;
-	}
-
-	public void setDiagnosa(DiagnosaVO diagnosa) {
-		this.diagnosa = diagnosa;
-	}
-
-	public Integer getDiagnosaId() {
-		return diagnosaId;
-	}
-
-	public void setDiagnosaId(Integer diagnosaId) {
-		this.diagnosaId = diagnosaId;
-	}
-
- 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapDiagnosisVO.java

@@ -1,87 +1,39 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 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;
+
+/**
+ * @author andri
+ */
+@Getter
+@Setter
+public class PapDiagnosisVO extends BaseTransactionVO {
 
-public class PapDiagnosisVO extends BaseTransactionVO{
-	/**
-	 * @author andri
-	 */
-	@ManyToOne
-	@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
 	@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
 	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
-	
+
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private PasienVO pasien;	
+	private PasienVO pasien;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectDiagnosaFk")
 	@NotNull(message = "Diagnosa tidak boleh kosong")
 	private DiagnosaVO diagnosa;
-	
+
 	@NotNull(message = "Kode ICD tidak boleh kosong")
-	@Column(name = "kodeIcd", nullable = false)
 	@Caption(value = "Kode ICD")
 	private String kodeIcd;
 
 	@NotNull(message = "ICD tidak boleh kosong")
-	@Column(name = "icd", nullable = false)
 	@Caption(value = "ICD")
 	private String icd;
-	
+
-	public Date getTglInput() {
-		return tglInput;
-	}
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-	public String getIcd() {
-		return icd;
-	}
-	public void setIcd(String icd) {
-		this.icd = icd;
-	}
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
-		return registrasiPelayananPasien;
-	}
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-	public PasienVO getPasien() {
-		return pasien;
-	}
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-	public DiagnosaVO getDiagnosa() {
-		return diagnosa;
-	}
-	public void setDiagnosa(DiagnosaVO diagnosa) {
-		this.diagnosa = diagnosa;
-	}
-	public String getKodeIcd() {
-		return kodeIcd;
-	}
-	public void setKodeIcd(String kodeIcd) {
-		this.kodeIcd = kodeIcd;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapGenataliaVO.java

@@ -1,97 +1,38 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 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;
+
+/**
+ * @author andri
+ */
+@Getter
+@Setter
 public class PapGenataliaVO extends BaseTransactionVO {
-	/**
-	 * @author andri
-	 */
-	@ManyToOne
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
 
-	@ManyToOne
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
-	@JoinColumn(name = "ObjectPasienFk")
+
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private PasienVO pasien;	
+	private PasienVO pasien;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
 
 	@NotNull(message = "status tidak boleh kosong")
-	@Column(name = "status", nullable = false)
 	@Caption(value = "status")
 	private String status;
-	
+
 	@NotNull(message = "keterangan tidak boleh kosong")
-	@Column(name = "keterangan", nullable = false)
 	@Caption(value = "keterangan")
 	private String keterangan;
 
-	@Column(name = "isNormal", nullable = false)
 	@Caption(value = "Is Normal")
 	private Boolean isNormal;
 
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
-		return registrasiPelayananPasien;
-	}
-
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public String getKeterangan() {
-		return keterangan;
-	}
-
-	public void setKeterangan(String keterangan) {
-		this.keterangan = keterangan;
-	}
-
-	public Boolean getIsNormal() {
-		return isNormal;
-	}
-
-	public void setIsNormal(Boolean isNormal) {
-		this.isNormal = isNormal;
-	}
-
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapGigiKananDuaVO.java

@@ -1,63 +1,27 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PapGigiKananDuaVO extends BaseTransactionVO {
 
-public class PapGigiKananDuaVO extends BaseTransactionVO{
-	@Column(name = "enamsatu", nullable = true)
 	@Caption(value = "enamsatu")
 	private String enamsatu;
 
-	@Column(name = "enamdua", nullable = true)
 	@Caption(value = "enamdua")
 	private String enamdua;
 
-	@Column(name = "enamtiga", nullable = true)
 	@Caption(value = "enamtiga")
 	private String enamtiga;
 
-	@Column(name = "enamempat", nullable = true)
 	@Caption(value = "enamempat")
 	private String enamempat;
 
-	@Column(name = "enamlima", nullable = true)
 	@Caption(value = "enamlima")
 	private String enamlima;
 
-	public String getEnamsatu() {
-		return enamsatu;
-	}
-	public void setEnamsatu(String enamsatu) {
-		this.enamsatu = enamsatu;
-	}
-	public String getEnamdua() {
-		return enamdua;
-	}
-	public void setEnamdua(String enamdua) {
-		this.enamdua = enamdua;
-	}
-	public String getEnamtiga() {
-		return enamtiga;
-	}
-	public void setEnamtiga(String enamtiga) {
-		this.enamtiga = enamtiga;
-	}
-	public String getEnamempat() {
-		return enamempat;
-	}
-	public void setEnamempat(String enamempat) {
-		this.enamempat = enamempat;
-	}
-	public String getEnamlima() {
-		return enamlima;
-	}
-	public void setEnamlima(String enamlima) {
-		this.enamlima = enamlima;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapGigiKananEmpatVO.java

@@ -1,93 +1,36 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PapGigiKananEmpatVO extends BaseTransactionVO {
 
-public class PapGigiKananEmpatVO extends BaseTransactionVO{
-	@Column(name = "tigasatu", nullable = true)
 	@Caption(value = "tigasatu")
 	private String tigasatu;
 
-	@Column(name = "tigadua", nullable = true)
 	@Caption(value = "tigadua")
 	private String tigadua;
 
-	@Column(name = "tigatiga", nullable = true)
 	@Caption(value = "tigatiga")
 	private String tigatiga;
 
-	@Column(name = "tigaempat", nullable = true)
 	@Caption(value = "tigaempat")
 	private String tigaempat;
 
-	@Column(name = "tigalima", nullable = true)
 	@Caption(value = "tigalima")
 	private String tigalima;
 
-	@Column(name = "tigaenam", nullable = true)
 	@Caption(value = "tigaenam")
 	private String tigaenam;
 
-	@Column(name = "tigatujuh", nullable = true)
 	@Caption(value = "tigatujuh")
 	private String tigatujuh;
 
-	@Column(name = "tigadelapan", nullable = true)
 	@Caption(value = "tigadelapan")
 	private String tigadelapan;
 
-	public String getTigasatu() {
-		return tigasatu;
-	}
-	public void setTigasatu(String tigasatu) {
-		this.tigasatu = tigasatu;
-	}
-	public String getTigadua() {
-		return tigadua;
-	}
-	public void setTigadua(String tigadua) {
-		this.tigadua = tigadua;
-	}
-	public String getTigatiga() {
-		return tigatiga;
-	}
-	public void setTigatiga(String tigatiga) {
-		this.tigatiga = tigatiga;
-	}
-	public String getTigaempat() {
-		return tigaempat;
-	}
-	public void setTigaempat(String tigaempat) {
-		this.tigaempat = tigaempat;
-	}
-	public String getTigalima() {
-		return tigalima;
-	}
-	public void setTigalima(String tigalima) {
-		this.tigalima = tigalima;
-	}
-	public String getTigaenam() {
-		return tigaenam;
-	}
-	public void setTigaenam(String tigaenam) {
-		this.tigaenam = tigaenam;
-	}
-	public String getTigatujuh() {
-		return tigatujuh;
-	}
-	public void setTigatujuh(String tigatujuh) {
-		this.tigatujuh = tigatujuh;
-	}
-	public String getTigadelapan() {
-		return tigadelapan;
-	}
-	public void setTigadelapan(String tigadelapan) {
-		this.tigadelapan = tigadelapan;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapGigiKananSatuVO.java

@@ -1,93 +1,36 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PapGigiKananSatuVO extends BaseTransactionVO {
 
-public class PapGigiKananSatuVO extends BaseTransactionVO{
-	@Column(name = "duasatu", nullable = true)
 	@Caption(value = "duasatu")
 	private String duasatu;
 
-	@Column(name = "duadua", nullable = true)
 	@Caption(value = "duadua")
 	private String duadua;
 
-	@Column(name = "duatiga", nullable = true)
 	@Caption(value = "duatiga")
 	private String duatiga;
 
-	@Column(name = "duaempat", nullable = true)
 	@Caption(value = "duaempat")
 	private String duaempat;
 
-	@Column(name = "dualima", nullable = true)
 	@Caption(value = "dualima")
 	private String dualima;
-	
+
-	@Column(name = "duaenam", nullable = true)
 	@Caption(value = "duaenam")
 	private String duaenam;
 
-	@Column(name = "duatujuh", nullable = true)
 	@Caption(value = "duatujuh")
 	private String duatujuh;
 
-	@Column(name = "duadelapan", nullable = true)
 	@Caption(value = "duadelapan")
 	private String duadelapan;
-	
+
-	public String getDuasatu() {
-		return duasatu;
-	}
-	public void setDuasatu(String duasatu) {
-		this.duasatu = duasatu;
-	}
-	public String getDuadua() {
-		return duadua;
-	}
-	public void setDuadua(String duadua) {
-		this.duadua = duadua;
-	}
-	public String getDuatiga() {
-		return duatiga;
-	}
-	public void setDuatiga(String duatiga) {
-		this.duatiga = duatiga;
-	}
-	public String getDuaempat() {
-		return duaempat;
-	}
-	public void setDuaempat(String duaempat) {
-		this.duaempat = duaempat;
-	}
-	public String getDualima() {
-		return dualima;
-	}
-	public void setDualima(String dualima) {
-		this.dualima = dualima;
-	}
-	public String getDuaenam() {
-		return duaenam;
-	}
-	public void setDuaenam(String duaenam) {
-		this.duaenam = duaenam;
-	}
-	public String getDuatujuh() {
-		return duatujuh;
-	}
-	public void setDuatujuh(String duatujuh) {
-		this.duatujuh = duatujuh;
-	}
-	public String getDuadelapan() {
-		return duadelapan;
-	}
-	public void setDuadelapan(String duadelapan) {
-		this.duadelapan = duadelapan;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapGigiKananTigaVO.java

@@ -1,63 +1,27 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PapGigiKananTigaVO extends BaseTransactionVO {
 
-public class PapGigiKananTigaVO extends BaseTransactionVO{
-	@Column(name = "tujuhsatu", nullable = true)
 	@Caption(value = "tujuhsatu")
 	private String tujuhsatu;
 
-	@Column(name = "tujuhdua", nullable = true)
 	@Caption(value = "tujuhdua")
 	private String tujuhdua;
 
-	@Column(name = "tujuhtiga", nullable = true)
 	@Caption(value = "tujuhtiga")
 	private String tujuhtiga;
 
-	@Column(name = "tujuhempat", nullable = true)
 	@Caption(value = "tujuhempat")
 	private String tujuhempat;
 
-	@Column(name = "tujuhlima", nullable = true)
 	@Caption(value = "tujuhlima")
 	private String tujuhlima;
-	
-	public String getTujuhsatu() {
-		return tujuhsatu;
-	}
-	public void setTujuhsatu(String tujuhsatu) {
-		this.tujuhsatu = tujuhsatu;
-	}
-	public String getTujuhdua() {
-		return tujuhdua;
-	}
-	public void setTujuhdua(String tujuhdua) {
-		this.tujuhdua = tujuhdua;
-	}
-	public String getTujuhtiga() {
-		return tujuhtiga;
-	}
-	public void setTujuhtiga(String tujuhtiga) {
-		this.tujuhtiga = tujuhtiga;
-	}
-	public String getTujuhempat() {
-		return tujuhempat;
-	}
-	public void setTujuhempat(String tujuhempat) {
-		this.tujuhempat = tujuhempat;
-	}
-	public String getTujuhlima() {
-		return tujuhlima;
-	}
-	public void setTujuhlima(String tujuhlima) {
-		this.tujuhlima = tujuhlima;
-	}
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapGigiKiriDuaVO.java

@@ -1,64 +1,27 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class PapGigiKiriDuaVO extends BaseTransactionVO{
+@Getter
+@Setter
+public class PapGigiKiriDuaVO extends BaseTransactionVO {
 
-	@Column(name = "limasatu", nullable = true)
 	@Caption(value = "limasatu")
 	private String limasatu;
-	
+
-	@Column(name = "limadua", nullable = true)
 	@Caption(value = "limadua")
 	private String limadua;
 
-	@Column(name = "limatiga", nullable = true)
 	@Caption(value = "limatiga")
 	private String limatiga;
 
-	@Column(name = "limaempat", nullable = true)
 	@Caption(value = "limaempat")
 	private String limaempat;
 
-	@Column(name = "limalima", nullable = true)
 	@Caption(value = "limalima")
 	private String limalima;
-	
-	public String getLimasatu() {
-		return limasatu;
-	}
-	public void setLimasatu(String limasatu) {
-		this.limasatu = limasatu;
-	}
-	public String getLimadua() {
-		return limadua;
-	}
-	public void setLimadua(String limadua) {
-		this.limadua = limadua;
-	}
-	public String getLimatiga() {
-		return limatiga;
-	}
-	public void setLimatiga(String limatiga) {
-		this.limatiga = limatiga;
-	}
-	public String getLimaempat() {
-		return limaempat;
-	}
-	public void setLimaempat(String limaempat) {
-		this.limaempat = limaempat;
-	}
-	public String getLimalima() {
-		return limalima;
-	}
-	public void setLimalima(String limalima) {
-		this.limalima = limalima;
-	}
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapGigiKiriEmpatVO.java

@@ -1,93 +1,36 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PapGigiKiriEmpatVO extends BaseTransactionVO {
 
-public class PapGigiKiriEmpatVO extends BaseTransactionVO{
-	@Column(name = "empatsatu", nullable = true)
 	@Caption(value = "empatsatu")
 	private String empatsatu;
-	
+
-	@Column(name = "empatdua", nullable = true)
 	@Caption(value = "empatdua")
 	private String empatdua;
-	
+
-	@Column(name = "empattiga", nullable = true)
 	@Caption(value = "empattiga")
 	private String empattiga;
-	
+
-	@Column(name = "empatempat", nullable = true)
 	@Caption(value = "empatempat")
 	private String empatempat;
-	
+
-	@Column(name = "empatlima", nullable = true)
 	@Caption(value = "empatlima")
 	private String empatlima;
-	
+
-	@Column(name = "empatenam", nullable = true)
 	@Caption(value = "empatenam")
 	private String empatenam;
-	
+
-	@Column(name = "empattujuh", nullable = true)
 	@Caption(value = "empattujuh")
 	private String empattujuh;
-	
+
-	@Column(name = "empatdelapan", nullable = true)
 	@Caption(value = "empatdelapan")
 	private String empatdelapan;
-	
+
-	public String getEmpatsatu() {
-		return empatsatu;
-	}
-	public void setEmpatsatu(String empatsatu) {
-		this.empatsatu = empatsatu;
-	}
-	public String getEmpatdua() {
-		return empatdua;
-	}
-	public void setEmpatdua(String empatdua) {
-		this.empatdua = empatdua;
-	}
-	public String getEmpattiga() {
-		return empattiga;
-	}
-	public void setEmpattiga(String empattiga) {
-		this.empattiga = empattiga;
-	}
-	public String getEmpatempat() {
-		return empatempat;
-	}
-	public void setEmpatempat(String empatempat) {
-		this.empatempat = empatempat;
-	}
-	public String getEmpatlima() {
-		return empatlima;
-	}
-	public void setEmpatlima(String empatlima) {
-		this.empatlima = empatlima;
-	}
-	public String getEmpatenam() {
-		return empatenam;
-	}
-	public void setEmpatenam(String empatenam) {
-		this.empatenam = empatenam;
-	}
-	public String getEmpattujuh() {
-		return empattujuh;
-	}
-	public void setEmpattujuh(String empattujuh) {
-		this.empattujuh = empattujuh;
-	}
-	public String getEmpatdelapan() {
-		return empatdelapan;
-	}
-	public void setEmpatdelapan(String empatdelapan) {
-		this.empatdelapan = empatdelapan;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapGigiKiriSatuVO.java

@@ -1,96 +1,36 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class PapGigiKiriSatuVO extends BaseTransactionVO{
+@Getter
+@Setter
+public class PapGigiKiriSatuVO extends BaseTransactionVO {
 
-	@Column(name = "sebelas", nullable = true)
 	@Caption(value = "sebelas")
 	private String sebelas;
 
-	@Column(name = "sebelas", nullable = true)
 	@Caption(value = "sebelas")
 	private String duabelas;
 
-	@Column(name = "tigabelas", nullable = true)
 	@Caption(value = "tigabelas")
 	private String tigabelas;
 
-	@Column(name = "empatbelas", nullable = true)
 	@Caption(value = "empatbelas")
 	private String empatbelas;
 
-	@Column(name = "limabelas", nullable = true)
 	@Caption(value = "limabelas")
 	private String limabelas;
-	
+
-	@Column(name = "enambelas", nullable = true)
 	@Caption(value = "enambelas")
 	private String enambelas;
-	
+
-	@Column(name = "tujuhbelas", nullable = true)
 	@Caption(value = "tujuhbelas")
 	private String tujuhbelas;
-	
+
-	@Column(name = "delapanbelas", nullable = true)
 	@Caption(value = "delapanbelas")
 	private String delapanbelas;
-	
+
-	public String getSebelas() {
-		return sebelas;
-	}
-	public void setSebelas(String sebelas) {
-		this.sebelas = sebelas;
-	}
-	public String getDuabelas() {
-		return duabelas;
-	}
-	public void setDuabelas(String duabelas) {
-		this.duabelas = duabelas;
-	}
-	public String getTigabelas() {
-		return tigabelas;
-	}
-	public void setTigabelas(String tigabelas) {
-		this.tigabelas = tigabelas;
-	}
-	public String getEmpatbelas() {
-		return empatbelas;
-	}
-	public void setEmpatbelas(String empatbelas) {
-		this.empatbelas = empatbelas;
-	}
-	public String getLimabelas() {
-		return limabelas;
-	}
-	public void setLimabelas(String limabelas) {
-		this.limabelas = limabelas;
-	}
-	public String getEnambelas() {
-		return enambelas;
-	}
-	public void setEnambelas(String enambelas) {
-		this.enambelas = enambelas;
-	}
-	public String getTujuhbelas() {
-		return tujuhbelas;
-	}
-	public void setTujuhbelas(String tujuhbelas) {
-		this.tujuhbelas = tujuhbelas;
-	}
-	public String getDelapanbelas() {
-		return delapanbelas;
-	}
-	public void setDelapanbelas(String delapanbelas) {
-		this.delapanbelas = delapanbelas;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapGigiKiriTigaVO.java

@@ -1,63 +1,27 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 public class PapGigiKiriTigaVO extends BaseTransactionVO {
-	@Column(name = "delapansatu", nullable = true)
+
 	@Caption(value = "delapansatu")
 	private String delapansatu;
-	
+
-	@Column(name = "delapandua", nullable = true)
 	@Caption(value = "delapandua")
 	private String delapandua;
-	
+
-	@Column(name = "delapantiga", nullable = true)
 	@Caption(value = "delapantiga")
 	private String delapantiga;
-	
+
-	@Column(name = "delapanempat", nullable = true)
 	@Caption(value = "delapanempat")
 	private String delapanempat;
-	
+
-	@Column(name = "delapanlima", nullable = true)
 	@Caption(value = "delapanlima")
 	private String delapanlima;
-	
+
-	public String getDelapansatu() {
-		return delapansatu;
-	}
-	public void setDelapansatu(String delapansatu) {
-		this.delapansatu = delapansatu;
-	}
-	public String getDelapandua() {
-		return delapandua;
-	}
-	public void setDelapandua(String delapandua) {
-		this.delapandua = delapandua;
-	}
-	public String getDelapantiga() {
-		return delapantiga;
-	}
-	public void setDelapantiga(String delapantiga) {
-		this.delapantiga = delapantiga;
-	}
-	public String getDelapanempat() {
-		return delapanempat;
-	}
-	public void setDelapanempat(String delapanempat) {
-		this.delapanempat = delapanempat;
-	}
-	public String getDelapanlima() {
-		return delapanlima;
-	}
-	public void setDelapanlima(String delapanlima) {
-		this.delapanlima = delapanlima;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapGigiMulutVO.java

@@ -1,215 +1,60 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-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.base.BaseTransaction;
 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;
+
+@Getter
+@Setter
+public class PapGigiMulutVO extends BaseTransactionVO {
+
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
 
-public class PapGigiMulutVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private PasienVO pasien;	
+	private PasienVO pasien;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
-	
+
-	@ManyToOne
-	@JoinColumn(name = "ObjectKeadaanGigiFk")
 	@NotNull(message = "Keadaan Gigi tidak boleh kosong")
 	private PapKeadaanGigiVO papKeadaanGigi;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapGigiKiriSatuFk")
 	@NotNull(message = "PapGigiKiriSatu tidak boleh kosong")
 	private PapGigiKiriSatuVO papGigiKiriSatu;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapGigiKiriDuaFk")
 	@NotNull(message = "PapGigiKiriDua tidak boleh kosong")
 	private PapGigiKiriDuaVO papGigiKiriDua;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapGigiKiriTigaFk")
 	@NotNull(message = "PapGigiKiriTiga tidak boleh kosong")
 	private PapGigiKiriTigaVO papGigiKiriTiga;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapGigiKiriEmpatFk")
 	@NotNull(message = "PapGigiKiriEmpat tidak boleh kosong")
 	private PapGigiKiriEmpatVO papGigiKiriEmpat;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapGigiKananSatuFk")
 	@NotNull(message = "PapGigiKananSatu tidak boleh kosong")
 	private PapGigiKananSatuVO papGigiKananSatu;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapGigiKananDuaFk")
 	@NotNull(message = "PapGigiKananDua tidak boleh kosong")
 	private PapGigiKananDuaVO papGigiKananDua;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapGigiKananTigaFk")
 	@NotNull(message = "PapGigiKananTiga tidak boleh kosong")
 	private PapGigiKananTigaVO papGigiKananTiga;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapGigiKananEmpatFk")
 	@NotNull(message = "PapGigiKananEmpat tidak boleh kosong")
 	private PapGigiKananEmpatVO papGigiKananEmpat;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectBahanRestorasiFk")
 	@NotNull(message = "Bahan Restorasi tidak boleh kosong")
 	private PapBahanRestorasiVO papBahanRestorasi;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectRestorasiFk")
 	@NotNull(message = "Restorasi tidak boleh kosong")
 	private PapRestorasiVO papRestorasi;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectProtesaFk")
 	@NotNull(message = "Protesa tidak boleh kosong")
 	private PapProtesaVO papProtesa;
 
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
-		return registrasiPelayananPasien;
-	}
-
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public PapKeadaanGigiVO getPapKeadaanGigi() {
-		return papKeadaanGigi;
-	}
-
-	public void setPapKeadaanGigi(PapKeadaanGigiVO papKeadaanGigi) {
-		this.papKeadaanGigi = papKeadaanGigi;
-	}
-
-	public PapGigiKiriSatuVO getPapGigiKiriSatu() {
-		return papGigiKiriSatu;
-	}
-
-	public void setPapGigiKiriSatu(PapGigiKiriSatuVO papGigiKiriSatu) {
-		this.papGigiKiriSatu = papGigiKiriSatu;
-	}
-
-	public PapGigiKiriDuaVO getPapGigiKiriDua() {
-		return papGigiKiriDua;
-	}
-
-	public void setPapGigiKiriDua(PapGigiKiriDuaVO papGigiKiriDua) {
-		this.papGigiKiriDua = papGigiKiriDua;
-	}
-
-	public PapGigiKiriTigaVO getPapGigiKiriTiga() {
-		return papGigiKiriTiga;
-	}
-
-	public void setPapGigiKiriTiga(PapGigiKiriTigaVO papGigiKiriTiga) {
-		this.papGigiKiriTiga = papGigiKiriTiga;
-	}
-
-	public PapGigiKiriEmpatVO getPapGigiKiriEmpat() {
-		return papGigiKiriEmpat;
-	}
-
-	public void setPapGigiKiriEmpat(PapGigiKiriEmpatVO papGigiKiriEmpat) {
-		this.papGigiKiriEmpat = papGigiKiriEmpat;
-	}
-
-	public PapGigiKananSatuVO getPapGigiKananSatu() {
-		return papGigiKananSatu;
-	}
-
-	public void setPapGigiKananSatu(PapGigiKananSatuVO papGigiKananSatu) {
-		this.papGigiKananSatu = papGigiKananSatu;
-	}
-
-	public PapGigiKananDuaVO getPapGigiKananDua() {
-		return papGigiKananDua;
-	}
-
-	public void setPapGigiKananDua(PapGigiKananDuaVO papGigiKananDua) {
-		this.papGigiKananDua = papGigiKananDua;
-	}
-
-	public PapGigiKananTigaVO getPapGigiKananTiga() {
-		return papGigiKananTiga;
-	}
-
-	public void setPapGigiKananTiga(PapGigiKananTigaVO papGigiKananTiga) {
-		this.papGigiKananTiga = papGigiKananTiga;
-	}
-
-	public PapGigiKananEmpatVO getPapGigiKananEmpat() {
-		return papGigiKananEmpat;
-	}
-
-	public void setPapGigiKananEmpat(PapGigiKananEmpatVO papGigiKananEmpat) {
-		this.papGigiKananEmpat = papGigiKananEmpat;
-	}
-
-	public PapBahanRestorasiVO getPapBahanRestorasi() {
-		return papBahanRestorasi;
-	}
-
-	public void setPapBahanRestorasi(PapBahanRestorasiVO papBahanRestorasi) {
-		this.papBahanRestorasi = papBahanRestorasi;
-	}
-
-	public PapRestorasiVO getPapRestorasi() {
-		return papRestorasi;
-	}
-
-	public void setPapRestorasi(PapRestorasiVO papRestorasi) {
-		this.papRestorasi = papRestorasi;
-	}
-
-	public PapProtesaVO getPapProtesa() {
-		return papProtesa;
-	}
-
-	public void setPapProtesa(PapProtesaVO papProtesa) {
-		this.papProtesa = papProtesa;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapInstruksiPulangVO.java

@@ -1,132 +1,42 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class PapInstruksiPulangVO extends BaseTransactionVO{
+import javax.validation.constraints.NotNull;
-	@ManyToOne
+import java.util.Date;
-	@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
+
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
+@Getter
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
+@Setter
+public class PapInstruksiPulangVO extends BaseTransactionVO {
+
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private PasienVO pasien;	
+	private PasienVO pasien;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
 
-	@Column(name = "tglKeluar", nullable = true)
+	@Caption(value = "Tgl Keluar")
-	@Caption(value="Tgl Keluar")
 	private Date tglKeluar;
-	
+
-	@ManyToOne
+	@Caption(value = "Object Kondisi Pasien")
-	@JoinColumn(name = "ObjectKondisiPasienFk")
-	@Caption(value="Object Kondisi Pasien")
 	private KondisiPasienVO kondisiPasien;
-	
+
-	@ManyToOne
+	@Caption(value = "Object Status Keluar")
-	@JoinColumn(name = "ObjectStatusKeluarFk")
-	@Caption(value="Object Status Keluar")
 	private StatusKeluarVO statusKeluar;
-	
+
-	@ManyToOne
+	@Caption(value = "Object Status Pulang")
-	@JoinColumn(name = "ObjectStatusPulangFk")
-	@Caption(value="Object Status Pulang")
 	private StatusPulangVO statusPulang;
-	
+
-	@ManyToOne
+	@Caption(value = "Object Hubungan Keluarga")
-	@JoinColumn(name = "ObjectHubunganKeluargaFk")
-	@Caption(value="Object Hubungan Keluarga")
 	private HubunganKeluargaVO hubunganKeluarga;
-		
+
-	@Column(name = "namaPembawaPulang", nullable = true)
+	@Caption(value = "Nama Pembawa Pulang")
-	@Caption(value="Nama Pembawa Pulang")
 	private String namaPembawaPulang;
 
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
-		return registrasiPelayananPasien;
-	}
-
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public Date getTglKeluar() {
-		return tglKeluar;
-	}
-
-	public void setTglKeluar(Date tglKeluar) {
-		this.tglKeluar = tglKeluar;
-	}
-
-	public KondisiPasienVO getKondisiPasien() {
-		return kondisiPasien;
-	}
-
-	public void setKondisiPasien(KondisiPasienVO kondisiPasien) {
-		this.kondisiPasien = kondisiPasien;
-	}
-
-	public StatusKeluarVO getStatusKeluar() {
-		return statusKeluar;
-	}
-
-	public void setStatusKeluar(StatusKeluarVO statusKeluar) {
-		this.statusKeluar = statusKeluar;
-	}
-
-	public StatusPulangVO getStatusPulang() {
-		return statusPulang;
-	}
-
-	public void setStatusPulang(StatusPulangVO statusPulang) {
-		this.statusPulang = statusPulang;
-	}
-
-	public HubunganKeluargaVO getHubunganKeluarga() {
-		return hubunganKeluarga;
-	}
-
-	public void setHubunganKeluarga(HubunganKeluargaVO hubunganKeluarga) {
-		this.hubunganKeluarga = hubunganKeluarga;
-	}
-
-	public String getNamaPembawaPulang() {
-		return namaPembawaPulang;
-	}
-
-	public void setNamaPembawaPulang(String namaPembawaPulang) {
-		this.namaPembawaPulang = namaPembawaPulang;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapInstruksiRanapVO.java

@@ -1,227 +1,73 @@
 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.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Column;
+@Getter
-import javax.persistence.Entity;
+@Setter
-import javax.persistence.JoinColumn;
+public class PapInstruksiRanapVO extends BaseTransactionVO {
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseTransaction;
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.helper.Caption;
 
-public class PapInstruksiRanapVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private PasienVO pasien;	
+	private PasienVO pasien;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
 
-	@ManyToOne
+	@Caption(value = "Object kondisiPasien")
-	@JoinColumn(name = "ObjectKondisiPasienFk")
-	@Caption(value="Object kondisiPasien")
 	private GenericViewVO kondisiPasien;
 
-	@ManyToOne
+	@Caption(value = "Object fasilitas")
-	@JoinColumn(name = "ObjectFasilitasFk")
-	@Caption(value="Object fasilitas")
 	private GenericViewVO fasilitas;
 
-	@ManyToOne
+	@Caption(value = "Object tenaga")
-	@JoinColumn(name = "ObjectTenagaFk")
-	@Caption(value="Object tenaga")
 	private GenericViewVO tenaga;
 
 	@NotNull(message = "keterangan tidak boleh kosong")
-	@Column(name = "keterangan")
 	@Caption(value = "keterangan")
 	private String keterangan;
-	
+
 	@NotNull(message = "isKondisiPasien tidak boleh kosong")
-	@Column(name = "isKondisiPasien")
 	@Caption(value = "isKondisiPasien")
 	private Boolean isKondisiPasien;
-	
+
 	@NotNull(message = "isFasilitas tidak boleh kosong")
-	@Column(name = "isFasilitas")
 	@Caption(value = "isFasilitas")
 	private Boolean isFasilitas;
 
 	@NotNull(message = "isTenaga tidak boleh kosong")
-	@Column(name = "isTenaga")
 	@Caption(value = "isTenaga")
 	private Boolean isTenaga;
-	
+
 	@NotNull(message = "isLainLain tidak boleh kosong")
-	@Column(name = "isLainLain")
 	@Caption(value = "isLainLain")
 	private Boolean isLainLain;
-	
+
 	@NotNull(message = "isPasienDiberitahu tidak boleh kosong")
-	@Column(name = "isPasienDiberitahu")
 	@Caption(value = "isPasienDiberitahu")
 	private Boolean isPasienDiberitahu;
-	
+
 	@NotNull(message = "isKeluargaPasienDiberitahu tidak boleh kosong")
-	@Column(name = "isKeluargaPasienDiberitahu")
 	@Caption(value = "isKeluargaPasienDiberitahu")
 	private Boolean isKeluargaPasienDiberitahu;
-	
+
 	@NotNull(message = "namaKeluargaPasien tidak boleh kosong")
-	@Column(name = "namaKeluargaPasien")
 	@Caption(value = "namaKeluargaPasien")
 	private String namaKeluargaPasien;
 
-	@ManyToOne
+	@Caption(value = "Object Kesadaran")
-	@JoinColumn(name = "ObjectKesadaranFk")
-	@Caption(value="Object Kesadaran")
 	private HubunganKeluargaVO hubunganKeluarga;
-	
-	@OneToMany(mappedBy="papInstruksiRanap")
-	@Caption(value="Object PapPetugasPendamping")
-	private Set<PapPetugasPendampingVO> papPetugasPendampingSet=new HashSet<PapPetugasPendampingVO>();
 
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
+	@Caption(value = "Object PapPetugasPendamping")
-		return registrasiPelayananPasien;
+	private Set<PapPetugasPendampingVO> papPetugasPendampingSet = new HashSet<>();
-	}
 
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public GenericViewVO getKondisiPasien() {
-		return kondisiPasien;
-	}
-
-	public void setKondisiPasien(GenericViewVO kondisiPasien) {
-		this.kondisiPasien = kondisiPasien;
-	}
-
-	public GenericViewVO getFasilitas() {
-		return fasilitas;
-	}
-
-	public void setFasilitas(GenericViewVO fasilitas) {
-		this.fasilitas = fasilitas;
-	}
-
-	public GenericViewVO getTenaga() {
-		return tenaga;
-	}
-
-	public void setTenaga(GenericViewVO tenaga) {
-		this.tenaga = tenaga;
-	}
-
-	public String getKeterangan() {
-		return keterangan;
-	}
-
-	public void setKeterangan(String keterangan) {
-		this.keterangan = keterangan;
-	}
-
-	public Boolean getIsKondisiPasien() {
-		return isKondisiPasien;
-	}
-
-	public void setIsKondisiPasien(Boolean isKondisiPasien) {
-		this.isKondisiPasien = isKondisiPasien;
-	}
-
-	public Boolean getIsFasilitas() {
-		return isFasilitas;
-	}
-
-	public void setIsFasilitas(Boolean isFasilitas) {
-		this.isFasilitas = isFasilitas;
-	}
-
-	public Boolean getIsTenaga() {
-		return isTenaga;
-	}
-
-	public void setIsTenaga(Boolean isTenaga) {
-		this.isTenaga = isTenaga;
-	}
-
-	public Boolean getIsLainLain() {
-		return isLainLain;
-	}
-
-	public void setIsLainLain(Boolean isLainLain) {
-		this.isLainLain = isLainLain;
-	}
-
-	public Boolean getIsPasienDiberitahu() {
-		return isPasienDiberitahu;
-	}
-
-	public void setIsPasienDiberitahu(Boolean isPasienDiberitahu) {
-		this.isPasienDiberitahu = isPasienDiberitahu;
-	}
-
-	public Boolean getIsKeluargaPasienDiberitahu() {
-		return isKeluargaPasienDiberitahu;
-	}
-
-	public void setIsKeluargaPasienDiberitahu(Boolean isKeluargaPasienDiberitahu) {
-		this.isKeluargaPasienDiberitahu = isKeluargaPasienDiberitahu;
-	}
-
-	public String getNamaKeluargaPasien() {
-		return namaKeluargaPasien;
-	}
-
-	public void setNamaKeluargaPasien(String namaKeluargaPasien) {
-		this.namaKeluargaPasien = namaKeluargaPasien;
-	}
-
-	public HubunganKeluargaVO getHubunganKeluarga() {
-		return hubunganKeluarga;
-	}
-
-	public void setHubunganKeluarga(HubunganKeluargaVO hubunganKeluarga) {
-		this.hubunganKeluarga = hubunganKeluarga;
-	}
-
-	public Set<PapPetugasPendampingVO> getPapPetugasPendampingSet() {
-		return papPetugasPendampingSet;
-	}
-
-	public void setPapPetugasPendampingSet(Set<PapPetugasPendampingVO> papPetugasPendampingSet) {
-		this.papPetugasPendampingSet = papPetugasPendampingSet;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapJenisDietVO.java

@@ -1,54 +1,23 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseMaster;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapJenisDietVO extends BaseTransactionVO {
 
-public class PapJenisDietVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapAssesmentGiziFk")
 	@NotNull(message = "PapAssesmentGizi tidak boleh kosong")
 	private PapAssesmentGiziVO papAssesmentGizi;
-	
+
-	@ManyToOne
-	@JoinColumn(name = "ObjectJenisDietFk")
 	@NotNull(message = "Jenis Diet tidak boleh kosong")
 	private JenisDietVO jenisDiet;
-	
+
-	@Column(name = "keterangan")
 	@Caption(value = "Keterangan")
 	private String keterangan;
 
-	public PapAssesmentGiziVO getPapAssesmentGizi() {
-		return papAssesmentGizi;
-	}
-
-	public void setPapAssesmentGizi(PapAssesmentGiziVO papAssesmentGizi) {
-		this.papAssesmentGizi = papAssesmentGizi;
-	}
-
-	public JenisDietVO getJenisDiet() {
-		return jenisDiet;
-	}
-
-	public void setJenisDiet(JenisDietVO jenisDiet) {
-		this.jenisDiet = jenisDiet;
-	}
-
-	public String getKeterangan() {
-		return keterangan;
-	}
-
-	public void setKeterangan(String keterangan) {
-		this.keterangan = keterangan;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapJenisObatVO.java

@@ -1,26 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapJenisObatVO extends BaseMasterVO {
 
-public class PapJenisObatVO extends BaseMasterVO{
 	@NotNull(message = "Nama Obat tidak boleh kosong")
-	@Column(name = "namaObat", nullable = false)
 	@Caption(value = "Nama Obat")
 	private String namaObat;
 
-	public String getNamaObat() {
-		return namaObat;
-	}
-
-	public void setNamaObat(String namaObat) {
-		this.namaObat = namaObat;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapKarakteristikNyeriVO.java

@@ -1,56 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapKarakteristikNyeriVO extends BaseTransactionVO {
 
-public class PapKarakteristikNyeriVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObejctPapSkriningNyeriFk")
 	@Caption(value = "Object PapSkriningNyeri")
 	private PapSkriningNyeriVO papSkriningNyeri;
-	
+
-	@ManyToOne
-	@JoinColumn(name = "ObejctRmKarakteristikNyeriFk")
 	@Caption(value = "Object RmKarakteristikNyeri")
 	private DataKarateristikNyeriVO dataKarakteristikNyeri;
 
 	@NotNull(message = "Is Nilai tidak boleh kosong")
-	@Column(name = "isNilai")
 	@Caption(value = "Is Nilai")
 	private Boolean isNilai;
 
-	public PapSkriningNyeriVO getPapSkriningNyeri() {
-		return papSkriningNyeri;
-	}
-
-	public void setPapSkriningNyeri(PapSkriningNyeriVO papSkriningNyeri) {
-		this.papSkriningNyeri = papSkriningNyeri;
-	}
-
-	public DataKarateristikNyeriVO getDataKarakteristikNyeri() {
-		return dataKarakteristikNyeri;
-	}
-
-	public void setDataKarakteristikNyeri(DataKarateristikNyeriVO dataKarakteristikNyeri) {
-		this.dataKarakteristikNyeri = dataKarakteristikNyeri;
-	}
-
-	public Boolean getIsNilai() {
-		return isNilai;
-	}
-
-	public void setIsNilai(Boolean isNilai) {
-		this.isNilai = isNilai;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapKeadaanGigiVO.java

@@ -1,24 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class PapKeadaanGigiVO extends BaseMasterVO{
+import javax.validation.constraints.NotNull;
-	@NotNull(message="Name tidak boleh kosong")
+
-	@Column(name = "Name", nullable = false, length = 100)
+@Getter
+@Setter
+public class PapKeadaanGigiVO extends BaseMasterVO {
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
-
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapKebutuhanEdukasiVO.java

@@ -1,84 +1,31 @@
 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.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
+@Getter
-import javax.persistence.Column;
+@Setter
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.validation.constraints.NotNull;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.helper.Caption;
-
 public class PapKebutuhanEdukasiVO extends BaseTransactionVO {
-	
+
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
 	private AntrianPasienDiPeriksaVO pasien;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
-	
 
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "kebutuhanEdukasi")
+	private Set<PapTransaksiHambatanPembelajaranVO> hambatanPembelajaran = new HashSet<>();
-	private Set<PapTransaksiHambatanPembelajaranVO> hambatanPembelajaran=new HashSet<PapTransaksiHambatanPembelajaranVO>();
+
-	
+	private Set<PapTransaksiEdukasiVO> edukasiYgDiperlukan = new HashSet<>();
 
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "kebutuhanEdukasi")
-	private Set<PapTransaksiEdukasiVO> edukasiYgDiperlukan=new HashSet<PapTransaksiEdukasiVO>();
-	
-	@ManyToOne(fetch=FetchType.LAZY)
 	@Caption(value = "pengkajianAwalBaru")
 	private PengkajianAwalBaruVO pengkajianAwalBaru;
 
-	public AntrianPasienDiPeriksaVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(AntrianPasienDiPeriksaVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public Set<PapTransaksiHambatanPembelajaranVO> getHambatanPembelajaran() {
-		return hambatanPembelajaran;
-	}
-
-	public void setHambatanPembelajaran(Set<PapTransaksiHambatanPembelajaranVO> hambatanPembelajaran) {
-		this.hambatanPembelajaran = hambatanPembelajaran;
-	}
-
-	public Set<PapTransaksiEdukasiVO> getEdukasiYgDiperlukan() {
-		return edukasiYgDiperlukan;
-	}
-
-	public void setEdukasiYgDiperlukan(Set<PapTransaksiEdukasiVO> edukasiYgDiperlukan) {
-		this.edukasiYgDiperlukan = edukasiYgDiperlukan;
-	}
-
-	public PengkajianAwalBaruVO getPengkajianAwalBaru() {
-		return pengkajianAwalBaru;
-	}
-
-	public void setPengkajianAwalBaru(PengkajianAwalBaruVO pengkajianAwalBaru) {
-		this.pengkajianAwalBaru = pengkajianAwalBaru;
-	}
-
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapKeluhanTambahanVO.java

@@ -1,91 +1,36 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
-
-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.Date;
+
+/**
+ * @author andri
+ */
+@Getter
+@Setter
 public class PapKeluhanTambahanVO extends BaseTransactionVO {
 
-	/**
-	 * @author andri
-	 */
-	
 	private Date tglRegistrasi;
-	@ManyToOne
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
 
-	@ManyToOne
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private AntrianPasienDiPeriksaVO pasienDaftar;	
+	private AntrianPasienDiPeriksaVO pasienDaftar;
-	
+
 	@NotNull(message = "Keluhan Tambahan tidak boleh kosong")
-	@Column(name = "keluhanTambahan", nullable = false)
 	@Caption(value = "Keluhan Tambahan")
 	private String keluhanTambahan;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
-	
+
 	@NotNull(message = "Tgl Merasa Keluhan tidak boleh kosong")
-	@Column(name = "tglMerasaKeluhan", nullable = false)
 	@Caption(value = "Tgl Merasa Keluhan")
 	private Date tglMerasaKeluhan;
 
-	public String getKeluhanTambahan() {
-		return keluhanTambahan;
-	}
-
-	public void setKeluhanTambahan(String keluhanTambahan) {
-		this.keluhanTambahan = keluhanTambahan;
-	}
-
-	public Date getTglMerasaKeluhan() {
-		return tglMerasaKeluhan;
-	}
-
-	public void setTglMerasaKeluhan(Date tglMerasaKeluhan) {
-		this.tglMerasaKeluhan = tglMerasaKeluhan;
-	}
-
-	public AntrianPasienDiPeriksaVO getPasien() {
-		return pasienDaftar;
-	}
-
-	public void setPasien(AntrianPasienDiPeriksaVO pasien) {
-		this.pasienDaftar = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
-		return registrasiPelayananPasien;
-	}
-
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-
-	public Date getTglRegistrasi() {
-		return tglRegistrasi;
-	}
-
-	public void setTglRegistrasi(Date tglRegistrasi) {
-		this.tglRegistrasi = tglRegistrasi;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapKeluhanUtamaVO.java

@@ -1,67 +1,28 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
 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;
+
+@Getter
+@Setter
 public class PapKeluhanUtamaVO extends BaseTransactionVO {
 
-	@ManyToOne
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
 
-	@ManyToOne
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private AntrianPasienDiPeriksaVO pasienDaftar;	
+	private AntrianPasienDiPeriksaVO pasienDaftar;
-	
+
 	@NotNull(message = "Keluhan Utama tidak boleh kosong")
-	@Column(name = "keluhan", nullable = false)
 	@Caption(value = "keluhan")
 	private String keluhanUtama;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
-	
-	public String getKeluhanUtama() {
-		return keluhanUtama;
-	}
-
-	public void setKeluhanUtama(String keluhanUtama) {
-		this.keluhanUtama = keluhanUtama;
-	}
-
-	public AntrianPasienDiPeriksaVO getPasien() {
-		return pasienDaftar;
-	}
-
-	public void setPasien(AntrianPasienDiPeriksaVO pasien) {
-		this.pasienDaftar = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
-		return registrasiPelayananPasien;
-	}
-
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapLaboratoriumVO.java

@@ -1,53 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class PapLaboratoriumVO extends BaseTransactionVO{
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapLaboratoriumVO extends BaseTransactionVO {
 
-	@ManyToOne
 	@NotNull(message = "PapGinekologi tidak boleh kosong")
 	private PapGinekologiVO papGinekologi;
-		
+
-	@ManyToOne
 	@NotNull(message = "RmLaboratorium tidak boleh kosong")
 	private GinekologiVO rmLaboratorium;
 
 	@NotNull(message = "Is Nilai tidak boleh kosong")
-	@Column(name = "isNilai")
 	@Caption(value = "Is Nilai")
 	private Boolean isNilai;
 
-	public PapGinekologiVO getPapGinekologi() {
-		return papGinekologi;
-	}
-
-	public void setPapGinekologi(PapGinekologiVO papGinekologi) {
-		this.papGinekologi = papGinekologi;
-	}
-
-	public GinekologiVO getRmLaboratorium() {
-		return rmLaboratorium;
-	}
-
-	public void setRmLaboratorium(GinekologiVO rmLaboratorium) {
-		this.rmLaboratorium = rmLaboratorium;
-	}
-
-	public Boolean getIsNilai() {
-		return isNilai;
-	}
-
-	public void setIsNilai(Boolean isNilai) {
-		this.isNilai = isNilai;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapMasukanDiagnosisVO.java

@@ -1,54 +1,25 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapMasukanDiagnosisVO extends BaseTransactionVO {
 
-public class PapMasukanDiagnosisVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapRencanaTindakanFk")
 	@NotNull(message = "PapRencanaTindakan tidak boleh kosong")
 	private PapRencanaTindakanVO papRencanaTindakan;
-	
+
-	@NotNull(message="namaIcd tidak boleh kosong")
+	@NotNull(message = "namaIcd tidak boleh kosong")
-	@Column(name = "namaIcd", nullable = false )
+	@Caption(value = "Kode Agama")
-	@Caption(value="Kode Agama")
 	private String namaIcd;
-	
+
-	@NotNull(message="kodeIcd tidak boleh kosong")
+	@NotNull(message = "kodeIcd tidak boleh kosong")
-	@Column(name = "kodeIcd", nullable = false )
+	@Caption(value = "kodeIcd")
-	@Caption(value="kodeIcd")
 	private String kodeIcd;
 
-	public PapRencanaTindakanVO getPapRencanaTindakan() {
-		return papRencanaTindakan;
-	}
-
-	public void setPapRencanaTindakan(PapRencanaTindakanVO papRencanaTindakan) {
-		this.papRencanaTindakan = papRencanaTindakan;
-	}
-
-	public String getNamaIcd() {
-		return namaIcd;
-	}
-
-	public void setNamaIcd(String namaIcd) {
-		this.namaIcd = namaIcd;
-	}
-
-	public String getKodeIcd() {
-		return kodeIcd;
-	}
-
-	public void setKodeIcd(String kodeIcd) {
-		this.kodeIcd = kodeIcd;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapMataVO.java

@@ -1,257 +1,64 @@
 package com.jasamedika.medifirst2000.vo;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-public class PapMataVO extends MedicalRecordTransactionVO{	
+@Getter
-	
+@Setter
+public class PapMataVO extends MedicalRecordTransactionVO {
+
 	private Date tglInput;
 
-	private Set<PapKategoriMataVO> kategoriKlinikMataSet=new HashSet<PapKategoriMataVO>();
+	private Set<PapKategoriMataVO> kategoriKlinikMataSet = new HashSet<>();
+
+	private Set<PapDataMataVO> dataKacamataSet = new HashSet<>();
 
-	private Set<PapDataMataVO> dataKacamataSet=new HashSet<PapDataMataVO>();
-	
 	private PegawaiVO dokterKonsulen;
-	
+
 	private Integer dokterKonsulenId;
-	
+
 	private String kedudukanBolaMataOD;
-	
+
 	private String kedudukanBolaMataOS;
-	
+
 	private String visusOD;
-	
+
 	private String visusOS;
-	
+
 	private String koreksiOS;
-	
+
 	private String koreksiOD;
-	
+
 	private String kacamataLamaOD;
-	
+
 	private String kacamataLamaOS;
-	
+
 	private String kacamataLamaBaca;
-	
+
 	private String tonometriOS;
-	
+
 	private String tonometriOD;
-	
+
 	private String aplanasiOD;
-	
+
 	private String aplanasiOS;
-	
+
 	private String anelOS;
-	
+
 	private String anelOD;
-	
+
 	private String sistemLacrimal;
-	
+
 	private String diagnosaKlinik;
-	
+
 	private String kodePenyakit;
-	
+
 	private String pengobatanPoliklinik;
-	
+
 	private String pengobatanDiRumah;
 
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-	public Set<PapKategoriMataVO> getKategoriKlinikMataSet() {
-		return kategoriKlinikMataSet;
-	}
-
-	public void setKategoriKlinikMataSet(Set<PapKategoriMataVO> kategoriKlinikMataSet) {
-		this.kategoriKlinikMataSet = kategoriKlinikMataSet;
-	}
-
-	public Set<PapDataMataVO> getDataKacamataSet() {
-		return dataKacamataSet;
-	}
-
-	public void setDataKacamataSet(Set<PapDataMataVO> dataKacamataSet) {
-		this.dataKacamataSet = dataKacamataSet;
-	}
-
-	public PegawaiVO getDokterKonsulen() {
-		return dokterKonsulen;
-	}
-
-	public void setDokterKonsulen(PegawaiVO dokterKonsulen) {
-		this.dokterKonsulen = dokterKonsulen;
-	}
-
-	public Integer getDokterKonsulenId() {
-		return dokterKonsulenId;
-	}
-
-	public void setDokterKonsulenId(Integer dokterKonsulenId) {
-		this.dokterKonsulenId = dokterKonsulenId;
-	}
-
-	public String getKedudukanBolaMataOD() {
-		return kedudukanBolaMataOD;
-	}
-
-	public void setKedudukanBolaMataOD(String kedudukanBolaMataOD) {
-		this.kedudukanBolaMataOD = kedudukanBolaMataOD;
-	}
-
-	public String getKedudukanBolaMataOS() {
-		return kedudukanBolaMataOS;
-	}
-
-	public void setKedudukanBolaMataOS(String kedudukanBolaMataOS) {
-		this.kedudukanBolaMataOS = kedudukanBolaMataOS;
-	}
-
-	public String getVisusOD() {
-		return visusOD;
-	}
-
-	public void setVisusOD(String visusOD) {
-		this.visusOD = visusOD;
-	}
-
-	public String getVisusOS() {
-		return visusOS;
-	}
-
-	public void setVisusOS(String visusOS) {
-		this.visusOS = visusOS;
-	}
-
-	public String getKoreksiOS() {
-		return koreksiOS;
-	}
-
-	public void setKoreksiOS(String koreksiOS) {
-		this.koreksiOS = koreksiOS;
-	}
-
-	public String getKoreksiOD() {
-		return koreksiOD;
-	}
-
-	public void setKoreksiOD(String koreksiOD) {
-		this.koreksiOD = koreksiOD;
-	}
-
-	public String getKacamataLamaOD() {
-		return kacamataLamaOD;
-	}
-
-	public void setKacamataLamaOD(String kacamataLamaOD) {
-		this.kacamataLamaOD = kacamataLamaOD;
-	}
-
-	public String getKacamataLamaOS() {
-		return kacamataLamaOS;
-	}
-
-	public void setKacamataLamaOS(String kacamataLamaOS) {
-		this.kacamataLamaOS = kacamataLamaOS;
-	}
-
-	public String getKacamataLamaBaca() {
-		return kacamataLamaBaca;
-	}
-
-	public void setKacamataLamaBaca(String kacamataLamaBaca) {
-		this.kacamataLamaBaca = kacamataLamaBaca;
-	}
-
-	public String getTonometriOS() {
-		return tonometriOS;
-	}
-
-	public void setTonometriOS(String tonometriOS) {
-		this.tonometriOS = tonometriOS;
-	}
-
-	public String getTonometriOD() {
-		return tonometriOD;
-	}
-
-	public void setTonometriOD(String tonometriOD) {
-		this.tonometriOD = tonometriOD;
-	}
-
-	public String getAplanasiOD() {
-		return aplanasiOD;
-	}
-
-	public void setAplanasiOD(String aplanasiOD) {
-		this.aplanasiOD = aplanasiOD;
-	}
-
-	public String getAplanasiOS() {
-		return aplanasiOS;
-	}
-
-	public void setAplanasiOS(String aplanasiOS) {
-		this.aplanasiOS = aplanasiOS;
-	}
-
-	public String getAnelOS() {
-		return anelOS;
-	}
-
-	public void setAnelOS(String anelOS) {
-		this.anelOS = anelOS;
-	}
-
-	public String getAnelOD() {
-		return anelOD;
-	}
-
-	public void setAnelOD(String anelOD) {
-		this.anelOD = anelOD;
-	}
-
-	public String getSistemLacrimal() {
-		return sistemLacrimal;
-	}
-
-	public void setSistemLacrimal(String sistemLacrimal) {
-		this.sistemLacrimal = sistemLacrimal;
-	}
-
-	public String getDiagnosaKlinik() {
-		return diagnosaKlinik;
-	}
-
-	public void setDiagnosaKlinik(String diagnosaKlinik) {
-		this.diagnosaKlinik = diagnosaKlinik;
-	}
-
-	public String getKodePenyakit() {
-		return kodePenyakit;
-	}
-
-	public void setKodePenyakit(String kodePenyakit) {
-		this.kodePenyakit = kodePenyakit;
-	}
-
-	public String getPengobatanPoliklinik() {
-		return pengobatanPoliklinik;
-	}
-
-	public void setPengobatanPoliklinik(String pengobatanPoliklinik) {
-		this.pengobatanPoliklinik = pengobatanPoliklinik;
-	}
-
-	public String getPengobatanDiRumah() {
-		return pengobatanDiRumah;
-	}
-
-	public void setPengobatanDiRumah(String pengobatanDiRumah) {
-		this.pengobatanDiRumah = pengobatanDiRumah;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapNamaBarangVO.java

@@ -1,26 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapNamaBarangVO extends BaseMasterVO {
 
-public class PapNamaBarangVO extends BaseMasterVO{
 	@NotNull(message = "Nama Barang tidak boleh kosong")
-	@Column(name = "namaBarang", nullable = false)
 	@Caption(value = "Nama Barang")
 	private String namaBarang;
 
-	public String getNamaBarang() {
-		return namaBarang;
-	}
-
-	public void setNamaBarang(String namaBarang) {
-		this.namaBarang = namaBarang;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapNeurologiVO.java

@@ -1,94 +1,33 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 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;
+
+@Getter
+@Setter
+public class PapNeurologiVO extends BaseTransactionVO {
+
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
 
-public class PapNeurologiVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private PasienVO pasien;	
+	private PasienVO pasien;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
 
-	@ManyToOne
+	@Caption(value = "Object Kesadaran")
-	@JoinColumn(name = "ObjectKesadaranFk")
-	@Caption(value="Object Kesadaran")
 	private DataKesadaranVO kesadaran;
-	
+
-	@ManyToOne
+	@Caption(value = "Object Gangguan Neurologis")
-	@JoinColumn(name = "ObjectGangguanNeurologisFk")
-	@Caption(value="Object Gangguan Neurologis")
 	private StatusAdaTidakAdaVO gangguanNeorologis;
-	
+
-	@Column(name = "isNormal", nullable = false)
 	@Caption(value = "Is Normal")
 	private Boolean isNormal;
 
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
-		return registrasiPelayananPasien;
-	}
-
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public DataKesadaranVO getKesadaran() {
-		return kesadaran;
-	}
-
-	public void setKesadaran(DataKesadaranVO kesadaran) {
-		this.kesadaran = kesadaran;
-	}
-
-	public StatusAdaTidakAdaVO getGangguanNeorologis() {
-		return gangguanNeorologis;
-	}
-
-	public void setGangguanNeorologis(StatusAdaTidakAdaVO gangguanNeorologis) {
-		this.gangguanNeorologis = gangguanNeorologis;
-	}
-
-	public Boolean getIsNormal() {
-		return isNormal;
-	}
-
-	public void setIsNormal(Boolean isNormal) {
-		this.isNormal = isNormal;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPenanggungJawabVO.java

@@ -1,21 +1,15 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PapPenanggungJawabVO extends BaseMasterVO {
 
-public class PapPenanggungJawabVO extends BaseMasterVO{
-	@Column(name = "name")
 	@Caption(value = "name")
 	private String name;
 
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPengambilanSpesimenCustomVO.java

@@ -1,28 +1,17 @@
 package com.jasamedika.medifirst2000.vo;
 
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
+@Getter
-import javax.persistence.FetchType;
+@Setter
-import javax.persistence.OneToMany;
+public class PapPengambilanSpesimenCustomVO extends MedicalRecordTransactionVO {
 
-import com.jasamedika.medifirst2000.helper.Caption;
+	@Caption(value = "Object PengambilanSpesimen")
+	private Set<PapPengambilanSpesimenVO> pengambilanSpesimen = new HashSet<>();
 
-public class PapPengambilanSpesimenCustomVO extends MedicalRecordTransactionVO{
-	
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY)
-	@Caption(value="Object PengambilanSpesimen")
-	private Set<PapPengambilanSpesimenVO> pengambilanSpesimen =new HashSet<PapPengambilanSpesimenVO>();
-
-	public Set<PapPengambilanSpesimenVO> getPengambilanSpesimen() {
-		return pengambilanSpesimen;
-	}
-
-	public void setPengambilanSpesimen(Set<PapPengambilanSpesimenVO> pengambilanSpesimen) {
-		this.pengambilanSpesimen = pengambilanSpesimen;
-	}
-	
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPengambilanSpesimenVO.java

@@ -1,65 +1,25 @@
 package com.jasamedika.medifirst2000.vo;
 
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.Date;
 
-import javax.persistence.Column;
+@Getter
-import javax.persistence.JoinColumn;
+@Setter
-import javax.persistence.ManyToOne;
+public class PapPengambilanSpesimenVO extends MedicalRecordTransactionVO {
 
-import com.jasamedika.medifirst2000.helper.Caption;
+	@Caption(value = "Bahan Sample")
-
-public class PapPengambilanSpesimenVO extends MedicalRecordTransactionVO{
-	
-	@ManyToOne
-	@JoinColumn(name = "BahanSampleFk")
-	@Caption(value="Bahan Sample")
 	private BahanSampleVO bahanSample;
-	
+
-	@ManyToOne
+	@Caption(value = "Struk Order")
-	@JoinColumn(name = "StrukOrderFk")
-	@Caption(value="Struk Order")
 	private StrukOrderVO strukOrder;
-	
+
-	@Column(name = "Jumlah")
+	@Caption(value = "Jumlah")
-	@Caption(value="Jumlah")
 	private Integer jumlah;
-	
+
-	@Column(name = "TglAmbilSpesimen")
+	@Caption(value = "Tanggal Ambil Spesimen")
-	@Caption(value="Tanggal Ambil Spesimen")
 	private Date tglAmbilSpesimen;
 
-	public BahanSampleVO getBahanSample() {
-		return bahanSample;
-	}
-
-	public void setBahanSample(BahanSampleVO bahanSample) {
-		this.bahanSample = bahanSample;
-	}
-
-	public Integer getJumlah() {
-		return jumlah;
-	}
-
-	public void setJumlah(Integer jumlah) {
-		this.jumlah = jumlah;
-	}
-
-	public Date getTglAmbilSpesimen() {
-		return tglAmbilSpesimen;
-	}
-
-	public void setTglAmbilSpesimen(Date tglAmbilSpesimen) {
-		this.tglAmbilSpesimen = tglAmbilSpesimen;
-	}
-
-	public StrukOrderVO getStrukOrder() {
-		return strukOrder;
-	}
-
-	public void setStrukOrder(StrukOrderVO strukOrder) {
-		this.strukOrder = strukOrder;
-	}
-	
-	
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPengaruhNyeriVO.java

@@ -1,57 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapPengaruhNyeriVO extends BaseTransactionVO {
 
-public class PapPengaruhNyeriVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObejctPapSkriningNyeriFk")
 	@Caption(value = "Object PapSkriningNyeri")
 	private PapSkriningNyeriVO papSkriningNyeri;
-	
+
-	@ManyToOne
-	@JoinColumn(name = "ObejctRmKarakteristikNyeriFk")
 	@Caption(value = "Object RmKarakteristikNyeri")
 	private DataNyeriMempengaruhiVO dataNyeriPempengaruhi;
 
 	@NotNull(message = "Is Nilai tidak boleh kosong")
-	@Column(name = "isNilai")
 	@Caption(value = "Is Nilai")
 	private Boolean isNilai;
 
-	public PapSkriningNyeriVO getPapSkriningNyeri() {
-		return papSkriningNyeri;
-	}
-
-	public void setPapSkriningNyeri(PapSkriningNyeriVO papSkriningNyeri) {
-		this.papSkriningNyeri = papSkriningNyeri;
-	}
-
-	public DataNyeriMempengaruhiVO getDataNyeriPempengaruhi() {
-		return dataNyeriPempengaruhi;
-	}
-
-	public void setDataNyeriPempengaruhi(DataNyeriMempengaruhiVO dataNyeriPempengaruhi) {
-		this.dataNyeriPempengaruhi = dataNyeriPempengaruhi;
-	}
-
-	public Boolean getIsNilai() {
-		return isNilai;
-	}
-
-	public void setIsNilai(Boolean isNilai) {
-		this.isNilai = isNilai;
-	}
-	
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPengkajianMedisVO.java

@@ -1,67 +1,29 @@
 package com.jasamedika.medifirst2000.vo;
- 
-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;
 
-public class PapPengkajianMedisVO extends BaseTransactionVO{
+import javax.validation.constraints.NotNull;
 
+@Getter
+@Setter
+public class PapPengkajianMedisVO extends BaseTransactionVO {
 
 	@NotNull(message = "Anamanesis_1st tidak boleh kosong")
-	@Column(name = "Anamanesis_1st", nullable = true)
 	@Caption(value = "Anamanesis_1st")
 	private String Anamanesis_1st;
 
 	@NotNull(message = "Anamanesis_2nd tidak boleh kosong")
-	@Column(name = "Anamanesis_2nd", nullable = true)
 	@Caption(value = "Anamanesis_2nd")
 	private String Anamanesis_2nd;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPAPpengkajianFk")
 	@NotNull(message = "PAPpengkajian tidak boleh kosong")
 
 	@Caption(value = "Object PAPpengkajian")
 	private PapPengkajianVO paPpengkajian;
 
-	@Column(name = "ObjectPAPpengkajianFk", insertable = false, updatable = false, nullable = false)
 	private String paPpengkajianId;
 
-	public String getAnamanesis_1st() {
-		return Anamanesis_1st;
-	}
-
-	public void setAnamanesis_1st(String anamanesis_1st) {
-		Anamanesis_1st = anamanesis_1st;
-	}
-
-	public String getAnamanesis_2nd() {
-		return Anamanesis_2nd;
-	}
-
-	public void setAnamanesis_2nd(String anamanesis_2nd) {
-		Anamanesis_2nd = anamanesis_2nd;
-	}
-
-	public PapPengkajianVO getPaPpengkajian() {
-		return paPpengkajian;
-	}
-
-	public void setPaPpengkajian(PapPengkajianVO paPpengkajian) {
-		this.paPpengkajian = paPpengkajian;
-	}
-
-	public String getPaPpengkajianId() {
-		return paPpengkajianId;
-	}
-
-	public void setPaPpengkajianId(String paPpengkajianId) {
-		this.paPpengkajianId = paPpengkajianId;
-	}
-
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPengkajianResikoJatuhAnakVO.java

@@ -1,222 +1,62 @@
 package com.jasamedika.medifirst2000.vo;
 
-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;
-public class PapPengkajianResikoJatuhAnakVO extends BaseTransactionVO{
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class PapPengkajianResikoJatuhAnakVO extends BaseTransactionVO {
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPAPpengkajianFk")
 	@NotNull(message = "PAPpengkajian tidak boleh kosong")
-
 	@Caption(value = "Object PAPpengkajian")
 	private PapPengkajianVO paPpengkajian;
 
-	@Column(name = "ObjectPAPpengkajianFk", insertable = false, updatable = false, nullable = false)
 	private String paPpengkajianId;
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectUmurFk")
-	@NotNull(message = "umur tidak boleh kosong")
 
+	@NotNull(message = "umur tidak boleh kosong")
 	@Caption(value = "Object umur")
 	private GenericViewVO umur;
 
-	@Column(name = "ObjectUmurFk", insertable = false, updatable = false, nullable = false)
 	private Integer umurId;
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectGangguanKognitifFk")
-	@NotNull(message = "gangguanKognitif tidak boleh kosong")
 
+	@NotNull(message = "gangguanKognitif tidak boleh kosong")
 	@Caption(value = "Object gangguanKognitif")
 	private GenericViewVO gangguanKognitif;
 
-	@Column(name = "ObjectGangguanKognitifFk", insertable = false, updatable = false, nullable = false)
 	private Integer gangguanKognitifId;
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectResponTerhadapObatFk")
-	@NotNull(message = "responTerhadapObat tidak boleh kosong")
 
+	@NotNull(message = "responTerhadapObat tidak boleh kosong")
 	@Caption(value = "Object responTerhadapObat")
 	private GenericViewVO responTerhadapObat;
 
-	@Column(name = "ObjectResponTerhadapObatFk", insertable = false, updatable = false, nullable = false)
 	private Integer responTerhadapObatId;
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectPenggunaanObatFk")
-	@NotNull(message = "penggunaanObat tidak boleh kosong")
 
+	@NotNull(message = "penggunaanObat tidak boleh kosong")
 	@Caption(value = "Object penggunaanObat")
 	private GenericViewVO penggunaanObat;
 
-	@Column(name = "ObjectPenggunaanObatFk", insertable = false, updatable = false, nullable = false)
 	private Integer penggunaanObatId;
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectJenisKelaminFk")
-	@NotNull(message = "jenisKelamin tidak boleh kosong")
 
+	@NotNull(message = "jenisKelamin tidak boleh kosong")
 	@Caption(value = "Object jenisKelamin")
 	private JenisKelaminVO jenisKelamin;
 
-	@Column(name = "ObjectJenisKelaminFk", insertable = false, updatable = false, nullable = false)
 	private Integer jenisKelaminId;
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectFaktorLingkunganFk")
-	@NotNull(message = "faktorLingkungan tidak boleh kosong")
 
+	@NotNull(message = "faktorLingkungan tidak boleh kosong")
 	@Caption(value = "Object penggunaanObat")
 	private GenericViewVO faktorLingkungan;
 
-	@Column(name = "ObjectFaktorLingkunganFk", insertable = false, updatable = false, nullable = false)
 	private Integer faktorLingkunganId;
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectDiagnosisFk")
-	@NotNull(message = "Diagnosis tidak boleh kosong")
 
+	@NotNull(message = "Diagnosis tidak boleh kosong")
 	@Caption(value = "Object Diagnosis")
 	private DiagnosaVO diagnosis;
 
-	@Column(name = "ObjectDiagnosisFk", insertable = false, updatable = false, nullable = false)
 	private Integer diagnosisId;
 
-	public PapPengkajianVO getPaPpengkajian() {
-		return paPpengkajian;
-	}
-
-	public void setPaPpengkajian(PapPengkajianVO paPpengkajian) {
-		this.paPpengkajian = paPpengkajian;
-	}
-
-	public String getPaPpengkajianId() {
-		return paPpengkajianId;
-	}
-
-	public void setPaPpengkajianId(String paPpengkajianId) {
-		this.paPpengkajianId = paPpengkajianId;
-	}
-
-	public GenericViewVO getUmur() {
-		return umur;
-	}
-
-	public void setUmur(GenericViewVO umur) {
-		this.umur = umur;
-	}
-
-	public Integer getUmurId() {
-		return umurId;
-	}
-
-	public void setUmurId(Integer umurId) {
-		this.umurId = umurId;
-	}
-
-	public GenericViewVO getGangguanKognitif() {
-		return gangguanKognitif;
-	}
-
-	public void setGangguanKognitif(GenericViewVO gangguanKognitif) {
-		this.gangguanKognitif = gangguanKognitif;
-	}
-
-	public Integer getGangguanKognitifId() {
-		return gangguanKognitifId;
-	}
-
-	public void setGangguanKognitifId(Integer gangguanKognitifId) {
-		this.gangguanKognitifId = gangguanKognitifId;
-	}
-
-	public GenericViewVO getResponTerhadapObat() {
-		return responTerhadapObat;
-	}
-
-	public void setResponTerhadapObat(GenericViewVO responTerhadapObat) {
-		this.responTerhadapObat = responTerhadapObat;
-	}
-
-	public Integer getResponTerhadapObatId() {
-		return responTerhadapObatId;
-	}
-
-	public void setResponTerhadapObatId(Integer responTerhadapObatId) {
-		this.responTerhadapObatId = responTerhadapObatId;
-	}
-
-	public GenericViewVO getPenggunaanObat() {
-		return penggunaanObat;
-	}
-
-	public void setPenggunaanObat(GenericViewVO penggunaanObat) {
-		this.penggunaanObat = penggunaanObat;
-	}
-
-	public Integer getPenggunaanObatId() {
-		return penggunaanObatId;
-	}
-
-	public void setPenggunaanObatId(Integer penggunaanObatId) {
-		this.penggunaanObatId = penggunaanObatId;
-	}
-
-	public JenisKelaminVO getJenisKelamin() {
-		return jenisKelamin;
-	}
-
-	public void setJenisKelamin(JenisKelaminVO jenisKelamin) {
-		this.jenisKelamin = jenisKelamin;
-	}
-
-	public Integer getJenisKelaminId() {
-		return jenisKelaminId;
-	}
-
-	public void setJenisKelaminId(Integer jenisKelaminId) {
-		this.jenisKelaminId = jenisKelaminId;
-	}
-
-	public GenericViewVO getFaktorLingkungan() {
-		return faktorLingkungan;
-	}
-
-	public void setFaktorLingkungan(GenericViewVO faktorLingkungan) {
-		this.faktorLingkungan = faktorLingkungan;
-	}
-
-	public Integer getFaktorLingkunganId() {
-		return faktorLingkunganId;
-	}
-
-	public void setFaktorLingkunganId(Integer faktorLingkunganId) {
-		this.faktorLingkunganId = faktorLingkunganId;
-	}
-
-	public DiagnosaVO getDiagnosis() {
-		return diagnosis;
-	}
-
-	public void setDiagnosis(DiagnosaVO diagnosis) {
-		this.diagnosis = diagnosis;
-	}
-
-	public Integer getDiagnosisId() {
-		return diagnosisId;
-	}
-
-	public void setDiagnosisId(Integer diagnosisId) {
-		this.diagnosisId = diagnosisId;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPengkajianVO.java

@@ -1,112 +1,38 @@
 package com.jasamedika.medifirst2000.vo;
- 
-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.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-@Entity
+import javax.validation.constraints.NotNull;
-@Table(name = "PAPpengkajian_T")
+import java.util.Date;
+
+@Getter
+@Setter
 public class PapPengkajianVO extends BaseTransactionVO {
 
 	@NotNull(message = "tanggalMasuk tidak boleh kosong")
-	@Column(name = "tanggalMasuk", nullable = false)
 	@Caption(value = "tanggalMasuk")
 	private Date tanggalMasuk;
 
 	@NotNull(message = "waktuPemeriksaan tidak boleh kosong")
-	@Column(name = "waktuPemeriksaan", nullable = false)
 	@Caption(value = "waktuPemeriksaan")
 	private String waktuPemeriksaan;
 
-	// @NotNull(message = "keluhanUtama tidak boleh kosong")
-	@Column(name = "keluhanUtama", nullable = true)
 	@Caption(value = "keluhanUtama")
 	private String keluhanUtama;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "no CM pasien tidak boleh kosong")
-
 	@Caption(value = "Object pasien")
 	private PasienVO pasien;
 
-	@Column(name = "ObjectPasienFk", insertable = false, updatable = false, nullable = false)
 	private String pasienId;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPegawaiFk")
 	@NotNull(message = "Kd Ruangan tidak boleh kosong")
-
 	@Caption(value = "Object ruangan")
 	private RuanganVO ruangan;
 
-	@Column(name = "ObjectRuanganFk", insertable = false, updatable = false, nullable = false)
 	private Integer ruanganId;
 
-	public Date getTanggalMasuk() {
-		return tanggalMasuk;
-	}
-
-	public void setTanggalMasuk(Date tanggalMasuk) {
-		this.tanggalMasuk = tanggalMasuk;
-	}
-
-	public String getWaktuPemeriksaan() {
-		return waktuPemeriksaan;
-	}
-
-	public void setWaktuPemeriksaan(String waktuPemeriksaan) {
-		this.waktuPemeriksaan = waktuPemeriksaan;
-	}
-
-	public String getKeluhanUtama() {
-		return keluhanUtama;
-	}
-
-	public void setKeluhanUtama(String keluhanUtama) {
-		this.keluhanUtama = keluhanUtama;
-	}
-
- 
-	public String getPasienId() {
-		return pasienId;
-	}
-
-	public void setPasienId(String pasienId) {
-		this.pasienId = pasienId;
-	}
- 
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public RuanganVO getRuangan() {
-		return ruangan;
-	}
-
-	public void setRuangan(RuanganVO ruangan) {
-		this.ruangan = ruangan;
-	}
-
-	public Integer getRuanganId() {
-		return ruanganId;
-	}
-
-	public void setRuanganId(Integer ruanganId) {
-		this.ruanganId = ruanganId;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPetugasPendampingVO.java

@@ -1,38 +1,21 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 public class PapPetugasPendampingVO extends BaseTransactionVO {
-	@ManyToOne
+
 	@NotNull(message = "PapInstruksiRanap tidak boleh kosong")
 	private PapInstruksiRanapVO papInstruksiRanap;
-	
+
 	@NotNull(message = "Nama Petugas tidak boleh kosong")
-	@Column(name = "namaPetugas")
 	@Caption(value = "namaPetugas")
 	private String namaPetugas;
 
-	public PapInstruksiRanapVO getPapInstruksiRanap() {
-		return papInstruksiRanap;
-	}
-
-	public void setPapInstruksiRanap(PapInstruksiRanapVO papInstruksiRanap) {
-		this.papInstruksiRanap = papInstruksiRanap;
-	}
-
-	public String getNamaPetugas() {
-		return namaPetugas;
-	}
-
-	public void setNamaPetugas(String namaPetugas) {
-		this.namaPetugas = namaPetugas;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapProsedurePenanggungJawabVO.java

@@ -1,9 +1,13 @@
 package com.jasamedika.medifirst2000.vo;
 
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
 
+@Getter
+@Setter
 public class PapProsedurePenanggungJawabVO extends BaseTransactionVO {
 
 	@NotNull(message = "Rehabilitasi tidak boleh kosong")

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapProsedureVO.java

@@ -1,20 +1,15 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PapProsedureVO extends BaseMasterVO {
 
-public class PapProsedureVO extends BaseMasterVO{
-	@Column(name = "name")
 	@Caption(value = "name")
 	private String name;
 
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapProtesaVO.java

@@ -1,21 +1,15 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PapProtesaVO extends BaseMasterVO {
 
-public class PapProtesaVO extends BaseMasterVO{
-	@Column(name = "namaProtesa")
 	@Caption(value = "Nama Protesa")
 	private String namaProtesa;
 
-	public String getNamaProtesa() {
-		return namaProtesa;
-	}
-
-	public void setNamaProtesa(String namaProtesa) {
-		this.namaProtesa = namaProtesa;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapRencanaOrderFarmasiVO.java

@@ -1,147 +1,49 @@
 package com.jasamedika.medifirst2000.vo;
 
-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.base.BaseTransaction;
 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;
+
+@Getter
+@Setter
+public class PapRencanaOrderFarmasiVO extends BaseTransactionVO {
+
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
 
-public class PapRencanaOrderFarmasiVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private PasienVO pasien;	
+	private PasienVO pasien;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
 
 	@NotNull(message = "Tgl Order tidak boleh kosong")
-	@Column(name = "tglOrder", nullable = false)
 	@Caption(value = "Tgl Order")
 	private Date tglOrder;
 
 	@NotNull(message = "No Resep tidak boleh kosong")
-	@Column(name = "noResep", nullable = false)
 	@Caption(value = "No Resep")
 	private String noResep;
 
 	@NotNull(message = "Tgl Resep tidak boleh kosong")
-	@Column(name = "tglResep", nullable = false)
 	@Caption(value = "Tgl Resep")
 	private Date tglResep;
 
 	@NotNull(message = "Dokter Penulis Resep tidak boleh kosong")
-	@Column(name = "dokterPenulisResep", nullable = false)
 	@Caption(value = "Dokter Penulis Resep")
 	private String dokterPenulisResep;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectRuanganFk")
 	@NotNull(message = "Ruangan Tujuan tidak boleh kosong")
 	private RuanganVO ruanganTujuan;
-		
+
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapJenisObatFk")
 	@NotNull(message = "PapJenisObat tidak boleh kosong")
 	private PapJenisObatVO papJenisObat;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPapNamaBarangFk")
 	@NotNull(message = "PapNamaBarang tidak boleh kosong")
 	private PapNamaBarangVO papNamaBarang;
 
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
-		return registrasiPelayananPasien;
-	}
-
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public Date getTglOrder() {
-		return tglOrder;
-	}
-
-	public void setTglOrder(Date tglOrder) {
-		this.tglOrder = tglOrder;
-	}
-
-	public String getNoResep() {
-		return noResep;
-	}
-
-	public void setNoResep(String noResep) {
-		this.noResep = noResep;
-	}
-
-	public Date getTglResep() {
-		return tglResep;
-	}
-
-	public void setTglResep(Date tglResep) {
-		this.tglResep = tglResep;
-	}
-
-	public String getDokterPenulisResep() {
-		return dokterPenulisResep;
-	}
-
-	public void setDokterPenulisResep(String dokterPenulisResep) {
-		this.dokterPenulisResep = dokterPenulisResep;
-	}
-
-	public RuanganVO getRuanganTujuan() {
-		return ruanganTujuan;
-	}
-
-	public void setRuanganTujuan(RuanganVO ruanganTujuan) {
-		this.ruanganTujuan = ruanganTujuan;
-	}
-
-	public PapJenisObatVO getPapJenisObat() {
-		return papJenisObat;
-	}
-
-	public void setPapJenisObat(PapJenisObatVO papJenisObat) {
-		this.papJenisObat = papJenisObat;
-	}
-
-	public PapNamaBarangVO getPapNamaBarang() {
-		return papNamaBarang;
-	}
-
-	public void setPapNamaBarang(PapNamaBarangVO papNamaBarang) {
-		this.papNamaBarang = papNamaBarang;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapRencanaOrderLaboratoriumVO.java

@@ -1,77 +1,33 @@
 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.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Column;
+@Getter
-import javax.persistence.Entity;
+@Setter
-import javax.persistence.JoinColumn;
+public class PapRencanaOrderLaboratoriumVO extends BaseTransactionVO {
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseTransaction;
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.helper.Caption;
 
-public class PapRencanaOrderLaboratoriumVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
-	
-	@Column(name = "ObjectRegistrasiPelayananPasienFk", insertable = false, updatable = false, nullable = true)
 	private String registrasiPelayananPasienId;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private PasienVO pasien;	
+	private PasienVO pasien;
-	
+
-	@Column(name = "ObjectPasienFk", insertable = false, updatable = false, nullable = false)
 	private Integer pasienId;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
 
-	@OneToMany
+	@Caption(value = "ProdukSet")
-	@Caption(value = "ProdukSet")	
+	private Set<ProdukVO> produkSet = new HashSet<>();
-	private Set<ProdukVO> produkSet=new HashSet<ProdukVO>();
-	
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
-		return registrasiPelayananPasien;
-	}
 
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public Set<ProdukVO> getProdukSet() {
-		return produkSet;
-	}
-
-	public void setProdukSet(Set<ProdukVO> produkSet) {
-		this.produkSet = produkSet;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapRencanaTindakanVO.java

@@ -1,72 +1,28 @@
 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.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
+@Getter
-import javax.persistence.Column;
+@Setter
-import javax.persistence.Entity;
+public class PapRencanaTindakanVO extends BaseTransactionVO {
-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;
+	private RegistrasiPelayananPasienVO registrasiPelayananPasien;
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.helper.Caption;
 
-public class PapRencanaTindakanVO extends BaseTransactionVO{
-	@ManyToOne
-	@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
-	//@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
-	private RegistrasiPelayananPasienVO registrasiPelayananPasien;	
-	
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private PasienVO pasien;	
+	private PasienVO pasien;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
-	
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "papRencanaTindakan")
-	private Set<PapMasukanDiagnosisVO> papMasukanDiagnosisSet=new HashSet<PapMasukanDiagnosisVO>();
 
-	public RegistrasiPelayananPasienVO getRegistrasiPelayananPasien() {
+	private Set<PapMasukanDiagnosisVO> papMasukanDiagnosisSet = new HashSet<>();
-		return registrasiPelayananPasien;
-	}
-
-	public void setRegistrasiPelayananPasien(RegistrasiPelayananPasienVO registrasiPelayananPasien) {
-		this.registrasiPelayananPasien = registrasiPelayananPasien;
-	}
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public Set<PapMasukanDiagnosisVO> getPapMasukanDiagnosisSet() {
-		return papMasukanDiagnosisSet;
-	}
-
-	public void setPapMasukanDiagnosisSet(Set<PapMasukanDiagnosisVO> papMasukanDiagnosisSet) {
-		this.papMasukanDiagnosisSet = papMasukanDiagnosisSet;
-	}
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapRestorasiVO.java

@@ -1,24 +1,18 @@
 package com.jasamedika.medifirst2000.vo;
 
-import javax.persistence.Column;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-public class PapRestorasiVO extends BaseMasterVO{
+import javax.validation.constraints.NotNull;
-	@NotNull(message="Name tidak boleh kosong")
+
-	@Column(name = "Name", nullable = false, length = 100)
+@Getter
+@Setter
+public class PapRestorasiVO extends BaseMasterVO {
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
-
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapRiwayatImunisasiDasarVO.java

@@ -1,52 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-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;
+
+@Getter
+@Setter
 public class PapRiwayatImunisasiDasarVO extends BaseTransactionVO {
-	@ManyToOne
-	@JoinColumn(name = "ObjectPAPpengkajianFk")
-	@NotNull(message = "PAPpengkajian tidak boleh kosong")
 
+	@NotNull(message = "PAPpengkajian tidak boleh kosong")
 	@Caption(value = "Object PAPpengkajian")
 	private PapPengkajianVO paPpengkajian;
 
-	@Column(name = "ObjectPAPpengkajianFk", insertable = false, updatable = false, nullable = false)
 	private String paPpengkajianId;
 
 	@NotNull(message = "hasilImunisasi tidak boleh kosong")
-	@Column(name = "hasilImunisasi", nullable = false)
 	@Caption(value = "hasilImunisasi")
 	private String hasilImunisasi;
 
-	public PapPengkajianVO getPaPpengkajian() {
-		return paPpengkajian;
-	}
-
-	public void setPaPpengkajian(PapPengkajianVO paPpengkajian) {
-		this.paPpengkajian = paPpengkajian;
-	}
-
-	public String getPaPpengkajianId() {
-		return paPpengkajianId;
-	}
-
-	public void setPaPpengkajianId(String paPpengkajianId) {
-		this.paPpengkajianId = paPpengkajianId;
-	}
-
-	public String getHasilImunisasi() {
-		return hasilImunisasi;
-	}
-
-	public void setHasilImunisasi(String hasilImunisasi) {
-		this.hasilImunisasi = hasilImunisasi;
-	}
-		
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapRiwayatImunisasiVO.java

@@ -1,82 +1,33 @@
 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.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
+@Getter
-import javax.persistence.Column;
+@Setter
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.helper.Caption;
-
 public class PapRiwayatImunisasiVO extends BaseTransactionVO {
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPasienFk")
 	@NotNull(message = "Pasien tidak boleh kosong")
-	private AntrianPasienDiPeriksaVO pasien;	
+	private AntrianPasienDiPeriksaVO pasien;
-	
+
 	@NotNull(message = "Tgl Input tidak boleh kosong")
-	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
-	
+
-	@Column(name = "hasilImunisasi", nullable = true)
 	@Caption(value = "hasilImunisasi")
 	private String hasilImunisasi;
 
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "papRiwayatImunisasi")
 	@Caption(value = "papImunisasiDetailSet")
-	private Set<PapImunisasiDetailVO> papImunisasiDetailSet=new HashSet<PapImunisasiDetailVO>();
+	private Set<PapImunisasiDetailVO> papImunisasiDetailSet = new HashSet<>();
-	
+
-	@Column(name = "keteranganLainnya", nullable = true)
 	@Caption(value = "keteranganLainnya")
 	private String keteranganLainnya;
 
-	public AntrianPasienDiPeriksaVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(AntrianPasienDiPeriksaVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public String getHasilImunisasi() {
-		return hasilImunisasi;
-	}
-
-	public void setHasilImunisasi(String hasilImunisasi) {
-		this.hasilImunisasi = hasilImunisasi;
-	}
-
-	public Set<PapImunisasiDetailVO> getPapImunisasiDetailSet() {
-		return papImunisasiDetailSet;
-	}
-
-	public void setPapImunisasiDetailSet(Set<PapImunisasiDetailVO> papImunisasiDetailSet) {
-		this.papImunisasiDetailSet = papImunisasiDetailSet;
-	}
-
-	public String getKeteranganLainnya() {
-		return keteranganLainnya;
-	}
-
-	public void setKeteranganLainnya(String keteranganLainnya) {
-		this.keteranganLainnya = keteranganLainnya;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapRiwayatKehamilanVO.java

@@ -1,128 +1,46 @@
 package com.jasamedika.medifirst2000.vo;
- 
-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;
+
+@Getter
+@Setter
 public class PapRiwayatKehamilanVO extends BaseTransactionVO {
 
- 	@NotNull(message = "usiaKehamilan tidak boleh kosong")
+	@NotNull(message = "usiaKehamilan tidak boleh kosong")
-	@Column(name = "usiaKehamilan", nullable = true)
 	@Caption(value = "usiaKehamilan")
 	private float usiaKehamilan;
+
 	@NotNull(message = "beratBadanLahir tidak boleh kosong")
-	@Column(name = "beratBadanLahir", nullable = true)
 	@Caption(value = "beratBadanLahir")
 	private float beratBadanLahir;
+
 	@NotNull(message = "panjangBadanLahir tidak boleh kosong")
-	@Column(name = "panjangBadanLahir", nullable = true)
 	@Caption(value = "panjangBadanLahir")
 	private float panjangBadanLahir;
+
 	@NotNull(message = "menangis tidak boleh kosong")
-	@Column(name = "menangis", nullable = true)
 	@Caption(value = "menangis")
 	private Boolean menangis;
+
 	@NotNull(message = "riwayatKuning tidak boleh kosong")
-	@Column(name = "riwayatKuning", nullable = true)
 	@Caption(value = "riwayatKuning")
 	private Boolean riwayatKuning;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPAPpengkajianFk")
 	@NotNull(message = "PAPpengkajian tidak boleh kosong")
-
 	@Caption(value = "Object PAPpengkajian")
 	private PapPengkajianVO paPpengkajian;
 
-	@Column(name = "ObjectPAPpengkajianFk", insertable = false, updatable = false, nullable = false)
 	private String paPpengkajianId;
-
-	@ManyToOne
-	@JoinColumn(name = "ObjectPersalinanFk")
 	@NotNull(message = "persalinan tidak boleh kosong")
 
 	@Caption(value = "Object GenericView")
 	private GenericViewVO persalinan;
 
-	@Column(name = "ObjectPersalinanFk", insertable = false, updatable = false, nullable = false)
 	private Integer persalinanId;
 
-	public float getUsiaKehamilan() {
-		return usiaKehamilan;
-	}
-
-	public void setUsiaKehamilan(float usiaKehamilan) {
-		this.usiaKehamilan = usiaKehamilan;
-	}
-
-	public float getBeratBadanLahir() {
-		return beratBadanLahir;
-	}
-
-	public void setBeratBadanLahir(float beratBadanLahir) {
-		this.beratBadanLahir = beratBadanLahir;
-	}
-
-	public float getPanjangBadanLahir() {
-		return panjangBadanLahir;
-	}
-
-	public void setPanjangBadanLahir(float panjangBadanLahir) {
-		this.panjangBadanLahir = panjangBadanLahir;
-	}
-
-	public Boolean getMenangis() {
-		return menangis;
-	}
-
-	public void setMenangis(Boolean menangis) {
-		this.menangis = menangis;
-	}
-
-	public Boolean getRiwayatKuning() {
-		return riwayatKuning;
-	}
-
-	public void setRiwayatKuning(Boolean riwayatKuning) {
-		this.riwayatKuning = riwayatKuning;
-	}
-
-	public PapPengkajianVO getPaPpengkajian() {
-		return paPpengkajian;
-	}
-
-	public void setPaPpengkajian(PapPengkajianVO paPpengkajian) {
-		this.paPpengkajian = paPpengkajian;
-	}
-
-	public String getPaPpengkajianId() {
-		return paPpengkajianId;
-	}
-
-	public void setPaPpengkajianId(String paPpengkajianId) {
-		this.paPpengkajianId = paPpengkajianId;
-	}
-
-	public GenericViewVO getPersalinan() {
-		return persalinan;
-	}
-
-	public void setPersalinan(GenericViewVO persalinan) {
-		this.persalinan = persalinan;
-	}
-
-	public Integer getPersalinanId() {
-		return persalinanId;
-	}
-
-	public void setPersalinanId(Integer persalinanId) {
-		this.persalinanId = persalinanId;
-	}
-	
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapRiwayatKelahiranVO.java

@@ -1,130 +1,40 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-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.Date;
+
+@Getter
+@Setter
 public class PapRiwayatKelahiranVO extends BaseTransactionVO {
-	
+
-	@Column(name = "usiaKehamilan")
+	@Caption(value = "Usia Kehamilan")
-	@Caption(value="Usia Kehamilan")
 	private String usiaKehamilan;
-	
+
-	@ManyToOne
+	@Caption(value = "Persalinan")
-	@Caption(value="Persalinan")
 	private DataPersalinanVO dataPersalinan;
-	
+
-	
+	@Caption(value = "Berat Badan Lahir")
-	@Column(name = "beratBadanLahir")
-	@Caption(value="Berat Badan Lahir")
 	private String beratBadanLahir;
-	
+
-	@Column(name = "panjangBadanLahir")
+	@Caption(value = "Panjang Badan Lahir")
-	@Caption(value="Panjang Badan Lahir")
 	private String panjangBadanLahir;
-	
+
-	@ManyToOne
+	@Caption(value = "Menangis")
-	@Caption(value="Menangis")
 	private StatusYaTidakVO menangis;
-	
+
-	
+	@Caption(value = "Menangis")
-	@ManyToOne
-	@Caption(value="Menangis")
 	private StatusYaTidakVO riwayatKuning;
-	
+
-	@ManyToOne
+	@NotNull(message = "No C M Harus Diisi")
-	@NotNull(message="No C M Harus Diisi")
+	@Caption(value = "No C M")
-	@Caption(value="No C M")
 	private AntrianPasienDiPeriksaVO pasien;
 
-	@Column(name = "tglInput", nullable = true)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
-	
-	public Date getTglInput() {
-		return tglInput;
-	}
 
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-
-	public String getUsiaKehamilan() {
-		return usiaKehamilan;
-	}
-
-
-	public void setUsiaKehamilan(String usiaKehamilan) {
-		this.usiaKehamilan = usiaKehamilan;
-	}
-
-
-	public DataPersalinanVO getDataPersalinan() {
-		return dataPersalinan;
-	}
-
-
-	public void setDataPersalinan(DataPersalinanVO dataPersalinan) {
-		this.dataPersalinan = dataPersalinan;
-	}
-
-
-	public String getBeratBadanLahir() {
-		return beratBadanLahir;
-	}
-
-
-	public void setBeratBadanLahir(String beratBadanLahir) {
-		this.beratBadanLahir = beratBadanLahir;
-	}
-
-
-	public String getPanjangBadanLahir() {
-		return panjangBadanLahir;
-	}
-
-
-	public void setPanjangBadanLahir(String panjangBadanLahir) {
-		this.panjangBadanLahir = panjangBadanLahir;
-	}
-
-
-	public StatusYaTidakVO getMenangis() {
-		return menangis;
-	}
-
-
-	public void setMenangis(StatusYaTidakVO menangis) {
-		this.menangis = menangis;
-	}
-
-
-	public StatusYaTidakVO getRiwayatKuning() {
-		return riwayatKuning;
-	}
-
-
-	public void setRiwayatKuning(StatusYaTidakVO riwayatKuning) {
-		this.riwayatKuning = riwayatKuning;
-	}
-
-
-	public AntrianPasienDiPeriksaVO getPasien() {
-		return pasien;
-	}
-
-
-	public void setPasien(AntrianPasienDiPeriksaVO pasien) {
-		this.pasien = pasien;
-	}
-	
-	
-
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapRiwayatKesehatanVO.java

@@ -1,76 +1,32 @@
 package com.jasamedika.medifirst2000.vo;
 
-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;
+
+@Getter
+@Setter
 public class PapRiwayatKesehatanVO extends BaseTransactionVO {
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPAPpengkajianFk")
 	@NotNull(message = "PAPpengkajian tidak boleh kosong")
-
 	@Caption(value = "Object PAPpengkajian")
 	private PapPengkajianVO paPpengkajian;
 
-	@Column(name = "ObjectPAPpengkajianFk", insertable = false, updatable = false, nullable = false)
 	private String paPpengkajianId;
 
 	@NotNull(message = "rawat tidak boleh kosong")
-	@Column(name = "rawat", nullable = false)
 	@Caption(value = "rawat")
 	private Boolean rawat;
+
 	@NotNull(message = "alatImplan tidak boleh kosong")
-	@Column(name = "alatImplan", nullable = false)
 	@Caption(value = "alatImplan")
 	private Boolean alatImplan;
+
 	@NotNull(message = "penyakitMayor tidak boleh kosong")
-	@Column(name = "penyakitMayor", nullable = false)
 	@Caption(value = "penyakitMayor")
 	private Boolean penyakitMayor;
 
-	public PapPengkajianVO getPaPpengkajian() {
-		return paPpengkajian;
-	}
-
-	public void setPaPpengkajian(PapPengkajianVO paPpengkajian) {
-		this.paPpengkajian = paPpengkajian;
-	}
-
-	public String getPaPpengkajianId() {
-		return paPpengkajianId;
-	}
-
-	public void setPaPpengkajianId(String paPpengkajianId) {
-		this.paPpengkajianId = paPpengkajianId;
-	}
-
-	public Boolean getRawat() {
-		return rawat;
-	}
-
-	public void setRawat(Boolean rawat) {
-		this.rawat = rawat;
-	}
-
-	public Boolean getAlatImplan() {
-		return alatImplan;
-	}
-
-	public void setAlatImplan(Boolean alatImplan) {
-		this.alatImplan = alatImplan;
-	}
-
-	public Boolean getPenyakitMayor() {
-		return penyakitMayor;
-	}
-
-	public void setPenyakitMayor(Boolean penyakitMayor) {
-		this.penyakitMayor = penyakitMayor;
-	}
-
 }