diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 22abc1de..c63fc972 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -10268,7 +10268,7 @@ export class ProfileController extends Controller {
       orgChild4: orgChild4Ref?.orgChild4Name,
       commandYear: new Date().getFullYear() + 543,
       // commandDateSign: new Date(),
-      commandDateAffect: new Date(),
+      commandDateAffect: requestBody.dateLeave,
       commandCode: "16",
       commandName: "พ้นจากราชการ",
       posNoAbb: shortName,
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index 00a04ca2..d6c198d9 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -5674,7 +5674,7 @@ export class ProfileEmployeeController extends Controller {
       orgChild4: orgChild4Ref?.orgChild4Name,
       commandYear: new Date().getFullYear() + 543,
       // commandDateSign: new Date(),
-      commandDateAffect: new Date(),
+      commandDateAffect: requestBody.dateLeave,
       commandCode: "16",
       commandName: "พ้นจากราชการ",
       posNoAbb: shortName,