diff --git a/Services/RecruitService.cs b/Services/RecruitService.cs
index f7c5280..f8e4040 100644
--- a/Services/RecruitService.cs
+++ b/Services/RecruitService.cs
@@ -277,14 +277,14 @@ namespace BMA.EHR.Recruit.Service.Services
                         MobilePhone = candidate?.Addresses?.FirstOrDefault()?.Mobile ?? null,
                         RegistAddress = $"{Address}{Moo}{Soi}{Road}",
                         RegistProvinceId = _contextOrg.province.FirstOrDefault(x => x.name == (candidate!.Addresses!.FirstOrDefault()!.Province ?? ""))?.Id ?? null,
-                        RegistDistrictId = _contextOrg.district.FirstOrDefault(x => x.name == (candidate!.Addresses!.FirstOrDefault()!.District ?? ""))?.Id ?? null,
-                        RegistSubDistrictId = _contextOrg.subDistrict.FirstOrDefault(x => x.name == (candidate!.Addresses!.FirstOrDefault()!.Soi ?? ""))?.Id ?? null,
+                        RegistDistrictId = _contextOrg.district.FirstOrDefault(x => x.name == (candidate!.Addresses!.FirstOrDefault()!.Amphur ?? ""))?.Id ?? null,
+                        RegistSubDistrictId = _contextOrg.subDistrict.FirstOrDefault(x => x.name == (candidate!.Addresses!.FirstOrDefault()!.District ?? ""))?.Id ?? null,
                         RegistZipCode = candidate?.Addresses?.FirstOrDefault()?.ZipCode ?? null,
                         RegistSame = false,
                         CurrentAddress = $"{Address1}{Moo1}{Soi1}{Road1}",
                         CurrentProvinceId = _contextOrg.province.FirstOrDefault(x => x.name == (candidate!.Addresses!.FirstOrDefault()!.Province1 ?? ""))?.Id ?? null,
-                        CurrentDistrictId = _contextOrg.district.FirstOrDefault(x => x.name == (candidate!.Addresses!.FirstOrDefault()!.District1 ?? ""))?.Id ?? null,
-                        CurrentSubDistrictId = _contextOrg.subDistrict.FirstOrDefault(x => x.name == (candidate!.Addresses!.FirstOrDefault()!.Soi1 ?? ""))?.Id ?? null,
+                        CurrentDistrictId = _contextOrg.district.FirstOrDefault(x => x.name == (candidate!.Addresses!.FirstOrDefault()!.Amphur1 ?? ""))?.Id ?? null,
+                        CurrentSubDistrictId = _contextOrg.subDistrict.FirstOrDefault(x => x.name == (candidate!.Addresses!.FirstOrDefault()!.District1 ?? ""))?.Id ?? null,
                         CurrentZipCode = candidate?.Addresses?.FirstOrDefault()?.ZipCode1 ?? null,
                         Marry = candidate?.Marry?.Contains("สมรส") ?? false,