diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs
index c967bca..46ee1a4 100644
--- a/Services/PeriodExamService.cs
+++ b/Services/PeriodExamService.cs
@@ -3314,14 +3314,14 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                         MobilePhone = firstAddress?.Mobile ?? "",
                         RegistAddress = registAddress,
                         RegistProvinceId = provincesCache.FirstOrDefault(x => x.name == firstAddress?.Province)?.Id,
-                        RegistDistrictId = districtsCache.FirstOrDefault(x => x.name == firstAddress?.District)?.Id,
-                        RegistSubDistrictId = subDistrictsCache.FirstOrDefault(x => x.name == firstAddress?.Soi)?.Id,
+                        RegistDistrictId = districtsCache.FirstOrDefault(x => x.name == firstAddress?.Amphur)?.Id,
+                        RegistSubDistrictId = subDistrictsCache.FirstOrDefault(x => x.name == firstAddress?.District)?.Id,
                         RegistZipCode = firstAddress?.ZipCode ?? "",
                         RegistSame = false,
                         CurrentAddress = currentAddress,
                         CurrentProvinceId = provincesCache.FirstOrDefault(x => x.name == firstAddress?.Province1)?.Id,
-                        CurrentDistrictId = districtsCache.FirstOrDefault(x => x.name == firstAddress?.District1)?.Id,
-                        CurrentSubDistrictId = subDistrictsCache.FirstOrDefault(x => x.name == firstAddress?.Soi1)?.Id,
+                        CurrentDistrictId = districtsCache.FirstOrDefault(x => x.name == firstAddress?.Amphur1)?.Id,
+                        CurrentSubDistrictId = subDistrictsCache.FirstOrDefault(x => x.name == firstAddress?.District1)?.Id,
                         CurrentZipCode = firstAddress?.ZipCode1,
                         Marry = candidate.Marry?.Contains("สมรส") ?? false,
                         OccupationPositionType = "other",