diff --git a/src/controllers/OrgChild1Controller.ts b/src/controllers/OrgChild1Controller.ts
index da664b33..bda21a07 100644
--- a/src/controllers/OrgChild1Controller.ts
+++ b/src/controllers/OrgChild1Controller.ts
@@ -124,7 +124,7 @@ export class OrgChild1Controller {
       },
     });
     if (chkCode != null) {
-      throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว");
+      throw new HttpError(HttpStatusCode.INTERNAL_SERVER_ERROR, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว");
     }
     const order: any = await this.child1Repository.findOne({
       where: {
@@ -202,7 +202,7 @@ export class OrgChild1Controller {
       },
     });
     if (chkCode != null) {
-      throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสหน่วยงานนี้มีอยู่ในระบบแล้ว");
+      throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว");
     }
     child1.lastUpdateUserId = request.user.sub;
     child1.lastUpdateFullName = request.user.name;
diff --git a/src/interfaces/utils.ts b/src/interfaces/utils.ts
index be350f51..ef23c9b1 100644
--- a/src/interfaces/utils.ts
+++ b/src/interfaces/utils.ts
@@ -35,7 +35,7 @@ export function calculateRetireDate(birthDate: Date) {
       break;
   }
 
-  if (flag) return new Date(`${yy + 60}-09-30T00:00:00.000Z`);
+  if (flag) return new Date(`${yy + 60}-09-30T00:00:00.000+07:00`);
 
-  return new Date(`${yy + 61}-09-30T00:00:00.000Z`);
+  return new Date(`${yy + 61}-09-30T00:00:00.000+07:00`);
 }