diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts
index 69e31ea3..aaf85caa 100644
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@@ -514,7 +514,9 @@ export class OrganizationDotnetController extends Controller {
         currentZipCode: profile.currentZipCode,
         dutyTimeId: profile.dutyTimeId,
         dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
-        amountd: profile.amount,
+        amount: profile.amount,
+        positionSalaryAmount: profile.positionSalaryAmount,
+        mouthSalaryAmount: profile.mouthSalaryAmount,
         root:
           profile?.current_holders?.find(
             (x) =>
@@ -749,7 +751,9 @@ export class OrganizationDotnetController extends Controller {
       currentZipCode: profile.currentZipCode,
       dutyTimeId: profile.dutyTimeId,
       dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
-      amountd: profile.amount,
+      amount: profile.amount,
+      positionSalaryAmount: profile.positionSalaryAmount,
+      mouthSalaryAmount: profile.mouthSalaryAmount,
       root:
         profile?.current_holders?.find(
           (x) =>
@@ -1043,7 +1047,9 @@ export class OrganizationDotnetController extends Controller {
         currentZipCode: profile.currentZipCode,
         dutyTimeId: profile.dutyTimeId,
         dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
-        amountd: profile.amount,
+        amount: profile.amount,
+        positionSalaryAmount: profile.positionSalaryAmount,
+        mouthSalaryAmount: profile.mouthSalaryAmount,
         root:
           profile?.current_holders?.find(
             (x) =>
@@ -1308,7 +1314,9 @@ export class OrganizationDotnetController extends Controller {
       currentZipCode: profile.currentZipCode,
       dutyTimeId: profile.dutyTimeId,
       dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
-      amountd: profile.amount,
+      amount: profile.amount,
+      positionSalaryAmount: profile.positionSalaryAmount,
+      mouthSalaryAmount: profile.mouthSalaryAmount,
       root:
         profile?.current_holders?.find(
           (x) =>
@@ -1632,7 +1640,9 @@ export class OrganizationDotnetController extends Controller {
         currentZipCode: profile.currentZipCode,
         dutyTimeId: profile.dutyTimeId,
         dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
-        amountd: profile.amount,
+        amount: profile.amount,
+        positionSalaryAmount: profile.positionSalaryAmount,
+        mouthSalaryAmount: profile.mouthSalaryAmount,
         root:
           profile?.current_holders?.find(
             (x) =>
@@ -1897,7 +1907,9 @@ export class OrganizationDotnetController extends Controller {
       currentZipCode: profile.currentZipCode,
       dutyTimeId: profile.dutyTimeId,
       dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
-      amountd: profile.amount,
+      amount: profile.amount,
+      positionSalaryAmount: profile.positionSalaryAmount,
+      mouthSalaryAmount: profile.mouthSalaryAmount,
       root:
         profile?.current_holders?.find(
           (x) =>
@@ -1979,12 +1991,20 @@ export class OrganizationDotnetController extends Controller {
   @Get("root/officer/{rootId}")
   async GetProfileByRootIdAsync(@Path() rootId: string) {
     const profiles = await this.profileRepo.find({
-      relations: {
-        posLevel: true,
-        posType: true,
-        profileSalary: true,
-        profileInsignias: true,
-      },
+      relations: [
+        "posLevel",
+        "posType",
+        "profileSalary",
+        "profileInsignias",
+        "profileInsignias.insignia",
+        "current_holders",
+        "current_holders.orgRevision",
+        "current_holders.orgRoot",
+        "current_holders.orgChild1",
+        "current_holders.orgChild2",
+        "current_holders.orgChild3",
+        "current_holders.orgChild4",
+      ],
       where: { current_holders: { orgRootId: rootId } },
       order: {
         profileSalary: {
@@ -1995,55 +2015,107 @@ export class OrganizationDotnetController extends Controller {
         },
       },
     });
-    // if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
 
-    const mapProfile = profiles.map((profile) => ({
-      id: profile.id,
-      avatar: profile.avatar,
-      avatarName: profile.avatarName,
-      rank: profile.rank,
-      prefix: profile.prefix,
-      firstName: profile.firstName,
-      lastName: profile.lastName,
-      citizenId: profile.citizenId,
-      position: profile.position,
-      posLevelId: profile.posLevelId,
-      email: profile.email,
-      phone: profile.phone,
-      keycloak: profile.keycloak,
-      isProbation: profile.isProbation,
-      isLeave: profile.isLeave,
-      leaveReason: profile.leaveReason,
-      dateRetire: profile.dateRetire,
-      dateAppoint: profile.dateAppoint,
-      dateRetireLaw: profile.dateRetireLaw,
-      dateStart: profile.dateStart,
-      govAgeAbsent: profile.govAgeAbsent,
-      govAgePlus: profile.govAgePlus,
-      birthDate: profile.birthDate,
-      reasonSameDate: profile.reasonSameDate,
-      telephoneNumber: profile.telephoneNumber,
-      nationality: profile.nationality,
-      gender: profile.gender,
-      relationship: profile.relationship,
-      religion: profile.religion,
-      bloodGroup: profile.bloodGroup,
-      registrationAddress: profile.registrationAddress,
-      registrationProvinceId: profile.registrationProvinceId,
-      registrationDistrictId: profile.registrationDistrictId,
-      registrationSubDistrictId: profile.registrationSubDistrictId,
-      registrationZipCode: profile.registrationZipCode,
-      currentAddress: profile.currentAddress,
-      currentProvinceId: profile.currentProvinceId,
-      currentSubDistrictId: profile.currentSubDistrictId,
-      currentZipCode: profile.currentZipCode,
-      dutyTimeId: profile.dutyTimeId,
-      dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
-      posLevel: profile.posLevel ? profile.posLevel : null,
-      posType: profile.posType ? profile.posType : null,
-      profileSalary: profile.profileSalary,
-      profileInsignia: profile.profileInsignias,
-    }));
+    const findRevision = await this.orgRevisionRepo.findOne({
+      where: { orgRevisionIsCurrent: true },
+    });
+
+    const mapProfile = profiles.map((profile) => {
+      const shortName =
+        profile.current_holders.length == 0
+          ? null
+          : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+              profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+                null
+            ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName}${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+            : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
+              ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName}${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+              : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                  profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
+                ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName}${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
+                      null &&
+                    profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
+                  ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName}${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                  : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
+                        null &&
+                      profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
+                    ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName}${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                    : null;
+
+      return {
+        id: profile.id,
+        avatar: profile.avatar,
+        avatarName: profile.avatarName,
+        rank: profile.rank,
+        prefix: profile.prefix,
+        firstName: profile.firstName,
+        lastName: profile.lastName,
+        citizenId: profile.citizenId,
+        position: profile.position,
+        posLevelId: profile.posLevelId,
+        posTypeId: profile.posTypeId,
+        email: profile.email,
+        phone: profile.phone,
+        keycloak: profile.keycloak,
+        isProbation: profile.isProbation,
+        isLeave: profile.isLeave,
+        leaveReason: profile.leaveReason,
+        dateRetire: profile.dateRetire,
+        dateAppoint: profile.dateAppoint,
+        dateRetireLaw: profile.dateRetireLaw,
+        dateStart: profile.dateStart,
+        govAgeAbsent: profile.govAgeAbsent,
+        govAgePlus: profile.govAgePlus,
+        birthDate: profile.birthDate,
+        reasonSameDate: profile.reasonSameDate,
+        telephoneNumber: profile.telephoneNumber,
+        nationality: profile.nationality,
+        gender: profile.gender,
+        relationship: profile.relationship,
+        religion: profile.religion,
+        bloodGroup: profile.bloodGroup,
+        registrationAddress: profile.registrationAddress,
+        registrationProvinceId: profile.registrationProvinceId,
+        registrationDistrictId: profile.registrationDistrictId,
+        registrationSubDistrictId: profile.registrationSubDistrictId,
+        registrationZipCode: profile.registrationZipCode,
+        currentAddress: profile.currentAddress,
+        currentProvinceId: profile.currentProvinceId,
+        currentSubDistrictId: profile.currentSubDistrictId,
+        currentZipCode: profile.currentZipCode,
+        dutyTimeId: profile.dutyTimeId,
+        dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
+        posLevel: profile.posLevel ? profile.posLevel : null,
+        posType: profile.posType ? profile.posType : null,
+        profileSalary: profile.profileSalary,
+        profileInsignia: profile.profileInsignias.map((x) => {
+          return { ...x, insignia: x.insignia.name };
+        }),
+        amount: profile.amount,
+        positionSalaryAmount: profile.positionSalaryAmount,
+        mouthSalaryAmount: profile.mouthSalaryAmount,
+        profileType: "OFFICER",
+        root:
+          profile?.current_holders?.find(
+            (x) =>
+              x.orgRevision?.orgRevisionIsDraft == false &&
+              x.orgRevision?.orgRevisionIsCurrent == true,
+          )?.orgRoot?.orgRootName ?? null,
+        rootId:
+          profile?.current_holders?.find(
+            (x) =>
+              x.orgRevision?.orgRevisionIsDraft == false &&
+              x.orgRevision?.orgRevisionIsCurrent == true,
+          )?.orgRootId ?? null,
+        posNo: shortName,
+      };
+    });
 
     return new HttpSuccess(mapProfile);
   }
@@ -2058,12 +2130,20 @@ export class OrganizationDotnetController extends Controller {
   @Get("root/employee/{rootId}")
   async GetProfileByRootIdEmpAsync(@Path() rootId: string) {
     const profiles = await this.profileEmpRepo.find({
-      relations: {
-        posLevel: true,
-        posType: true,
-        profileSalary: true,
-        profileInsignias: true,
-      },
+      relations: [
+        "posLevel",
+        "posType",
+        "profileSalary",
+        "profileInsignias",
+        "profileInsignias.insignia",
+        "current_holders",
+        "current_holders.orgRevision",
+        "current_holders.orgRoot",
+        "current_holders.orgChild1",
+        "current_holders.orgChild2",
+        "current_holders.orgChild3",
+        "current_holders.orgChild4",
+      ],
       where: { current_holders: { orgRootId: rootId } },
       order: {
         profileSalary: {
@@ -2074,55 +2154,105 @@ export class OrganizationDotnetController extends Controller {
         },
       },
     });
-    // if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
 
-    const mapProfile = profiles.map((profile) => ({
-      id: profile.id,
-      avatar: profile.avatar,
-      avatarName: profile.avatarName,
-      rank: profile.rank,
-      prefix: profile.prefix,
-      firstName: profile.firstName,
-      lastName: profile.lastName,
-      citizenId: profile.citizenId,
-      position: profile.position,
-      posLevelId: profile.posLevelId,
-      email: profile.email,
-      phone: profile.phone,
-      keycloak: profile.keycloak,
-      isProbation: profile.isProbation,
-      isLeave: profile.isLeave,
-      leaveReason: profile.leaveReason,
-      dateRetire: profile.dateRetire,
-      dateAppoint: profile.dateAppoint,
-      dateRetireLaw: profile.dateRetireLaw,
-      dateStart: profile.dateStart,
-      govAgeAbsent: profile.govAgeAbsent,
-      govAgePlus: profile.govAgePlus,
-      birthDate: profile.birthDate,
-      reasonSameDate: profile.reasonSameDate,
-      telephoneNumber: profile.telephoneNumber,
-      nationality: profile.nationality,
-      gender: profile.gender,
-      relationship: profile.relationship,
-      religion: profile.religion,
-      bloodGroup: profile.bloodGroup,
-      registrationAddress: profile.registrationAddress,
-      registrationProvinceId: profile.registrationProvinceId,
-      registrationDistrictId: profile.registrationDistrictId,
-      registrationSubDistrictId: profile.registrationSubDistrictId,
-      registrationZipCode: profile.registrationZipCode,
-      currentAddress: profile.currentAddress,
-      currentProvinceId: profile.currentProvinceId,
-      currentSubDistrictId: profile.currentSubDistrictId,
-      currentZipCode: profile.currentZipCode,
-      //   dutyTimeId: profile.dutyTimeId,
-      //   dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
-      posLevel: profile.posLevel ? profile.posLevel : null,
-      posType: profile.posType ? profile.posType : null,
-      profileSalary: profile.profileSalary,
-      profileInsignia: profile.profileInsignias,
-    }));
+    const findRevision = await this.orgRevisionRepo.findOne({
+      where: { orgRevisionIsCurrent: true },
+    });
+
+    const mapProfile = profiles.map((profile) => {
+      const shortName =
+        profile.current_holders.length == 0
+          ? null
+          : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+              profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+                null
+            ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName}${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+            : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
+              ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName}${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+              : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                  profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
+                ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName}${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
+                      null &&
+                    profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
+                  ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName}${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                  : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
+                        null &&
+                      profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
+                    ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName}${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                    : null;
+      return {
+        id: profile.id,
+        avatar: profile.avatar,
+        avatarName: profile.avatarName,
+        rank: profile.rank,
+        prefix: profile.prefix,
+        firstName: profile.firstName,
+        lastName: profile.lastName,
+        citizenId: profile.citizenId,
+        position: profile.position,
+        posLevelId: profile.posLevelId,
+        email: profile.email,
+        phone: profile.phone,
+        keycloak: profile.keycloak,
+        isProbation: profile.isProbation,
+        isLeave: profile.isLeave,
+        leaveReason: profile.leaveReason,
+        dateRetire: profile.dateRetire,
+        dateAppoint: profile.dateAppoint,
+        dateRetireLaw: profile.dateRetireLaw,
+        dateStart: profile.dateStart,
+        govAgeAbsent: profile.govAgeAbsent,
+        govAgePlus: profile.govAgePlus,
+        birthDate: profile.birthDate,
+        reasonSameDate: profile.reasonSameDate,
+        telephoneNumber: profile.telephoneNumber,
+        nationality: profile.nationality,
+        gender: profile.gender,
+        relationship: profile.relationship,
+        religion: profile.religion,
+        bloodGroup: profile.bloodGroup,
+        registrationAddress: profile.registrationAddress,
+        registrationProvinceId: profile.registrationProvinceId,
+        registrationDistrictId: profile.registrationDistrictId,
+        registrationSubDistrictId: profile.registrationSubDistrictId,
+        registrationZipCode: profile.registrationZipCode,
+        currentAddress: profile.currentAddress,
+        currentProvinceId: profile.currentProvinceId,
+        currentSubDistrictId: profile.currentSubDistrictId,
+        currentZipCode: profile.currentZipCode,
+        //   dutyTimeId: profile.dutyTimeId,
+        //   dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
+        posLevel: profile.posLevel ? profile.posLevel : null,
+        posType: profile.posType ? profile.posType : null,
+        profileSalary: profile.profileSalary,
+        profileInsignia: profile.profileInsignias.map((x) => {
+          return { ...x, insignia: x.insignia.name };
+        }),
+        amount: profile.amount,
+        positionSalaryAmount: profile.positionSalaryAmount,
+        mouthSalaryAmount: profile.mouthSalaryAmount,
+        profileType: "OFFICER",
+        root:
+          profile?.current_holders?.find(
+            (x) =>
+              x.orgRevision?.orgRevisionIsDraft == false &&
+              x.orgRevision?.orgRevisionIsCurrent == true,
+          )?.orgRoot?.orgRootName ?? null,
+        rootId:
+          profile?.current_holders?.find(
+            (x) =>
+              x.orgRevision?.orgRevisionIsDraft == false &&
+              x.orgRevision?.orgRevisionIsCurrent == true,
+          )?.orgRootId ?? null,
+        posNo: shortName,
+      };
+    });
 
     return new HttpSuccess(mapProfile);
   }