diff --git a/src/controllers/DistrictController.ts b/src/controllers/DistrictController.ts
index 778cc249..18ea210b 100644
--- a/src/controllers/DistrictController.ts
+++ b/src/controllers/DistrictController.ts
@@ -158,13 +158,22 @@ export class DistrictController extends Controller {
    */
   @Delete("{id}")
   async Delete(@Path() id: string) {
-    const _delDistrict = await this.districtRepository.findOne({
-      where: { id: id },
-    });
-    if (!_delDistrict) {
-      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลสถานภาพทางเขตนี้");
+    // const _delDistrict = await this.districtRepository.findOne({
+    //   where: { id: id },
+    // });
+    // if (!_delDistrict) {
+    //   throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลสถานภาพทางเขตนี้");
+    // }
+    // await this.districtRepository.delete(_delDistrict.id);
+    let result :any
+    try {
+      result = await this.districtRepository.delete({ id: id });
+    } catch {
+      throw new HttpError( HttpStatusCode.NOT_FOUND, "ไม่สามารถลบได้เนื่องจากมีการใช้งานข้อมูลเขต/อำเภอนี้อยู่");
+    }
+    if (result.affected == undefined || result.affected <= 0) {
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
     }
-    await this.districtRepository.delete(_delDistrict.id);
     return new HttpSuccess();
   }
 }
diff --git a/src/controllers/ProvinceController.ts b/src/controllers/ProvinceController.ts
index 44f77347..60f59566 100644
--- a/src/controllers/ProvinceController.ts
+++ b/src/controllers/ProvinceController.ts
@@ -141,13 +141,22 @@ export class ProvinceController extends Controller {
    */
   @Delete("{id}")
   async Delete(@Path() id: string) {
-    const _delProvince = await this.provinceRepository.findOne({
-      where: { id: id },
-    });
-    if (!_delProvince) {
-      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลสถานภาพทางจังหวัดนี้");
+    // const _delProvince = await this.provinceRepository.findOne({
+    //   where: { id: id },
+    // });
+    // if (!_delProvince) {
+    //   throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลสถานภาพทางจังหวัดนี้");
+    // }
+    // await this.provinceRepository.delete(_delProvince.id);
+    let result :any
+    try {
+      result = await this.provinceRepository.delete({ id: id });
+    } catch {
+      throw new HttpError( HttpStatusCode.NOT_FOUND, "ไม่สามารถลบได้เนื่องจากมีการใช้งานข้อมูลจังหวัดนี้อยู่");
+    }
+    if (result.affected == undefined || result.affected <= 0) {
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
     }
-    await this.provinceRepository.delete(_delProvince.id);
     return new HttpSuccess();
   }
 }