diff --git a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java
index 28a237a2..f8b1adf8 100644
--- a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java
+++ b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java
@@ -685,7 +685,7 @@ public class BridgingDaftarOnlineController {
 			return new ResponseEntity<>(result.getNoCm(), HttpStatus.OK);
 		return new ResponseEntity<>(null, HttpStatus.OK);
 	}
-	
+
 	@RequestMapping(value = "/bpjs/card-number/{noBpjs}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Boolean> checkNoBPJSPasien(@PathVariable String noBpjs) {
 		PasienVO result = pasienService.findByNoBpjs(noBpjs);
@@ -693,4 +693,10 @@ public class BridgingDaftarOnlineController {
 			return new ResponseEntity<>(true, HttpStatus.OK);
 		return new ResponseEntity<>(false, HttpStatus.OK);
 	}
+
+	@RequestMapping(value = "/bpjs/patient/get/{noRM}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<Object> getListPatient(@PathVariable String noRM) {
+		List<Map<String, Object>> entity = pasienService.findByNoRM(noRM);
+		return new ResponseEntity<>(entity, HttpStatus.OK);
+	}
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AlamatDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AlamatDao.java
index 47c92895..5468bf98 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AlamatDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AlamatDao.java
@@ -19,7 +19,6 @@ import com.jasamedika.medifirst2000.entities.Alamat;
  */
 @Repository("AlamatDao")
 public interface AlamatDao extends PagingAndSortingRepository<Alamat, Integer> {
-	// custom query
 	@Query("select model from Alamat model where model.pasien.namaPasien=:nama")
 	public List<Alamat> findAlamatBynamaPasien(@Param("nama") String nama);
 
@@ -29,33 +28,28 @@ public interface AlamatDao extends PagingAndSortingRepository<Alamat, Integer> {
 	@Query("select model from Alamat model where model.pasien.id=:id")
 	public Alamat findAlamatByPasienId(@Param("id") Integer id);
 
-	// custom query WITH pagination
 	@Query("select model from Alamat model where model.pasien.namaPasien=:nama")
-	public Page<Alamat> findPageAlamatBynamaPasien(@Param("nama") String nama,
-			Pageable Page);
+	public Page<Alamat> findPageAlamatBynamaPasien(@Param("nama") String nama, Pageable Page);
 
-	// custom query return map example
 	@Query("select new map(model.id as id, model.pasien.namaPasien as nama) from Alamat model")
 	public List<Map<String, String>> getMapAlamat();
 
-	// native query example
-	@Query(value = "SELECT " + "alamatlengkap AS NAMA "
-			+ "FROM Alamat", nativeQuery = true)
+	@Query(value = "SELECT " + "alamatlengkap AS NAMA " + "FROM Alamat", nativeQuery = true)
 	List<Object[]> getNativeAlamat();
-	
+
 	@Query("select p from Alamat p left join fetch p.desaKelurahan d where p.pasienId=:id")
 	public List<Alamat> findAlamatByIdPasien(@Param("id") Integer id);
-	
-	@Query("select new Map(a.alamatLengkap as alamatLengkap, "
-			+ "a.rtrw as rtrw, "
-			+ "a.namaDesaKelurahan as desaKelurahan, "
-			+ "a.namaKecamatan as kecamatan, "
-			+ "a.namaKotaKabupaten as kotaKabupaten, "
-			+ "p.namaPropinsi as namaPropinsi) "
-			+ "from Alamat a "
-			+ "left join a.desaKelurahan dk "
-			+ "left join a.propinsi p "
-			+ "where a.pasien.id=:patientId")
+
+	@Query("select new Map(a.alamatLengkap as alamat," + "p.namaPropinsi as namaprop,"
+			+ "b.namaKotaKabupaten as namadati2," + "c.namaKecamatan as namakec," + "d.namaDesaKelurahan as namakel) "
+			+ "from Alamat a " + "left join a.propinsi p " + "left join a.kotaKabupaten b " + "left join a.kecamatan c "
+			+ "left join a.desaKelurahan d " + "where a.statusEnabled is true " + "and a.pasien.noCm = :noCm")
+	List<Map<String, Object>> findAlamatByNoRM(@Param("noCm") String noCm);
+
+	@Query("select new Map(a.alamatLengkap as alamatLengkap, " + "a.rtrw as rtrw, "
+			+ "a.namaDesaKelurahan as desaKelurahan, " + "a.namaKecamatan as kecamatan, "
+			+ "a.namaKotaKabupaten as kotaKabupaten, " + "p.namaPropinsi as namaPropinsi) " + "from Alamat a "
+			+ "left join a.desaKelurahan dk " + "left join a.propinsi p " + "where a.pasien.id=:patientId")
 	Map<String, Object> findFullAddressByPatientId(@Param("patientId") Integer pasienId);
 
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java
index 010fb0e1..44e42771 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PasienDao.java
@@ -44,7 +44,7 @@ public interface PasienDao extends PagingAndSortingRepository<Pasien, Integer> {
 
 	@Query("select model from Pasien model,DataAsuransi ap where ap.pasien.noCm = model.noCm and  ap.noKepesertaan = :noBpjs")
 	public List<Pasien> findPasienBynoBpjs(@Param("noBpjs") String noBpjs);
-	
+
 	/**
 	 * Data asuransi di laravel sepertinya sudah tidak dipakai
 	 */
@@ -84,6 +84,12 @@ public interface PasienDao extends PagingAndSortingRepository<Pasien, Integer> {
 			+ "left join ah.propinsi ahd " + "where a.noCm=:noCm")
 	public Map<String, Object> findMapPasienByNoCm(@Param("noCm") String noCm);
 
+	@Query("select new Map(ps.noBpjs as nomorkartu," + "ps.noIdentitas as nik," + "ps.namaPasien as nama,"
+			+ "ps.jenisKelaminId as jeniskelamin," + "to_char(ps.tglLahir,'yyyy-MM-dd') as tanggallahir,"
+			+ "ps.noHp as nohp) " + "from Pasien ps " + "where ps.statusEnabled is true " + "and ps.noCm = :noRm "
+			+ "order by ps.id desc")
+	public List<Map<String, Object>> findByNoRM(@Param("noRm") String noRm);
+
 	@Query("select NEW Map (" + "a.id as id, " + "a.namaKelas as namaKelas) " + "from Kelas a")
 	public List<Map<String, Object>> getkelas();
 
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienService.java
index 65f14eef..79cbad18 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PasienService.java
@@ -25,7 +25,9 @@ public interface PasienService<T> extends BaseVoService<Pasien, PasienVO, Intege
 	PasienVO findById(Integer key);
 
 	PasienVO findByNoCm(String key);
-	
+
+	List<Map<String, Object>> findByNoRM(String noCm);
+
 	PasienVO findByNoBpjs(String noBpjs);
 
 	PasienVO findByNorecAntrian(String noRec);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienServiceImpl.java
index 91b442e0..b819de93 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PasienServiceImpl.java
@@ -80,9 +80,8 @@ import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO;
  * @author Roberto
  * @param <T>
  */
-@SuppressWarnings("rawtypes")
 @Service("pasienService")
-public class PasienServiceImpl extends BaseVoServiceImpl implements PasienService {
+public class PasienServiceImpl extends BaseVoServiceImpl implements PasienService<Pasien> {
 
 	@Autowired
 	private PasienDao pasienDao;
@@ -144,26 +143,6 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic
 	@Autowired
 	private BaseConverterImpl<KecamatanVO, Kecamatan> kecamatanConverter;
 
-	@Override
-	public Object add(Object vo) throws JpaSystemException, ServiceVOException {
-		return null;
-	}
-
-	@Override
-	public Object update(Object vo) throws JpaSystemException, ServiceVOException {
-		return null;
-	}
-
-	@Override
-	public Boolean delete(Object key) throws JpaSystemException {
-		return null;
-	}
-
-	@Override
-	public Object findById(Object key) throws JpaSystemException {
-		return null;
-	}
-
 	@Override
 	@Transactional(readOnly = false)
 	public PasienVO add(PasienVO vo) throws JpaSystemException, ServiceVOException {
@@ -268,7 +247,7 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic
 	}
 
 	@Override
-	public Map findAllWithPageAndLimitAndSortByAndDirectionParameter(Integer page, Integer limit, String sort,
+	public Map<String, Object> findAllWithPageAndLimitAndSortByAndDirectionParameter(Integer page, Integer limit, String sort,
 			String dir) {
 		return null;
 	}
@@ -399,6 +378,41 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic
 		return constructMapReturn(gridPasienVoList, totalRow, totalPages);
 	}
 
+	@Override
+	public List<Map<String, Object>> findByNoRM(String noCm) {
+		List<Map<String, Object>> listPasien = pasienDao.findByNoRM(noCm);
+		List<Map<String, Object>> listAlamat = alamatDao.findAlamatByNoRM(noCm);
+		String alamat = setAlamat(listAlamat);
+		if (listPasien == null || listPasien.size() == 0)
+			return null;
+		listPasien.forEach(pasien -> {
+			pasien.put("jeniskelamin", 'L');
+			if (pasien.get("jeniskelamin").equals(2))
+				pasien.put("jeniskelamin", 'P');
+			pasien.put("alamat", alamat);
+		});
+		return listPasien;
+	}
+
+	private String setAlamat(List<Map<String, Object>> listMapAlamat) {
+		if (listMapAlamat == null || listMapAlamat.size() == 0)
+			return null;
+		String alamat = null;
+		for (Map<String, Object> mapAlamat : listMapAlamat) {
+			alamat = mapAlamat.get("alamat").toString();
+			if (CommonUtil.isNotNullOrEmpty(mapAlamat.get("namakel")))
+				alamat += " Desa/Kelurahan " + mapAlamat.get("namakel").toString();
+			if (CommonUtil.isNotNullOrEmpty(mapAlamat.get("namakec")))
+				alamat += " Kecamatan " + mapAlamat.get("namakec").toString();
+			if (CommonUtil.isNotNullOrEmpty(mapAlamat.get("namadati2")))
+				alamat += " Kota/Kabupaten " + mapAlamat.get("namadati2").toString();
+			if (CommonUtil.isNotNullOrEmpty(mapAlamat.get("namaprop")))
+				alamat += " Provinsi " + mapAlamat.get("namaprop").toString();
+			break;
+		}
+		return alamat;
+	}
+
 	@Override
 	@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
 	public PasienVO findByNoCm(String key) throws JpaSystemException {
@@ -632,4 +646,9 @@ public class PasienServiceImpl extends BaseVoServiceImpl implements PasienServic
 		return result;
 	}
 
+	@Override
+	public Boolean delete(Integer key) throws JpaSystemException {
+		return null;
+	}
+
 }
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java
index 0f5b2f53..93f44424 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java
@@ -8,6 +8,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
@@ -26,251 +27,93 @@ import com.jasamedika.medifirst2000.helper.Caption;
 @Table(name = "Alamat_M")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class Alamat extends BaseMaster {
-	
+	private static final long serialVersionUID = 5328187153021249284L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.alamat_m_id_seq")
+	@SequenceGenerator(name = "public.alamat_m_id_seq", sequenceName = "public.alamat_m_id_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Integer id;
+
 	@Column(name = "AlamatEmail", nullable = true, length = 50)
 	@Caption(value = "Alamat Email")
 	private String alamatEmail;
 
-	public void setAlamatEmail(String alamatEmail) {
-		this.alamatEmail = alamatEmail;
-	}
-
-	public String getAlamatEmail() {
-		return this.alamatEmail;
-	}
-
 	@NotNull(message = "Alamat Lengkap tidak boleh kosong")
 	@Column(name = "AlamatLengkap", nullable = false, length = 200)
 	@Caption(value = "Alamat Lengkap")
 	private String alamatLengkap;
 
-	public void setAlamatLengkap(String alamatLengkap) {
-		this.alamatLengkap = alamatLengkap;
-	}
-
-	public String getAlamatLengkap() {
-		return this.alamatLengkap;
-	}
-
 	@Column(name = "BlackBerry", nullable = true, length = 10)
 	@Caption(value = "Black Berry")
 	private String blackBerry;
 
-	public void setBlackBerry(String blackBerry) {
-		this.blackBerry = blackBerry;
-	}
-
-	public String getBlackBerry() {
-		return this.blackBerry;
-	}
-
 	@Caption(value = "Desa Kelurahan")
 	private String namaDesaKelurahan;
 
-	public String getNamaDesaKelurahan() {
-		return namaDesaKelurahan;
-	}
-
-	public void setNamaDesaKelurahan(String namaDesaKelurahan) {
-		this.namaDesaKelurahan = namaDesaKelurahan;
-	}
-
 	@Column(name = "Facebook", nullable = true, length = 50)
 	@Caption(value = "Facebook")
 	private String facebook;
 
-	public void setFacebook(String facebook) {
-		this.facebook = facebook;
-	}
-
-	public String getFacebook() {
-		return this.facebook;
-	}
-
 	@Column(name = "Faksimile1", nullable = true, length = 15)
 	@Caption(value = "Faksimile1")
 	private String faksimile1;
 
-	public void setFaksimile1(String faksimile1) {
-		this.faksimile1 = faksimile1;
-	}
-
-	public String getFaksimile1() {
-		return this.faksimile1;
-	}
-
 	@Column(name = "Faksimile2", nullable = true, length = 15)
 	@Caption(value = "Faksimile2")
 	private String faksimile2;
 
-	public void setFaksimile2(String faksimile2) {
-		this.faksimile2 = faksimile2;
-	}
-
-	public String getFaksimile2() {
-		return this.faksimile2;
-	}
-
 	@Column(name = "FixedPhone1", nullable = true, length = 15)
 	@Caption(value = "Fixed Phone1")
 	private String fixedPhone1;
 
-	public void setFixedPhone1(String fixedPhone1) {
-		this.fixedPhone1 = fixedPhone1;
-	}
-
-	public String getFixedPhone1() {
-		return this.fixedPhone1;
-	}
-
 	@Column(name = "FixedPhone2", nullable = true, length = 15)
 	@Caption(value = "Fixed Phone2")
 	private String fixedPhone2;
 
-	public void setFixedPhone2(String fixedPhone2) {
-		this.fixedPhone2 = fixedPhone2;
-	}
-
-	public String getFixedPhone2() {
-		return this.fixedPhone2;
-	}
-
 	@Caption(value = "Is Billing Address")
-	// @NotNull(message="Is Billing Address tidak boleh kosong")
 	@Column(name = "isBillingAddress", nullable = true)
 	private Byte isBillingAddress;
 
-	public Byte getIsBillingAddress() {
-		return isBillingAddress;
-	}
-
-	public void setIsBillingAddress(Byte isBillingAddress) {
-		this.isBillingAddress = isBillingAddress;
-	}
-
 	@Caption(value = "Is Primary Address")
-	// @NotNull(message="Is Primary Address tidak boleh kosong")
 	@Column(name = "isPrimaryAddress", nullable = true)
 	private Byte isPrimaryAddress;
 
-	public Byte getIsPrimaryAddress() {
-		return isPrimaryAddress;
-	}
-
-	public void setIsPrimaryAddress(Byte isPrimaryAddress) {
-		this.isPrimaryAddress = isPrimaryAddress;
-	}
-
 	@Caption(value = "Is Shipping Address")
-	// @NotNull(message="Is Shipping Address tidak boleh kosong")
 	@Column(name = "isShippingAddress", nullable = true)
 	private Byte isShippingAddress;
 
-	public Byte getIsShippingAddress() {
-		return isShippingAddress;
-	}
-
-	public void setIsShippingAddress(Byte isShippingAddress) {
-		this.isShippingAddress = isShippingAddress;
-	}
-
 	@Caption(value = "Kode Alamat")
-	// @NotNull(message="Kd Alamat tidak boleh kosong")
 	@Column(name = "KdAlamat", nullable = true)
 	private Integer kdAlamat;
 
-	public Integer getKdAlamat() {
-		return kdAlamat;
-	}
-
-	public void setKdAlamat(Integer kdAlamat) {
-		this.kdAlamat = kdAlamat;
-	}
-
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "ObjectDesaKelurahanFk")
 	@Caption(value = "Object Desa Kelurahan")
 	private DesaKelurahan desaKelurahan;
 
-	public void setDesaKelurahan(DesaKelurahan desaKelurahan) {
-		this.desaKelurahan = desaKelurahan;
-	}
-
-	public DesaKelurahan getDesaKelurahan() {
-		return this.desaKelurahan;
-	}
-
 	@Column(name = "ObjectDesaKelurahanFk", insertable = false, updatable = false)
 	private Integer desaKelurahanId;
 
-	public Integer getDesaKelurahanId() {
-		return desaKelurahanId;
-	}
-
-	public void setDesaKelurahanId(Integer desaKelurahanId) {
-		this.desaKelurahanId = desaKelurahanId;
-	}
-
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "ObjectHubunganKeluargaFk")
-
 	@Caption(value = "Object Hubungan Keluarga")
 	private HubunganKeluarga hubunganKeluarga;
 
-	public void setHubunganKeluarga(HubunganKeluarga hubunganKeluarga) {
-		this.hubunganKeluarga = hubunganKeluarga;
-	}
-
-	public HubunganKeluarga getHubunganKeluarga() {
-		return this.hubunganKeluarga;
-	}
-
 	@Column(name = "ObjectHubunganKeluargaFk", insertable = false, updatable = false)
 	private Integer hubunganKeluargaId;
 
-	public Integer getHubunganKeluargaId() {
-		return hubunganKeluargaId;
-	}
-
-	public void setHubunganKeluargaId(Integer hubunganKeluargaId) {
-		this.hubunganKeluargaId = hubunganKeluargaId;
-	}
-
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "ObjectJenisAlamatFk")
 	@Caption(value = "Object Jenis Alamat")
 	private JenisAlamat jenisAlamat;
 
-	public void setJenisAlamat(JenisAlamat jenisAlamat) {
-		this.jenisAlamat = jenisAlamat;
-	}
-
-	public JenisAlamat getJenisAlamat() {
-		return this.jenisAlamat;
-	}
-
 	@Column(name = "ObjectJenisAlamatFk", insertable = false, updatable = false)
 	private Integer jenisAlamatId;
 
-	public Integer getJenisAlamatId() {
-		return jenisAlamatId;
-	}
-
-	public void setJenisAlamatId(Integer jenisAlamatId) {
-		this.jenisAlamatId = jenisAlamatId;
-	}
-
 	@Column(name = "ObjectKecamatanFk", insertable = false, updatable = false)
 	private Integer kecamatanId;
 
-	public Integer getKecamatanId() {
-		return kecamatanId;
-	}
-
-	public void setKecamatanId(Integer kecamatanId) {
-		this.kecamatanId = kecamatanId;
-	}
-
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "ObjectKecamatanFk")
 	@Caption(value = "Object Kecamatan")
@@ -281,301 +124,267 @@ public class Alamat extends BaseMaster {
 	@Caption(value = "Object Kota Kabupaten")
 	private KotaKabupaten kotaKabupaten;
 
-	public void setKotaKabupaten(KotaKabupaten kotaKabupaten) {
-		this.kotaKabupaten = kotaKabupaten;
-	}
-
-	public KotaKabupaten getKotaKabupaten() {
-		return this.kotaKabupaten;
-	}
-
 	@Column(name = "ObjectKotaKabupatenFk", insertable = false, updatable = false)
 	private Integer kotaKabupatenId;
 
-	public Integer getKotaKabupatenId() {
-		return kotaKabupatenId;
-	}
-
-	public void setKotaKabupatenId(Integer kotaKabupatenId) {
-		this.kotaKabupatenId = kotaKabupatenId;
-	}
-
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "ObjectNegaraFk")
-
 	@Caption(value = "Object Negara")
 	private Negara negara;
 
-	public void setNegara(Negara negara) {
-		this.negara = negara;
-	}
-
-	public Negara getNegara() {
-		return this.negara;
-	}
-
 	@Column(name = "ObjectNegaraFk", insertable = false, updatable = false)
 	private Integer negaraId;
 
-	public Integer getNegaraId() {
-		return negaraId;
-	}
-
-	public void setNegaraId(Integer negaraId) {
-		this.negaraId = negaraId;
-	}
-
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "ObjectPegawaiFk")
-
 	@Caption(value = "Object Pegawai")
 	private LoginUser pegawai;
 
-	public void setPegawai(LoginUser pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public LoginUser getPegawai() {
-		return this.pegawai;
-	}
-
 	@Column(name = "ObjectPegawaiFk", insertable = false, updatable = false, nullable = true)
 	private Integer pegawaiId;
 
-	public Integer getPegawaiId() {
-		return pegawaiId;
-	}
-
-	public void setPegawaiId(Integer pegawaiId) {
-		this.pegawaiId = pegawaiId;
-	}
-
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "ObjectPropinsiFk")
 	@Caption(value = "Object Propinsi")
 	private Propinsi propinsi;
 
-	public void setPropinsi(Propinsi propinsi) {
-		this.propinsi = propinsi;
-	}
-
-	public Propinsi getPropinsi() {
-		return this.propinsi;
-	}
-
 	@Column(name = "ObjectPropinsiFk", insertable = false, updatable = false)
 	private Integer propinsiId;
 
-	public Integer getPropinsiId() {
-		return propinsiId;
-	}
-
-	public void setPropinsiId(Integer propinsiId) {
-		this.propinsiId = propinsiId;
-	}
-
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "ObjectRekananFk")
 	@Caption(value = "Object Rekanan")
 	private Rekanan rekanan;
 
-	public void setRekanan(Rekanan rekanan) {
-		this.rekanan = rekanan;
-	}
-
-	public Rekanan getRekanan() {
-		return this.rekanan;
-	}
-
 	@Column(name = "ObjectRekananFk", insertable = false, updatable = false, nullable = false)
 	private Integer rekananId;
 
-	public Integer getRekananId() {
-		return rekananId;
-	}
-
-	public void setRekananId(Integer rekananId) {
-		this.rekananId = rekananId;
-	}
-
 	@Caption(value = "Kecamatan")
-	private String namaKecamatan;
-
 	@Column(name = "Kecamatan", nullable = true, length = 50)
-	public String getNamaKecamatan() {
-		return namaKecamatan;
-	}
-
-	public void setNamaKecamatan(String namaKecamatan) {
-		this.namaKecamatan = namaKecamatan;
-	}
+	private String namaKecamatan;
 
 	@Column(name = "KeteranganLainnya", nullable = true, length = 150)
 	@Caption(value = "Keterangan Lainnya")
 	private String keteranganLainnya;
 
-	public void setKeteranganLainnya(String keteranganLainnya) {
-		this.keteranganLainnya = keteranganLainnya;
-	}
-
-	public String getKeteranganLainnya() {
-		return this.keteranganLainnya;
-	}
-
 	@Caption(value = "Kode Pos")
+	@Column(name = "KodePos", nullable = true, length = 10)
 	private String kodePos;
 
-	@Column(name = "KodePos", nullable = true, length = 10)
-	public String getKodePos() {
-		return kodePos;
-	}
-
-	public void setKodePos(String kodePos) {
-		this.kodePos = kodePos;
-	}
-
 	@Caption(value = "Kota Kabupaten")
-	private String namaKotaKabupaten;
-
 	@Column(name = "KotaKabupaten", nullable = true, length = 50)
-	public String getNamaKotaKabupaten() {
-		return namaKotaKabupaten;
-	}
-
-	public void setNamaKotaKabupaten(String namaKotaKabupaten) {
-		this.namaKotaKabupaten = namaKotaKabupaten;
-	}
+	private String namaKotaKabupaten;
 
 	@Column(name = "Line", nullable = true, length = 50)
 	@Caption(value = "Line")
 	private String line;
 
-	public void setLine(String line) {
-		this.line = line;
-	}
-
-	public String getLine() {
-		return this.line;
-	}
-
 	@Column(name = "MobilePhone1", nullable = true, length = 15)
 	@Caption(value = "Mobile Phone1")
 	private String mobilePhone1;
 
-	public void setMobilePhone1(String mobilePhone1) {
-		this.mobilePhone1 = mobilePhone1;
-	}
-
-	public String getMobilePhone1() {
-		return this.mobilePhone1;
-	}
-
 	@Column(name = "MobilePhone2", nullable = true, length = 15)
 	@Caption(value = "Mobile Phone2")
 	private String mobilePhone2;
 
-	public void setMobilePhone2(String mobilePhone2) {
-		this.mobilePhone2 = mobilePhone2;
-	}
-
-	public String getMobilePhone2() {
-		return this.mobilePhone2;
-	}
-
 	@Column(name = "NamaTempatGedung", nullable = true, length = 150)
 	@Caption(value = "Nama Tempat Gedung")
 	private String namaTempatGedung;
 
-	public void setNamaTempatGedung(String namaTempatGedung) {
-		this.namaTempatGedung = namaTempatGedung;
-	}
-
-	public String getNamaTempatGedung() {
-		return this.namaTempatGedung;
-	}
-
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "NoCMFk")
 	@Caption(value = "No C M")
 	@JsonBackReference
 	private Pasien pasien;
 
