diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts
index 16fcd163..f6e926c3 100644
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@@ -18,7 +18,7 @@ import HttpStatus from "../interfaces/http-status";
 import HttpError from "../interfaces/http-error";
 import { RequestWithUser } from "../middlewares/user";
 import { Profile } from "../entities/Profile";
-import { Brackets, In, IsNull, Not } from "typeorm";
+import { And, Between, Brackets, In, IsNull, Not } from "typeorm";
 import { OrgRevision } from "../entities/OrgRevision";
 import { OrgRoot } from "../entities/OrgRoot";
 import { OrgChild1 } from "../entities/OrgChild1";
@@ -4029,6 +4029,184 @@ export class OrganizationDotnetController extends Controller {
     return new HttpSuccess(profile_);
   }
 
+  /**
+   * 5.	เอารายชื่อคนที่มีการ ,map keycloak id แล้ว
+   *
+   * @summary 5. เอารายชื่อคนที่มีการ ,map keycloak id แล้ว
+   *
+   */
+  @Post("keycloak-all-officer/date")
+  async PostProfileWithKeycloakAllOfficerDate(
+    @Request() req: RequestWithUser,
+    @Body()
+    body: {
+      node: number;
+      nodeId: string;
+      isAll: boolean;
+      isRetirement?: boolean;
+      revisionId?: string;
+      startDate: Date;
+      endDate: Date;
+    },
+  ) {
+    let typeCondition: any = {};
+    if (body.isAll == false) {
+      if (body.node === 0) {
+        typeCondition = {
+          orgRootId: body.nodeId,
+          orgChild1Id: IsNull(),
+        };
+      } else if (body.node === 1) {
+        typeCondition = {
+          orgChild1Id: body.nodeId,
+          orgChild2Id: IsNull(),
+        };
+      } else if (body.node === 2) {
+        typeCondition = {
+          orgChild2Id: body.nodeId,
+          orgChild3Id: IsNull(),
+        };
+      } else if (body.node === 3) {
+        typeCondition = {
+          orgChild3Id: body.nodeId,
+          orgChild4Id: IsNull(),
+        };
+      } else if (body.node === 4) {
+        typeCondition = {
+          orgChild4Id: body.nodeId,
+        };
+      }
+    } else {
+      if (body.node === 0) {
+        typeCondition = {
+          orgRootId: body.nodeId,
+        };
+      } else if (body.node === 1) {
+        typeCondition = {
+          orgChild1Id: body.nodeId,
+        };
+      } else if (body.node === 2) {
+        typeCondition = {
+          orgChild2Id: body.nodeId,
+        };
+      } else if (body.node === 3) {
+        typeCondition = {
+          orgChild3Id: body.nodeId,
+        };
+      } else if (body.node === 4) {
+        typeCondition = {
+          orgChild4Id: body.nodeId,
+        };
+      }
+    }
+    let profile = await this.profileRepo.find({
+      where: { keycloak: Not(IsNull()) || Not(""), isLeave: false, current_holders: typeCondition },
+      relations: [
+        "posType",
+        "posLevel",
+        "current_holders",
+        "current_holders.orgRoot",
+        "current_holders.orgChild1",
+        "current_holders.orgChild2",
+        "current_holders.orgChild3",
+        "current_holders.orgChild4",
+      ],
+    });
+
+    if (body.isRetirement) {
+      profile = await this.profileRepo.find({
+        where: {
+          keycloak: Not(IsNull()) || Not(""),
+          // isLeave: false,
+          current_holders: typeCondition,
+          // isRetirement: true,
+          dateRetire: And(
+            Not(IsNull()),
+            Between(body.startDate, body.endDate)
+          )
+        },
+        relations: [
+          "posType",
+          "posLevel",
+          "current_holders",
+          "current_holders.orgRoot",
+          "current_holders.orgChild1",
+          "current_holders.orgChild2",
+          "current_holders.orgChild3",
+          "current_holders.orgChild4",
+        ],
+      });
+    }
+    let findRevision = await this.orgRevisionRepo.findOne({
+      where: { orgRevisionIsCurrent: true },
+    });
+
+    if (body.revisionId) {
+      findRevision = await this.orgRevisionRepo.findOne({
+        where: { id: body.revisionId },
+      });
+    }
+
+    const profile_ = await Promise.all(
+      profile.map((item: Profile) => {
+        const shortName =
+          item.current_holders.length == 0
+            ? null
+            : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+                  null
+              ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+              : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild3 != null
+                ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild2 != null
+                  ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                  : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgChild1 != null
+                    ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                    : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
+                          null &&
+                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                          ?.orgRoot != null
+                      ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
+                      : null;
+        const Oc =
+          item.current_holders.length == 0
+            ? null
+            : body.node == 4 && item.current_holders[0].orgChild4 != null
+              ? `${item.current_holders[0].orgChild4.orgChild4Name}/${item.current_holders[0].orgChild3.orgChild3Name}/${item.current_holders[0].orgChild2.orgChild2Name}/${item.current_holders[0].orgChild1.orgChild1Name}/${item.current_holders[0].orgRoot.orgRootName}`
+              : body.node == 3 && item.current_holders[0].orgChild3 != null
+                ? `${item.current_holders[0].orgChild3.orgChild3Name}/${item.current_holders[0].orgChild2.orgChild2Name}/${item.current_holders[0].orgChild1.orgChild1Name}/${item.current_holders[0].orgRoot.orgRootName}`
+                : body.node == 2 && item.current_holders[0].orgChild2 != null
+                  ? `${item.current_holders[0].orgChild2.orgChild2Name}/${item.current_holders[0].orgChild1.orgChild1Name}/${item.current_holders[0].orgRoot.orgRootName}`
+                  : body.node == 1 && item.current_holders[0].orgChild1 != null
+                    ? `${item.current_holders[0].orgChild1.orgChild1Name}/${item.current_holders[0].orgRoot.orgRootName}`
+                    : body.node == 0 && item.current_holders[0].orgRoot != null
+                      ? `${item.current_holders[0].orgRoot.orgRootName}`
+                      : null;
+        return {
+          id: item.id,
+          prefix: item.prefix,
+          firstName: item.firstName,
+          lastName: item.lastName,
+          citizenId: item.citizenId,
+          keycloak: item.keycloak,
+          posNo: shortName,
+          position: item.position,
+          positionLevel: item.posLevel?.posLevelName ?? null,
+          positionType: item.posType?.posTypeName ?? null,
+          oc: Oc,
+        };
+      }),
+    );
+
+    return new HttpSuccess(profile_);
+  }
+
   /**
    * 5.	เอารายชื่อคน ขรก. (none-validate-keycloak)
    *