diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
index d3aa7790..337890f3 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs
@@ -1756,16 +1756,16 @@ namespace BMA.EHR.Placement.Service.Controllers
                                           relationship = p.Relationship == null ? string.Empty : p.Relationship,
                                           religion = p.Religion == null ? string.Empty : p.Religion,
                                           bloodGroup = string.Empty,
-                                          registrationAddress = p.RegistAddress == null ? string.Empty : p.RegistAddress,
+                                          registrationAddress = string.IsNullOrWhiteSpace(p.RegistAddress) ? string.Empty : p.RegistAddress,
                                           registrationProvinceId = p.RegistProvinceId ?? null,
                                           registrationDistrictId = p.RegistDistrictId ?? null,
                                           registrationSubDistrictId = p.RegistSubDistrictId ?? null,
-                                          registrationZipCode = p.RegistZipCode == null ? string.Empty : p.RegistZipCode,
-                                          currentAddress = p.CurrentAddress == null ? string.Empty : p.CurrentAddress,
+                                          registrationZipCode = p.RegistZipCode == null ? null : p.RegistZipCode,
+                                          currentAddress = string.IsNullOrWhiteSpace(p.CurrentAddress) ? string.Empty : p.CurrentAddress,
                                           currentProvinceId = p.CurrentProvinceId ?? null,
                                           currentDistrictId = p.CurrentDistrictId ?? null,
                                           currentSubDistrictId = p.CurrentSubDistrictId ?? null,
-                                          currentZipCode = p.CurrentZipCode == null ? string.Empty : p.CurrentZipCode,
+                                          currentZipCode = p.CurrentZipCode == null ? null : p.CurrentZipCode,
                                           amount = r.amount,
                                           amountSpecial = r.amountSpecial,
                                       },
@@ -2107,16 +2107,20 @@ namespace BMA.EHR.Placement.Service.Controllers
                                           relationship = p.Relationship == null ? string.Empty : p.Relationship,
                                           religion = p.Religion == null ? string.Empty : p.Religion,
                                           bloodGroup = p.BloodGroup,
-                                          registrationAddress = p.RegistAddress == null ? string.Empty : p.RegistAddress,
-                                          registrationProvinceId = p.RegistProvinceId,
-                                          registrationDistrictId = p.RegistDistrictId,
-                                          registrationSubDistrictId = p.RegistSubDistrictId,
-                                          registrationZipCode = p.RegistZipCode == null ? string.Empty : p.RegistZipCode,
-                                          currentAddress = p.CurrentAddress == null ? string.Empty : p.CurrentAddress,
-                                          currentProvinceId = p.CurrentProvinceId,
-                                          currentDistrictId = p.CurrentDistrictId,
-                                          currentSubDistrictId = p.CurrentSubDistrictId,
-                                          currentZipCode = p.CurrentZipCode == null ? string.Empty : p.CurrentZipCode,
+                                          registrationAddress = string.IsNullOrWhiteSpace(p.RegistAddress) ? string.Empty : p.RegistAddress,
+                                          registrationProvinceId = p.RegistProvinceId ?? null,
+                                          registrationDistrictId = p.RegistDistrictId ?? null,
+                                          registrationSubDistrictId = p.RegistSubDistrictId ?? null,
+                                          registrationZipCode = p.RegistZipCode == null ? null : p.RegistZipCode,
+                                          currentAddress = p.RegistSame == true
+                                            ? (string.IsNullOrWhiteSpace(p.RegistAddress) ? string.Empty : p.RegistAddress)
+                                            : (string.IsNullOrWhiteSpace(p.CurrentAddress) ? string.Empty : p.CurrentAddress),
+                                          currentProvinceId = p.RegistSame == true ? p.RegistProvinceId : p.CurrentProvinceId,
+                                          currentDistrictId = p.RegistSame == true ? p.RegistDistrictId : p.CurrentDistrictId,
+                                          currentSubDistrictId = p.RegistSame == true ? p.RegistSubDistrictId : p.CurrentSubDistrictId,
+                                          currentZipCode = p.RegistSame == true 
+                                            ? p.RegistZipCode == null ? null : p.RegistZipCode 
+                                            : p.CurrentZipCode == null ? null : p.CurrentZipCode,
                                           amount = r.amount,
                                           amountSpecial = r.amountSpecial,
                                           objectRefId = p.ProfileImg != null && p.ProfileImg?.ObjectRefId != null ? p.ProfileImg?.ObjectRefId.ToString("D") : null,