diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StrukOrderVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StrukOrderVO.java
index dfde3171..377f116d 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StrukOrderVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StrukOrderVO.java
@@ -4,151 +4,100 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.entities.RencanaOperasi;
 import com.jasamedika.medifirst2000.helper.Caption;
 
 public class StrukOrderVO extends BaseTransactionVO {
 
 	@Caption(value = "Nama Pengambil Order")
-	@Column(name = "NamaPengambilOrder", nullable = true, length = 40)
 	private String namaPengambilOrder;
 	
 	@Caption(value = "Tanggal Ambil Order")
-	@Column(name = "TglAmbilOrder", nullable = true)
 	private Date tglAmbilOrder;
 	
 	@Caption(value = "Cito")
-	@Column(name = "Cito", nullable = true, length = 150)
 	private Boolean cito;
 
 	@Caption(value = "Alamat Tempat Tujuan")
-	@Column(name = "AlamatTempatTujuan", nullable = true, length = 150)
 	private String alamatTempatTujuan;
 
 	@Caption(value = "Is Delivered")
-	@Column(name = "isDelivered", nullable = false)
 	private Byte isDelivered;
 
 	@Caption(value = "Is Pickup")
-	@Column(name = "isPickup", nullable = true)
 	private Byte isPickup;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectAccountFk")
 	@Caption(value = "Object Account")
 	private ChartOfAccountVO account;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectCaraBayar_QuoFk")
 	@Caption(value = "Object Cara Bayar_ Quo")
 	private CaraBayarVO caraBayarQuo;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectDiagnosaFk")
 	@Caption(value = "Object Diagnosa")
 	private DiagnosaVO diagnosa;
 
 	@Caption(value = "Kode Dokter")
-	@Column(name = "KdDokter", nullable = true, length = 5)
 	private String dokter;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectJenisDokumenFk")
 	@Caption(value = "Object Jenis Dokumen")
 	private JenisDokumenVO jenisDokumen;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectJenisOrderFk")
 	@Caption(value = "Object Jenis Order")
 	private JenisOrderVO jenisOrder;
 	
 	private RencanaOperasiVO rencanaOperasi;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectKelompokTransaksiFk")
 	@Caption(value = "Object Kelompok Transaksi")
 	private KelompokTransaksiVO kelompokTransaksi;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectMetodeDeliveryFk")
 	@Caption(value = "Object Metode Delivery")
 	private MetodeDeliveryVO metodeDelivery;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectPegawaiOrderFk")
 	@Caption(value = "Object Pegawai Order")
 	private PegawaiVO pegawaiOrder;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectRekananFk")
 	@Caption(value = "Object Rekanan")
 	private RekananVO rekanan;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectRekananSalesFk")
 	@Caption(value = "Object Rekanan Sales")
 	private RekananVO rekananSales;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectRekananSalesQuoFk")
 	@Caption(value = "Object Rekanan Sales Quo")
 	private RekananVO rekananSalesQuo;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectRuanganFk")
 	@Caption(value = "Object Ruangan")
 	private RuanganVO ruangan;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectRuanganTujuanFk")
 	@Caption(value = "Object Ruangan Tujuan")
 	private RuanganVO ruanganTujuan;
 
 	@Caption(value = "Keterangan Keperluan")
-	@Column(name = "KeteranganKeperluan", nullable = true, length = 150)
 	private String keteranganKeperluan;
 
 	@Caption(value = "Keterangan Lainnya")
-	@Column(name = "KeteranganLainnya", nullable = true, length = 150)
 	private String keteranganLainnya;
 
 	@Caption(value = "Keterangan Lainnya Quo")
-	@Column(name = "KeteranganLainnyaQuo", nullable = true, length = 300)
 	private String keteranganLainnyaQuo;
 
 	@Caption(value = "Keterangan Order")
-	@Column(name = "KeteranganOrder", nullable = true, length = 100)
 	private String keteranganOrder;
 
 	@Caption(value = "Nama Pasien Pemesan")
-	@Column(name = "NamaPasienPemesan", nullable = true, length = 40)
 	private String namaPasienPemesan;
 
 	@Caption(value = "Nama P Jawab Keluarga")
-	@Column(name = "NamaPJawabKeluarga", nullable = true, length = 40)
 	private String namaPJawabKeluarga;
 
 	@Caption(value = "Nama Rekanan Sales")
-	@Column(name = "NamaRekananSales", nullable = true, length = 40)
 	private String namaRekananSales;
 
 	@Caption(value = "Nama Rekanan Sales Quo")
-	@Column(name = "NamaRekananSalesQuo", nullable = true, length = 40)
 	private String namaRekananSalesQuo;
 
 	@Caption(value = "Nama Tempat Tujuan")
-	@Column(name = "NamaTempatTujuan", nullable = true, length = 75)
 	private String namaTempatTujuan;
 
-	@ManyToOne
 	@Caption(value = "No C M")
 	private PasienVO noCm;
 
@@ -167,7 +116,6 @@ public class StrukOrderVO extends BaseTransactionVO {
 	@Caption(value = "No Quotation")
 	private String noQuotation;
 
-	@ManyToOne
 	@Caption(value = "No Registrasi")
 	private PasienDaftarVO noRegistrasi;
 
@@ -243,21 +191,17 @@ public class StrukOrderVO extends BaseTransactionVO {
 	@Caption(value = "Total P P N")
 	private Double totalPpn;
 
-	@ManyToOne
 	@Caption(value = "Status Barang")
 	private StatusBarangVO statusBarang;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@Caption(value = "Jenis Permintaan")
 	private JenisPermintaanVO jenisPermintaan;
 
-	@OneToMany
 	private Set<OrderPelayananVO> orderPelayanan = new HashSet<OrderPelayananVO>();
 	
 	@Caption(value = "IsVerifikasi")
 	private Boolean isVerifikasi;
 
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "strukOrder")
 	@Caption(value = "penambahanKebutuhanSarana")
 	private Set<PenambahanKebutuhanSaranaVO> penambahanKebutuhanSarana = new HashSet<PenambahanKebutuhanSaranaVO>();
 
@@ -276,7 +220,6 @@ public class StrukOrderVO extends BaseTransactionVO {
 	@Caption(value = "No Telp Penanggung Jawab Keluarga")
 	private String noTelpPJawabKeluarga;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@Caption(value = "Object Petugas")
 	private PegawaiVO petugas;
 
@@ -298,24 +241,26 @@ public class StrukOrderVO extends BaseTransactionVO {
 	@Caption(value = "Jumlah Panitia")
 	private Integer jumlahPanitia;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@Caption(value = "Object Unit Pemesan")
 	private RuanganVO unitPemesan;
 
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "strukOrder")
 	@Caption(value = "jenisKonsumsiSet")
 	private Set<JenisKonsumsiSetVO> jenisKonsumsiSet = new HashSet<JenisKonsumsiSetVO>();
 
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "strukOrder")
 	@Caption(value = "mapPegawaiAmbulance")
 	private Set<MappingPegawaiPemakaianAmbulanceVO> mapPegawaiAmbulance = new HashSet<MappingPegawaiPemakaianAmbulanceVO>();
 
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "strukOrder")
 	@Caption(value = "mapPegawaiKendaraanDinas")
 	private Set<MappingPegawaiKendaraanDinasVO> mapPegawaiKendaraanDinas = new HashSet<MappingPegawaiKendaraanDinasVO>();
 
 	@Caption(value = "Waktu Pengembalian")
 	private Date waktuPengembalian;
+	
+	@Caption(value = "Masalah/Alergi")
+	private String masalah;
+	
+	@Caption(value = "Diagnosis/Berat Badan")
+	private String diagnosis;
 
 	public String getNamaPengambilOrder() {
 		return namaPengambilOrder;
@@ -981,4 +926,20 @@ public class StrukOrderVO extends BaseTransactionVO {
 		this.waktuPengembalian = waktuPengembalian;
 	}
 
+	public String getMasalah() {
+		return masalah;
+	}
+
+	public void setMasalah(String masalah) {
+		this.masalah = masalah;
+	}
+
+	public String getDiagnosis() {
+		return diagnosis;
+	}
+
+	public void setDiagnosis(String diagnosis) {
+		this.diagnosis = diagnosis;
+	}
+
 }