diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 76870169..9ec77be6 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -177,11 +177,11 @@ export class ProfileController extends Controller {
       LastName: profile.lastName != null ? profile.lastName : "",
       DateOfBirth:
         profile.birthDate != null
-          ? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.birthDate))
+          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profile.birthDate))
           : "",
       DateRetire:
         profile.dateRetire != null
-          ? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.dateRetire))
+          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profile.dateRetire))
           : "",
       RegistrationAddress: Extension.ToThaiNumber(
         `${_regisAddres}${_subDistrict}${_district}${_province}${registrationZipCode}`,
@@ -197,11 +197,13 @@ export class ProfileController extends Controller {
           : "",
       AppointText:
         profile.dateAppoint != null
-          ? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.dateAppoint))
+          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profile.dateAppoint))
           : "",
       SalaryDate:
         profile.profileSalary.length > 0 && profile.profileSalary[0].date != null
-          ? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.profileSalary[0].date))
+          ? Extension.ToThaiNumber(
+              Extension.ToThaiShortDate_noPrefix(profile.profileSalary[0].date),
+            )
           : "",
       PositionName: profile.position != null ? profile.position : "",
       OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,