diff --git a/src/controllers/ProfileGovernmentController.ts b/src/controllers/ProfileGovernmentController.ts index 6a988c0d..02a5a128 100644 --- a/src/controllers/ProfileGovernmentController.ts +++ b/src/controllers/ProfileGovernmentController.ts @@ -105,6 +105,7 @@ export class ProfileGovernmentHistoryController extends Controller { positionArea: position == null ? null : position.positionArea, //ด้าน/สาขา positionExecutiveField: position == null ? null : position.positionExecutiveField, //ด้านทางการบริหาร dateLeave: record.birthDate == null ? null : calculateRetireDate(record.birthDate), + dateRetireLaw: record.dateRetireLaw ?? null, govAge: record.dateStart == null ? null : calculateAge(record.dateStart), dateAppoint: record.dateAppoint, dateStart: record.dateStart,