-	public Pasien getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(Pasien pasien) {
-		this.pasien = pasien;
-	}
-
 	@Column(name = "NoCMFk", insertable = false, updatable = false)
 	private Integer pasienId;
 
-	public Integer getPasienId() {
-		return pasienId;
-	}
-
-	public void setPasienId(Integer pasienId) {
-		this.pasienId = pasienId;
-	}
-
 	@Caption(value = "RT R W")
 	private String rtrw;
 
-	public String getRtrw() {
-		return rtrw;
-	}
-
-	public void setRtrw(String rtrw) {
-		this.rtrw = rtrw;
-	}
-
 	@Caption(value = "Twitter")
-	private String twitter;
-
 	@Column(name = "Twitter", nullable = true, length = 50)
-	public String getTwitter() {
-		return twitter;
-	}
-
-	public void setTwitter(String twitter) {
-		this.twitter = twitter;
-	}
+	private String twitter;
 
 	@Column(name = "Website", nullable = true, length = 80)
 	@Caption(value = "Website")
 	private String website;
 
-	public void setWebsite(String website) {
-		this.website = website;
-	}
-
-	public String getWebsite() {
-		return this.website;
-	}
-
 	@Column(name = "WhatsApp", nullable = true, length = 15)
 	@Caption(value = "Whats App")
 	private String whatsApp;
 
