diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts
index 04feff71..5ff254b4 100644
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@@ -25,6 +25,7 @@ import { Brackets, IsNull, Like, Not } from "typeorm";
 import { OrgRevision } from "../entities/OrgRevision";
 import { OrgRoot } from "../entities/OrgRoot";
 import { ProfileEmployee } from "../entities/ProfileEmployee";
+import { Position } from "../entities/Position";
 
 @Route("api/v1/org/dotnet")
 @Tags("Dotnet")
@@ -38,6 +39,7 @@ export class OrganizationDotnetController extends Controller {
   private orgRootRepo = AppDataSource.getRepository(OrgRoot);
   private orgRevisionRepo = AppDataSource.getRepository(OrgRevision);
   private profileRepo = AppDataSource.getRepository(Profile);
+  private positionRepository = AppDataSource.getRepository(Position);
 
   /**
    * 1. API Search Profile
@@ -174,7 +176,7 @@ export class OrganizationDotnetController extends Controller {
   }
 
   /**
-   * 7.Get ข้อมูล GetUserFullName
+   * 7.1 Get ข้อมูล GetUserFullName
    *
    * @summary 7.1 Get ข้อมูล GetUserFullName
    *
@@ -192,7 +194,7 @@ export class OrganizationDotnetController extends Controller {
   }
 
   /**
-   * 7.Get ข้อมูล GetUserOCId
+   * 7.2 Get ข้อมูล GetUserOCId
    *
    * @summary 7.2 Get ข้อมูล GetUserOCId
    *
@@ -238,6 +240,156 @@ export class OrganizationDotnetController extends Controller {
       root: root == null ? null : root.orgRootName,
       rootShortName: root == null ? null : root.orgRootShortName,
     };
+    return new HttpSuccess(profile);
+  }
+
+  /**
+   * 7.3 Get ข้อมูล GetUserOCId (all node)
+   *
+   * @summary 7.3 Get ข้อมูล GetUserOCId (all node)
+   *
+   * @param {string} keycloakId  Id keycloak
+   */
+  @Get("user-oc-all/{keycloakId}")
+  async getAllProfileByKeycloak(@Path() keycloakId: string) {
+    const profile = await this.profileRepo.findOne({
+      where: { keycloak: keycloakId },
+      relations: [
+        "profileSalary",
+        "profileEducations",
+        "current_holders",
+        "current_holders.orgRoot",
+        "current_holders.orgChild1",
+        "current_holders.orgChild2",
+        "current_holders.orgChild3",
+        "current_holders.orgChild4",
+      ],
+    });
+    if (!profile) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลบุคคลนี้ในระบบ");
+    }
+
+    const orgRevisionPublish = await this.orgRevisionRepo
+      .createQueryBuilder("orgRevision")
+      .where("orgRevision.orgRevisionIsDraft = false")
+      .andWhere("orgRevision.orgRevisionIsCurrent = true")
+      .getOne();
+    if (!orgRevisionPublish) {
+      throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบแบบร่างโครงสร้าง");
+    }
+
+    const posMaster =
+      profile.current_holders == null ||
+      profile.current_holders.length == 0 ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) == null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id);
+
+    const root =
+      profile.current_holders == null ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot;
+
+    const child1 =
+      profile.current_holders == null ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1 ==
+        null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1;
+
+    const child2 =
+      profile.current_holders == null ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2 ==
+        null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2;
+
+    const child3 =
+      profile.current_holders == null ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3 ==
+        null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3;
+
+    const child4 =
+      profile.current_holders == null ||
+      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 ==
+        null
+        ? null
+        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4;
+
+    const position = await this.positionRepository.findOne({
+      relations: ["posExecutive"],
+      where: {
+        posMasterId: posMaster?.id,
+      },
+    });    
+
+    const _profile: any = {
+      profileId: profile.id,
+      prefix: profile.prefix,
+      rank: profile.rank,
+      avatar: profile.avatar,
+      avatarName: profile.avatarName,
+      firstName: profile.firstName,
+      lastName: profile.lastName,
+      citizenId: profile.citizenId,
+      birthDate: profile.birthDate,
+      position: profile.position,
+      posMaster: posMaster == null ? null : posMaster.posMasterNo,
+      posMasterNo: posMaster == null ? null : posMaster.posMasterNo,
+      posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName,
+      posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank,
+      posLevelId: profile.posLevel == null ? null : profile.posLevel.id,
+      posTypeName: profile.posType == null ? null : profile.posType.posTypeName,
+      posTypeRank: profile.posType == null ? null : profile.posType.posTypeRank,
+      posTypeId: profile.posType == null ? null : profile.posType.id,
+      posExecutiveName:
+        position == null || position.posExecutive == null
+          ? null
+          : position.posExecutive.posExecutiveName,
+      posExecutivePriority:
+        position == null || position.posExecutive == null
+          ? null
+          : position.posExecutive.posExecutivePriority,
+      posExecutiveId:
+        position == null || position.posExecutive == null ? null : position.posExecutive.id,
+      rootId: root == null ? null : root.id,
+      root: root == null ? null : root.orgRootName,
+      rootShortName: root == null ? null : root.orgRootShortName,
+      child1Id: child1 == null ? null : child1.id,
+      child1: child1 == null ? null : child1.orgChild1Name,
+      child1ShortName: child1 == null ? null : child1.orgChild1ShortName,
+      child2Id: child2 == null ? null : child2.id,
+      child2: child2 == null ? null : child2.orgChild2Name,
+      child2ShortName: child2 == null ? null : child2.orgChild2ShortName,
+      child3Id: child3 == null ? null : child3.id,
+      child3: child3 == null ? null : child3.orgChild3Name,
+      child3ShortName: child3 == null ? null : child3.orgChild3ShortName,
+      child4Id: child4 == null ? null : child4.id,
+      child4: child4 == null ? null : child4.orgChild4Name,
+      child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
+      node: null,
+      nodeId: null,
+    };
+
+    if (_profile.child4Id != null) {
+      _profile.node = 4;
+      _profile.nodeId = _profile.child4Id;
+    } else if (_profile.child3Id != null) {
+      _profile.node = 3;
+      _profile.nodeId = _profile.child3Id;
+    } else if (_profile.child2Id != null) {
+      _profile.node = 2;
+      _profile.nodeId = _profile.child2Id;
+    } else if (_profile.child1Id != null) {
+      _profile.node = 1;
+      _profile.nodeId = _profile.child1Id;
+    } else if (_profile.rootId != null) {
+      _profile.node = 0;
+      _profile.nodeId = _profile.rootId;
+    }
     return new HttpSuccess(_profile);
   }