diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 34981071..77cfbe61 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -189,7 +189,7 @@ export class ProfileController extends Controller {
       Institute: item.institute,
       Date:
         item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.endDate))}`
+          ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
           : "",
       Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",
     }));
@@ -340,7 +340,7 @@ export class ProfileController extends Controller {
       BirthDayText:
         profiles.birthDate != null
           ? Extension.ToThaiNumber(
-              Extension.ToThaiShortDate_noPrefix(profiles.birthDate).toString(),
+              Extension.ToThaiFullDate2(profiles.birthDate).toString(),
             )
           : "",
       BirthMonth: profiles?.birthDate
@@ -352,7 +352,7 @@ export class ProfileController extends Controller {
       BirthYearText:
         profiles.birthDate != null
           ? Extension.ToThaiNumber(
-              Extension.ToThaiShortDate_noPrefix(profiles.birthDate).toString(),
+              Extension.ToThaiFullDate2(profiles.birthDate).toString(),
             )
           : "",
       Address: "",
@@ -388,11 +388,11 @@ export class ProfileController extends Controller {
       StartDate: profiles?.dateStart,
       AppointDate: profiles?.dateAppoint ?? "",
       BirthDate: profiles?.birthDate
-        ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profiles.birthDate))
+        ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(profiles.birthDate))
         : null,
       RetireDate:
         profiles.dateRetireLaw != null
-          ? Extension.ToThaiNumber(profiles.dateRetireLaw.toString())
+          ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(profiles.dateRetireLaw))
           : "",
       // AvatarId: profiles?.avatar ?? null,
     };
@@ -405,7 +405,7 @@ export class ProfileController extends Controller {
       CertificateType: item.certificateType ?? null,
       Issuer: item.issuer ?? null,
       CertificateNo: Extension.ToThaiNumber(item.certificateNo) ?? null,
-      IssueDate: Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.issueDate)) ?? null,
+      IssueDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate)) ?? null,
     }));
     const trainings = await this.trainingRepository.find({
       select: ["startDate", "endDate", "place", "department", "name"],
@@ -416,14 +416,14 @@ export class ProfileController extends Controller {
       Start:
         item.startDate == null
           ? ""
-          : Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.startDate)),
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate)),
       End:
         item.endDate == null
           ? ""
-          : Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.endDate)),
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate)),
       Date:
         item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.endDate))}`
+          ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
           : "",
       Level: "",
       Degree: item.name,
@@ -458,7 +458,7 @@ export class ProfileController extends Controller {
           : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
       Date:
         item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.endDate))}`
+          ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
           : "",
       Level: item.educationLevel ?? "",
       Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",
@@ -481,19 +481,19 @@ export class ProfileController extends Controller {
 
     const Salary = salarys.map((item) => ({
       SalaryDate: item.date
-        ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.date))
+        ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.date))
         : null,
-      Position: item.position ?? null,
-      PosNo: item.posNo ?? null,
-      Salary: item.amount ?? null,
+      Position: item.position != null ? Extension.ToThaiNumber(item.position) : null,
+      PosNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : null,
+      Salary: item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
       Rank: item.positionLevel ?? null,
       RefAll: item.templateDoc ? Extension.ToThaiNumber(item.templateDoc) : null,
-      PositionLevel: item.positionLevel ?? null,
+      PositionLevel: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
       PositionType: item.positionType ?? null,
       PositionAmount:
         item.positionSalaryAmount == null
           ? null
-          : Extension.ToThaiNumber(item.positionSalaryAmount.toString()),
+          : Extension.ToThaiNumber(item.positionSalaryAmount.toLocaleString()),
       FullName: `${profiles?.prefix}${profiles?.firstName} ${profiles?.lastName}`,
       OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
     }));
diff --git a/src/interfaces/extension.ts b/src/interfaces/extension.ts
index d0f021ea..6efd7d5b 100644
--- a/src/interfaces/extension.ts
+++ b/src/interfaces/extension.ts
@@ -99,6 +99,16 @@ class Extension {
       yy
     );
   }
+  public static ToThaiFullDate2(value: Date) {
+    let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();
+    return (
+      value.getDate() + 
+      " " +
+      Extension.ToThaiMonth(value.getMonth() + 1) +
+      " " +
+      yy
+    );
+  }
 
   public static ToThaiShortDate(value: Date) {
     let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();