-	public void setWhatsApp(String whatsApp) {
-		this.whatsApp = whatsApp;
-	}
-
-	public String getWhatsApp() {
-		return this.whatsApp;
-	}
-
 	@Column(name = "YahooMessenger", nullable = true, length = 50)
 	@Caption(value = "Yahoo Messenger")
 	private String yahooMessenger;
 
-	public void setYahooMessenger(String yahooMessenger) {
-		this.yahooMessenger = yahooMessenger;
+	public Integer getId() {
+		return id;
 	}
 
-	public String getYahooMessenger() {
-		return this.yahooMessenger;
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getAlamatEmail() {
+		return alamatEmail;
+	}
+
+	public void setAlamatEmail(String alamatEmail) {
+		this.alamatEmail = alamatEmail;
+	}
+
+	public String getAlamatLengkap() {
+		return alamatLengkap;
+	}
+
+	public void setAlamatLengkap(String alamatLengkap) {
+		this.alamatLengkap = alamatLengkap;
+	}
+
+	public String getBlackBerry() {
+		return blackBerry;
+	}
+
+	public void setBlackBerry(String blackBerry) {
+		this.blackBerry = blackBerry;
+	}
+
+	public String getNamaDesaKelurahan() {
+		return namaDesaKelurahan;
+	}
+
+	public void setNamaDesaKelurahan(String namaDesaKelurahan) {
+		this.namaDesaKelurahan = namaDesaKelurahan;
+	}
+
+	public String getFacebook() {
+		return facebook;
+	}
+
+	public void setFacebook(String facebook) {
+		this.facebook = facebook;
+	}
+
+	public String getFaksimile1() {
+		return faksimile1;
+	}
+
+	public void setFaksimile1(String faksimile1) {
+		this.faksimile1 = faksimile1;
+	}
+
+	public String getFaksimile2() {
+		return faksimile2;
+	}
+
+	public void setFaksimile2(String faksimile2) {
+		this.faksimile2 = faksimile2;
+	}
+
+	public String getFixedPhone1() {
+		return fixedPhone1;
+	}
+
+	public void setFixedPhone1(String fixedPhone1) {
+		this.fixedPhone1 = fixedPhone1;
+	}
+
+	public String getFixedPhone2() {
+		return fixedPhone2;
+	}
+
+	public void setFixedPhone2(String fixedPhone2) {
+		this.fixedPhone2 = fixedPhone2;
+	}
+
+	public Byte getIsBillingAddress() {
+		return isBillingAddress;
+	}
+
+	public void setIsBillingAddress(Byte isBillingAddress) {
+		this.isBillingAddress = isBillingAddress;
+	}
+
+	public Byte getIsPrimaryAddress() {
+		return isPrimaryAddress;
+	}
+
+	public void setIsPrimaryAddress(Byte isPrimaryAddress) {
+		this.isPrimaryAddress = isPrimaryAddress;
+	}
+
+	public Byte getIsShippingAddress() {
+		return isShippingAddress;
+	}
+
+	public void setIsShippingAddress(Byte isShippingAddress) {
+		this.isShippingAddress = isShippingAddress;
+	}
+
+	public Integer getKdAlamat() {
+		return kdAlamat;
+	}
+
+	public void setKdAlamat(Integer kdAlamat) {
+		this.kdAlamat = kdAlamat;
+	}
+
+	public DesaKelurahan getDesaKelurahan() {
+		return desaKelurahan;
+	}
+
+	public void setDesaKelurahan(DesaKelurahan desaKelurahan) {
+		this.desaKelurahan = desaKelurahan;
+	}
+
+	public Integer getDesaKelurahanId() {
+		return desaKelurahanId;
+	}
+
+	public void setDesaKelurahanId(Integer desaKelurahanId) {
+		this.desaKelurahanId = desaKelurahanId;
+	}
+
+	public HubunganKeluarga getHubunganKeluarga() {
+		return hubunganKeluarga;
+	}
+
+	public void setHubunganKeluarga(HubunganKeluarga hubunganKeluarga) {
+		this.hubunganKeluarga = hubunganKeluarga;
+	}
+
+	public Integer getHubunganKeluargaId() {
+		return hubunganKeluargaId;
+	}
+
+	public void setHubunganKeluargaId(Integer hubunganKeluargaId) {
+		this.hubunganKeluargaId = hubunganKeluargaId;
+	}
+
+	public JenisAlamat getJenisAlamat() {
+		return jenisAlamat;
+	}
+
+	public void setJenisAlamat(JenisAlamat jenisAlamat) {
+		this.jenisAlamat = jenisAlamat;
+	}
+
+	public Integer getJenisAlamatId() {
+		return jenisAlamatId;
+	}
+
+	public void setJenisAlamatId(Integer jenisAlamatId) {
+		this.jenisAlamatId = jenisAlamatId;
+	}
+
+	public Integer getKecamatanId() {
+		return kecamatanId;
+	}
+
+	public void setKecamatanId(Integer kecamatanId) {
+		this.kecamatanId = kecamatanId;
 	}
 
 	public Kecamatan getKecamatan() {
@@ -586,19 +395,203 @@ public class Alamat extends BaseMaster {
 		this.kecamatan = kecamatan;
 	}
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.alamat_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.alamat_m_id_seq", sequenceName = "public.alamat_m_id_seq", allocationSize = 1)
-	@Column(name = "id")
-	protected Integer id;
-
-	public Integer getId() {
-
-		return id;
+	public KotaKabupaten getKotaKabupaten() {
+		return kotaKabupaten;
 	}
 
-	public void setId(Integer id) {
-		this.id = id;
+	public void setKotaKabupaten(KotaKabupaten kotaKabupaten) {
+		this.kotaKabupaten = kotaKabupaten;
+	}
+
+	public Integer getKotaKabupatenId() {
+		return kotaKabupatenId;
+	}
+
+	public void setKotaKabupatenId(Integer kotaKabupatenId) {
+		this.kotaKabupatenId = kotaKabupatenId;
+	}
+
+	public Negara getNegara() {
+		return negara;
+	}
+
+	public void setNegara(Negara negara) {
+		this.negara = negara;
+	}
+
+	public Integer getNegaraId() {
+		return negaraId;
+	}
+
+	public void setNegaraId(Integer negaraId) {
+		this.negaraId = negaraId;
+	}
+
+	public LoginUser getPegawai() {
+		return pegawai;
+	}
+
+	public void setPegawai(LoginUser pegawai) {
+		this.pegawai = pegawai;
+	}
+
+	public Integer getPegawaiId() {
+		return pegawaiId;
+	}
+
+	public void setPegawaiId(Integer pegawaiId) {
+		this.pegawaiId = pegawaiId;
+	}
+
+	public Propinsi getPropinsi() {
+		return propinsi;
+	}
+
+	public void setPropinsi(Propinsi propinsi) {
+		this.propinsi = propinsi;
+	}
+
+	public Integer getPropinsiId() {
+		return propinsiId;
+	}
+
+	public void setPropinsiId(Integer propinsiId) {
+		this.propinsiId = propinsiId;
+	}
+
+	public Rekanan getRekanan() {
+		return rekanan;
+	}
+
+	public void setRekanan(Rekanan rekanan) {
+		this.rekanan = rekanan;
+	}
+
+	public Integer getRekananId() {
+		return rekananId;
+	}
+
+	public void setRekananId(Integer rekananId) {
+		this.rekananId = rekananId;
+	}
+
+	public String getNamaKecamatan() {
+		return namaKecamatan;
+	}
+
+	public void setNamaKecamatan(String namaKecamatan) {
+		this.namaKecamatan = namaKecamatan;
+	}
+
+	public String getKeteranganLainnya() {
+		return keteranganLainnya;
+	}
+
+	public void setKeteranganLainnya(String keteranganLainnya) {
+		this.keteranganLainnya = keteranganLainnya;
+	}
+
+	public String getKodePos() {
+		return kodePos;
+	}
+
+	public void setKodePos(String kodePos) {
+		this.kodePos = kodePos;
+	}
+
+	public String getNamaKotaKabupaten() {
+		return namaKotaKabupaten;
+	}
+
+	public void setNamaKotaKabupaten(String namaKotaKabupaten) {
+		this.namaKotaKabupaten = namaKotaKabupaten;
+	}
+
+	public String getLine() {
+		return line;
+	}
+
+	public void setLine(String line) {
+		this.line = line;
+	}
+
+	public String getMobilePhone1() {
+		return mobilePhone1;
+	}
+
+	public void setMobilePhone1(String mobilePhone1) {
+		this.mobilePhone1 = mobilePhone1;
+	}
+
+	public String getMobilePhone2() {
+		return mobilePhone2;
+	}
+
+	public void setMobilePhone2(String mobilePhone2) {
+		this.mobilePhone2 = mobilePhone2;
+	}
+
+	public String getNamaTempatGedung() {
+		return namaTempatGedung;
+	}
+
+	public void setNamaTempatGedung(String namaTempatGedung) {
+		this.namaTempatGedung = namaTempatGedung;
+	}
+
+	public Pasien getPasien() {
+		return pasien;
+	}
+
+	public void setPasien(Pasien pasien) {
+		this.pasien = pasien;
+	}
+
+	public Integer getPasienId() {
+		return pasienId;
+	}
+
+	public void setPasienId(Integer pasienId) {
+		this.pasienId = pasienId;
+	}
+
+	public String getRtrw() {
+		return rtrw;
+	}
+
+	public void setRtrw(String rtrw) {
+		this.rtrw = rtrw;
+	}
+
+	public String getTwitter() {
+		return twitter;
+	}
+
+	public void setTwitter(String twitter) {
+		this.twitter = twitter;
+	}
+
+	public String getWebsite() {
+		return website;
+	}
+
+	public void setWebsite(String website) {
+		this.website = website;
+	}
+
+	public String getWhatsApp() {
+		return whatsApp;
+	}
+
+	public void setWhatsApp(String whatsApp) {
+		this.whatsApp = whatsApp;
+	}
+
+	public String getYahooMessenger() {
+		return yahooMessenger;
+	}
+
+	public void setYahooMessenger(String yahooMessenger) {
+		this.yahooMessenger = yahooMessenger;
 	}
-	
 }
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AlamatVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AlamatVO.java
index 2c822135..0352d20d 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AlamatVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AlamatVO.java
@@ -9,44 +9,161 @@ import com.jasamedika.medifirst2000.helper.Caption;
  * @author Generator
  */
 public class AlamatVO extends BaseMasterVO {
-	
+
+	private static final long serialVersionUID = 3125504058977184317L;
+
 	@Caption(value="AlamatVO Email")
 	private String alamatEmail;
 
+	@Caption(value="AlamatVO Lengkap")
+	private String alamatLengkap;
+
+	@Caption(value="Black Berry")
+	private String blackBerry;
+
+	@Caption(value="Desa Kelurahan")
+	private String namaDesaKelurahan;
+
+	@Caption(value="Facebook")
+	private String facebook;
+
+	@Caption(value="Faksimile1")
+	private String faksimile1;
+
+	@Caption(value="Faksimile2")
+	private String faksimile2;
+
+	@Caption(value="Fixed Phone1")
+	private String fixedPhone1;
+
+	@Caption(value="Fixed Phone2")
+	private String fixedPhone2;
+
+	@Caption(value="Is Billing Address")
+	private Byte isBillingAddress;
+
+	@Caption(value="Is Primary Address")
+	private Byte isPrimaryAddress;
+
+	@Caption(value="Is Shipping Address")
+	private Byte isShippingAddress;
+
+	@Caption(value="Kode Alamat")
+	private Integer kdAlamat;
+
+	@Caption(value="Object Desa Kelurahan")
+	private DesaKelurahanVO desaKelurahan;
+
+	private Integer desaKelurahanId;
+
+	@Caption(value="Object Hubungan Keluarga")
+	private HubunganKeluargaVO hubunganKeluarga;
+
+	private Integer hubunganKeluargaId;
+
+	@Caption(value="Object Jenis Alamat")
+	private JenisAlamatVO jenisAlamat;
+
+	private Integer jenisAlamatId;
+
+	@Caption(value="Object Kecamatan")
+	private KecamatanVO kecamatan;
+
+	private Integer kecamatanId;
+
+	@Caption(value="Object Kota Kabupaten")
+	private KotaKabupatenVO kotaKabupaten;
+
+	private Integer kotaKabupatenId;
+
+	@Caption(value="Object Negara")
+	private NegaraVO negara;
+
+	private Integer negaraId;
+
+	@Caption(value="Object Pegawai")
+	private LoginUserVO pegawai;
+
+	private Integer pegawaiId;
+
+	@Caption(value="Object Propinsi")
+	private PropinsiVO propinsi;
+
+	private Integer propinsiId;
+
+	@Caption(value="Object Rekanan")
+	private RekananVO rekanan;
+
+	private Integer rekananId;
+
+	@Caption(value="Kecamatan")
+	private String namaKecamatan;
+
+	@Caption(value="Keterangan Lainnya")
+	private String keteranganLainnya;
+
+	@Caption(value="Kode Pos")
+	private String kodePos;
+
+	@Caption(value="Kota Kabupaten")
+	private String namaKotaKabupaten;
+
+	@Caption(value="Line")
+	private String line;
+
+	@Caption(value="Mobile Phone1")
+	private String mobilePhone1;
+
+	@Caption(value="Mobile Phone2")
+	private String mobilePhone2;
+
+	@Caption(value="Nama Tempat Gedung")
+	private String namaTempatGedung;
+
+	@Caption(value="No C M")
+	private PasienVO pasien;
+
+	private Integer pasienId;
+
+	@Caption(value="RT R W")
+	private String rtrw;
+
+	@Caption(value="Twitter")
+	private String twitter;
+
+	@Caption(value="Website")
+	private String website;
+
+	@Caption(value="Whats App")
+	private String whatsApp;
+
+	@Caption(value="Yahoo Messenger")
+	private String yahooMessenger;
+
+	public String getAlamatEmail() {
+		return alamatEmail;
+	}
+
 	public void setAlamatEmail(String alamatEmail) {
 		this.alamatEmail = alamatEmail;
 	}
 
-	public String getAlamatEmail(){
-		return this.alamatEmail;
+	public String getAlamatLengkap() {
+		return alamatLengkap;
 	}
 
-	@Caption(value="AlamatVO Lengkap")
-	private String alamatLengkap;
-
 	public void setAlamatLengkap(String alamatLengkap) {
 		this.alamatLengkap = alamatLengkap;
 	}
 
-	public String getAlamatLengkap(){
-		return this.alamatLengkap;
+	public String getBlackBerry() {
+		return blackBerry;
 	}
 
-	@Caption(value="Black Berry")
-	private String blackBerry;
-
 	public void setBlackBerry(String blackBerry) {
 		this.blackBerry = blackBerry;
 	}
 
-	public String getBlackBerry(){
-		return this.blackBerry;
-	}
-
-	@Caption(value="Desa Kelurahan")
-	private String namaDesaKelurahan;
-
-
 	public String getNamaDesaKelurahan() {
 		return namaDesaKelurahan;
 	}
@@ -55,65 +172,46 @@ public class AlamatVO extends BaseMasterVO {
 		this.namaDesaKelurahan = namaDesaKelurahan;
 	}
 
-	@Caption(value="Facebook")
-	private String facebook;
+	public String getFacebook() {
+		return facebook;
+	}
 
 	public void setFacebook(String facebook) {
 		this.facebook = facebook;
 	}
 
-	public String getFacebook(){
-		return this.facebook;
+	public String getFaksimile1() {
+		return faksimile1;
 	}
 
-	@Caption(value="Faksimile1")
-	private String faksimile1;
-
 	public void setFaksimile1(String faksimile1) {
 		this.faksimile1 = faksimile1;
 	}
 
-	public String getFaksimile1(){
-		return this.faksimile1;
+	public String getFaksimile2() {
+		return faksimile2;
 	}
 
-	@Caption(value="Faksimile2")
-	private String faksimile2;
-
 	public void setFaksimile2(String faksimile2) {
 		this.faksimile2 = faksimile2;
 	}
 
-	public String getFaksimile2(){
-		return this.faksimile2;
+	public String getFixedPhone1() {
+		return fixedPhone1;
 	}
 
-	@Caption(value="Fixed Phone1")
-	private String fixedPhone1;
-
 	public void setFixedPhone1(String fixedPhone1) {
 		this.fixedPhone1 = fixedPhone1;
 	}
 
-	public String getFixedPhone1(){
-		return this.fixedPhone1;
+	public String getFixedPhone2() {
+		return fixedPhone2;
 	}
 
-	@Caption(value="Fixed Phone2")
-	private String fixedPhone2;
-
 	public void setFixedPhone2(String fixedPhone2) {
 		this.fixedPhone2 = fixedPhone2;
 	}
 
-	public String getFixedPhone2(){
-		return this.fixedPhone2;
-	}
-
-	@Caption(value="Is Billing Address")
-	private Byte isBillingAddress;
-
-	
 	public Byte getIsBillingAddress() {
 		return isBillingAddress;
 	}
@@ -122,10 +220,6 @@ public class AlamatVO extends BaseMasterVO {
 		this.isBillingAddress = isBillingAddress;
 	}
 
-	@Caption(value="Is Primary Address")
-	private Byte isPrimaryAddress;
-
-	
 	public Byte getIsPrimaryAddress() {
 		return isPrimaryAddress;
 	}
@@ -134,9 +228,6 @@ public class AlamatVO extends BaseMasterVO {
 		this.isPrimaryAddress = isPrimaryAddress;
 	}
 
-	@Caption(value="Is Shipping Address")
-	private Byte isShippingAddress;
-
 	public Byte getIsShippingAddress() {
 		return isShippingAddress;
 	}
@@ -145,9 +236,6 @@ public class AlamatVO extends BaseMasterVO {
 		this.isShippingAddress = isShippingAddress;
 	}
 
-	@Caption(value="Kode Alamat")
-	private Integer kdAlamat;
-
 	public Integer getKdAlamat() {
 		return kdAlamat;
 	}
@@ -156,21 +244,14 @@ public class AlamatVO extends BaseMasterVO {
 		this.kdAlamat = kdAlamat;
 	}
 
-	@Caption(value="Object Desa Kelurahan")
-	private DesaKelurahanVO desaKelurahan;
+	public DesaKelurahanVO getDesaKelurahan() {
+		return desaKelurahan;
+	}
 
 	public void setDesaKelurahan(DesaKelurahanVO desaKelurahan) {
 		this.desaKelurahan = desaKelurahan;
 	}
 
-	public DesaKelurahanVO getDesaKelurahan(){
-		return this.desaKelurahan;
-	}
-
-	private Integer desaKelurahanId;
-	
-	
-
 	public Integer getDesaKelurahanId() {
 		return desaKelurahanId;
 	}
@@ -179,21 +260,14 @@ public class AlamatVO extends BaseMasterVO {
 		this.desaKelurahanId = desaKelurahanId;
 	}
 
-	@Caption(value="Object Hubungan Keluarga")
-	private HubunganKeluargaVO hubunganKeluarga;
+	public HubunganKeluargaVO getHubunganKeluarga() {
+		return hubunganKeluarga;
+	}
 
 	public void setHubunganKeluarga(HubunganKeluargaVO hubunganKeluarga) {
 		this.hubunganKeluarga = hubunganKeluarga;
 	}
 
-	public HubunganKeluargaVO getHubunganKeluarga(){
-		return this.hubunganKeluarga;
-	}
-
-	private Integer hubunganKeluargaId;
-	
-	
-
 	public Integer getHubunganKeluargaId() {
 		return hubunganKeluargaId;
 	}
@@ -202,19 +276,14 @@ public class AlamatVO extends BaseMasterVO {
 		this.hubunganKeluargaId = hubunganKeluargaId;
 	}
 
-	@Caption(value="Object Jenis Alamat")
-	private JenisAlamatVO jenisAlamat;
+	public JenisAlamatVO getJenisAlamat() {
+		return jenisAlamat;
+	}
 
 	public void setJenisAlamat(JenisAlamatVO jenisAlamat) {
 		this.jenisAlamat = jenisAlamat;
 	}
 
-	public JenisAlamatVO getJenisAlamat(){
-		return this.jenisAlamat;
-	}
-
-	private Integer jenisAlamatId;
-
 	public Integer getJenisAlamatId() {
 		return jenisAlamatId;
 	}
@@ -223,21 +292,14 @@ public class AlamatVO extends BaseMasterVO {
 		this.jenisAlamatId = jenisAlamatId;
 	}
 
-	@Caption(value="Object Kecamatan")
-	private KecamatanVO kecamatan;
+	public KecamatanVO getKecamatan() {
+		return kecamatan;
+	}
 
 	public void setKecamatan(KecamatanVO kecamatan) {
 		this.kecamatan = kecamatan;
 	}
 
-	public KecamatanVO getKecamatan(){
-		return this.kecamatan;
-	}
-
-	private Integer kecamatanId;
-	
-	
-
 	public Integer getKecamatanId() {
 		return kecamatanId;
 	}
@@ -246,20 +308,14 @@ public class AlamatVO extends BaseMasterVO {
 		this.kecamatanId = kecamatanId;
 	}
 
-	@Caption(value="Object Kota Kabupaten")
-	private KotaKabupatenVO kotaKabupaten;
+	public KotaKabupatenVO getKotaKabupaten() {
+		return kotaKabupaten;
+	}
 
 	public void setKotaKabupaten(KotaKabupatenVO kotaKabupaten) {
 		this.kotaKabupaten = kotaKabupaten;
 	}
 
-	public KotaKabupatenVO getKotaKabupaten(){
-		return this.kotaKabupaten;
-	}
-
-	private Integer kotaKabupatenId;
-	
-
 	public Integer getKotaKabupatenId() {
 		return kotaKabupatenId;
 	}
@@ -268,20 +324,14 @@ public class AlamatVO extends BaseMasterVO {
 		this.kotaKabupatenId = kotaKabupatenId;
 	}
 
-	@Caption(value="Object Negara")
-	private NegaraVO negara;
+	public NegaraVO getNegara() {
+		return negara;
+	}
 
 	public void setNegara(NegaraVO negara) {
 		this.negara = negara;
 	}
 
-	public NegaraVO getNegara(){
-		return this.negara;
-	}
-
-	private Integer negaraId;
-	
-
 	public Integer getNegaraId() {
 		return negaraId;
 	}
@@ -290,21 +340,14 @@ public class AlamatVO extends BaseMasterVO {
 		this.negaraId = negaraId;
 	}
 
-	@Caption(value="Object Pegawai")
-	private LoginUserVO pegawai;
+	public LoginUserVO getPegawai() {
+		return pegawai;
+	}
 
 	public void setPegawai(LoginUserVO pegawai) {
 		this.pegawai = pegawai;
 	}
 
-	public LoginUserVO getPegawai(){
-		return this.pegawai;
-	}
-
-	private Integer pegawaiId;
-	
-	
-
 	public Integer getPegawaiId() {
 		return pegawaiId;
 	}
@@ -313,21 +356,14 @@ public class AlamatVO extends BaseMasterVO {
 		this.pegawaiId = pegawaiId;
 	}
 
-	@Caption(value="Object Propinsi")
-	private PropinsiVO propinsi;
+	public PropinsiVO getPropinsi() {
+		return propinsi;
+	}
 
 	public void setPropinsi(PropinsiVO propinsi) {
 		this.propinsi = propinsi;
 	}
 
-	public PropinsiVO getPropinsi(){
-		return this.propinsi;
-	}
-
-	private Integer propinsiId;
-	
-	
-
 	public Integer getPropinsiId() {
 		return propinsiId;
 	}
@@ -336,20 +372,14 @@ public class AlamatVO extends BaseMasterVO {
 		this.propinsiId = propinsiId;
 	}
 
-	@Caption(value="Object Rekanan")
-	private RekananVO rekanan;
+	public RekananVO getRekanan() {
+		return rekanan;
+	}
 
 	public void setRekanan(RekananVO rekanan) {
 		this.rekanan = rekanan;
 	}
 
-	public RekananVO getRekanan(){
-		return this.rekanan;
-	}
-
-	private Integer rekananId;
-	
-
 	public Integer getRekananId() {
 		return rekananId;
 	}
@@ -358,9 +388,6 @@ public class AlamatVO extends BaseMasterVO {
 		this.rekananId = rekananId;
 	}
 
-	@Caption(value="Kecamatan")
-	private String namaKecamatan;
-
 	public String getNamaKecamatan() {
 		return namaKecamatan;
 	}
@@ -369,21 +396,14 @@ public class AlamatVO extends BaseMasterVO {
 		this.namaKecamatan = namaKecamatan;
 	}
 
-	@Caption(value="Keterangan Lainnya")
-	private String keteranganLainnya;
+	public String getKeteranganLainnya() {
+		return keteranganLainnya;
+	}
 
 	public void setKeteranganLainnya(String keteranganLainnya) {
 		this.keteranganLainnya = keteranganLainnya;
 	}
 
-	public String getKeteranganLainnya(){
-		return this.keteranganLainnya;
-	}
-
-	@Caption(value="Kode Pos")
-	private String kodePos;
-
-	
 	public String getKodePos() {
 		return kodePos;
 	}
@@ -392,9 +412,6 @@ public class AlamatVO extends BaseMasterVO {
 		this.kodePos = kodePos;
 	}
 
-	@Caption(value="Kota Kabupaten")
-	private String namaKotaKabupaten;
-
 	public String getNamaKotaKabupaten() {
 		return namaKotaKabupaten;
 	}
@@ -403,53 +420,38 @@ public class AlamatVO extends BaseMasterVO {
 		this.namaKotaKabupaten = namaKotaKabupaten;
 	}
 
-	@Caption(value="Line")
-	private String line;
+	public String getLine() {
+		return line;
+	}
 
 	public void setLine(String line) {
 		this.line = line;
 	}
 
-	public String getLine(){
-		return this.line;
+	public String getMobilePhone1() {
+		return mobilePhone1;
 	}
 
-	@Caption(value="Mobile Phone1")
-	private String mobilePhone1;
-
 	public void setMobilePhone1(String mobilePhone1) {
 		this.mobilePhone1 = mobilePhone1;
 	}
 
-	public String getMobilePhone1(){
-		return this.mobilePhone1;
+	public String getMobilePhone2() {
+		return mobilePhone2;
 	}
 
-	@Caption(value="Mobile Phone2")
-	private String mobilePhone2;
-
 	public void setMobilePhone2(String mobilePhone2) {
 		this.mobilePhone2 = mobilePhone2;
 	}
 
-	public String getMobilePhone2(){
-		return this.mobilePhone2;
+	public String getNamaTempatGedung() {
+		return namaTempatGedung;
 	}
 
-	@Caption(value="Nama Tempat Gedung")
-	private String namaTempatGedung;
-
 	public void setNamaTempatGedung(String namaTempatGedung) {
 		this.namaTempatGedung = namaTempatGedung;
 	}
 
-	public String getNamaTempatGedung(){
-		return this.namaTempatGedung;
-	}
-
-	@Caption(value="No C M")
-	private PasienVO pasien;
-
 	public PasienVO getPasien() {
 		return pasien;
 	}
@@ -458,10 +460,6 @@ public class AlamatVO extends BaseMasterVO {
 		this.pasien = pasien;
 	}
 
-	private Integer pasienId;
-	
-	
-
 	public Integer getPasienId() {
 		return pasienId;
 	}
@@ -470,11 +468,6 @@ public class AlamatVO extends BaseMasterVO {
 		this.pasienId = pasienId;
 	}
 
-	@Caption(value="RT R W")
-	private String rtrw;
-
-	
-
 	public String getRtrw() {
 		return rtrw;
 	}
@@ -483,9 +476,6 @@ public class AlamatVO extends BaseMasterVO {
 		this.rtrw = rtrw;
 	}
 
-	@Caption(value="Twitter")
-	private String twitter;
-
 	public String getTwitter() {
 		return twitter;
 	}
@@ -494,38 +484,28 @@ public class AlamatVO extends BaseMasterVO {
 		this.twitter = twitter;
 	}
 
-	@Caption(value="Website")
-	private String website;
+	public String getWebsite() {
+		return website;
+	}
 
 	public void setWebsite(String website) {
 		this.website = website;
 	}
 
-	public String getWebsite(){
-		return this.website;
+	public String getWhatsApp() {
+		return whatsApp;
 	}
 
-	@Caption(value="Whats App")
-	private String whatsApp;
-
 	public void setWhatsApp(String whatsApp) {
 		this.whatsApp = whatsApp;
 	}
 
-	public String getWhatsApp(){
-		return this.whatsApp;
+	public String getYahooMessenger() {
+		return yahooMessenger;
 	}
 
-	@Caption(value="Yahoo Messenger")
-	private String yahooMessenger;
-
 	public void setYahooMessenger(String yahooMessenger) {
 		this.yahooMessenger = yahooMessenger;
 	}
-
-	public String getYahooMessenger(){
-		return this.yahooMessenger;
-	}
-
 }