diff --git a/src/controllers/ImportDataController.ts b/src/controllers/ImportDataController.ts
index e07e8d77..7ff8efc7 100644
--- a/src/controllers/ImportDataController.ts
+++ b/src/controllers/ImportDataController.ts
@@ -2194,6 +2194,7 @@ export class ImportDataController extends Controller {
       .createQueryBuilder("profile")
       .select(["profile.citizenId", "profile.id"])
       .orderBy("profile.citizenId", "ASC")
+      // .where("profile.citizenId = '3610700119735'")
       //   .skip(0)
       //   .take(20)
       .getManyAndCount();
@@ -2251,6 +2252,7 @@ export class ImportDataController extends Controller {
               let districtId = await this.districtIdRepo.findOne({
                 where: {
                   name: districtRegis_.AMPHUR_NAME,
+                  provinceId: provinceId.id,
                 },
               });
               if (districtId == null) {
@@ -2275,6 +2277,7 @@ export class ImportDataController extends Controller {
                   let subDistrictId = await this.subDistrictIdRepo.findOne({
                     where: {
                       name: subDistrictRegis_.DISTRICT_NAME,
+                      districtId: districtId.id,
                     },
                   });
                   if (subDistrictId == null) {
@@ -2325,6 +2328,7 @@ export class ImportDataController extends Controller {
               let districtId = await this.districtIdRepo.findOne({
                 where: {
                   name: districtCurr_.AMPHUR_NAME,
+                  provinceId: provinceId.id,
                 },
               });
               if (districtId == null) {
@@ -2349,6 +2353,7 @@ export class ImportDataController extends Controller {
                   let subDistrictId = await this.subDistrictIdRepo.findOne({
                     where: {
                       name: subDistrictCurr_.DISTRICT_NAME,
+                      districtId: districtId.id,
                     },
                   });
                   if (subDistrictId == null) {