diff --git a/BMA.EHR.Application/Repositories/Reports/CandidateReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/CandidateReportRepository.cs
index b032579c..beda9674 100644
--- a/BMA.EHR.Application/Repositories/Reports/CandidateReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Reports/CandidateReportRepository.cs
@@ -147,8 +147,8 @@ namespace BMA.EHR.Application.Repositories.Reports
                             RegistZipCode = p.RegistZipCode == null ? "-" : p.RegistZipCode,
                             CurrentAddress = p.CurrentAddress == null ? (p.RegistAddress == null ? "-" : p.RegistAddress) : p.CurrentAddress,
                             CurrentProvinceName = p.CurrentProvinceName == null ? (p.RegistProvinceName == null ? "-" : p.RegistProvinceName) : p.CurrentProvinceName,
-                            CurrentSubDistrictName = p.CurrentSubDistrictName == null ? (p.RegistDistrictName == null ? "-" : p.RegistDistrictName) : p.CurrentSubDistrictName,
-                            CurrentDistrictName = p.CurrentDistrictName == null ? (p.RegistSubDistrictName == null ? "-" : p.RegistSubDistrictName) : p.CurrentDistrictName,
+                            CurrentDistrictName = p.CurrentDistrictName == null ? (p.RegistDistrictName == null ? "-" : p.RegistDistrictName) : p.CurrentDistrictName,
+                            CurrentSubDistrictName = p.CurrentSubDistrictName == null ? (p.RegistSubDistrictName == null ? "-" : p.RegistSubDistrictName) : p.CurrentSubDistrictName,
                             CurrentZipCode = p.CurrentZipCode == null ? (p.RegistZipCode == null ? "-" : p.RegistZipCode) : p.CurrentZipCode,
                             Telephone = p.Telephone == null ? "-" : p.Telephone,
                             Email = p.Email == null ? "-" : p.Email,
diff --git a/BMA.EHR.Report.Service/Reports/ผลสอบคัดเลือกรายบุคคล.trdp b/BMA.EHR.Report.Service/Reports/ผลสอบคัดเลือกรายบุคคล.trdp
index c61efa1d..af0a2878 100644
Binary files a/BMA.EHR.Report.Service/Reports/ผลสอบคัดเลือกรายบุคคล.trdp and b/BMA.EHR.Report.Service/Reports/ผลสอบคัดเลือกรายบุคคล.trdp differ