diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 297d48ac..e126509b 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -12,7 +12,9 @@ import { OrgChild3 } from "../entities/OrgChild3";
 import { OrgChild4 } from "../entities/OrgChild4";
 import { PosType } from "../entities/PosType";
 import { PosLevel } from "../entities/PosLevel";
+import { PosMaster } from "../entities/PosMaster";
 import Extension from "../interfaces/extension";
+import { LeaveType } from "../entities/LeaveType";
 import HttpStatus from "../interfaces/http-status";
 @Route("api/v1/org/report")
 @Tags("Report")
@@ -30,6 +32,7 @@ export class ReportController extends Controller {
   private child4Repository = AppDataSource.getRepository(OrgChild4);
   private posTypepository = AppDataSource.getRepository(PosType);
   private posLevelRepository = AppDataSource.getRepository(PosLevel);
+  private posMasterRepository = AppDataSource.getRepository(PosMaster);
 
   /**
    * API Report1
@@ -6243,91 +6246,72 @@ export class ReportController extends Controller {
 
   @Get("report4/{rootId}")
   async findReport4(@Path() rootId: string) {
-    const orgRootData = await this.orgRootRepository.find({
-      where: {
-        id: rootId,
-      },
-      order: { orgRootOrder: "ASC" },
-      relations: [
-        "posMasters",
-        "posMasters.positions",
-        "posMasters.positions.posLevel",
-        "posMasters.positions.posType",
-        "posMasters.positions.posExecutive",
-      ],
-    });
-    if (!rootId) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
-    const posType = await this.posTypepository.find({
-      order: {
-        posTypeRank: "ASC",
-        posLevels: { posLevelRank: "ASC" },
-      },
-      relations: ["posLevels"],
-    });
 
-    const posLevel = await this.posLevelRepository.find({
-      order: { posLevelRank: "ASC" },
+    const orgRootData = await this.orgRootRepository.findOne({ 
+      where: { id: rootId }
     });
+    if (!orgRootData) throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูล");
+    
+    const posMaster = await this.posMasterRepository
+      .createQueryBuilder("posMaster")
+      .leftJoinAndSelect("posMaster.positions", "position")
+      .leftJoinAndSelect("position.posType", "posType")
+      .leftJoinAndSelect("position.posLevel", "posLevel")
+      .where("posMaster.orgRootId = :rootId", { rootId })
+      .orderBy("posType.posTypeRank", "ASC")
+      .addOrderBy("posLevel.posLevelRank", "ASC")
+      .getMany();
+    
+    const _posMaster = posMaster.map((x) => ({
+      type: [...new Set(x.positions.flatMap((y) => y.posType.posTypeName))].join(","),
+      typeRank: [...new Set(x.positions.flatMap((y) => y.posType.posTypeRank))].join(""),
+      level: [...new Set(x.positions.flatMap((y) => y.posLevel.posLevelName))].join(","),
+      levelRank: [...new Set(x.positions.flatMap((y) => `${y.posType.posTypeRank}${y.posLevel.posLevelRank}`))].join(""),
+    }))
+    // .sort((x:any, y:any) => parseInt(x.typeRank) - parseInt(y.typeRank))
+    // .sort((x:any, y:any) => parseInt(x.levelRank) - parseInt(y.levelRank));
 
-    const mapData = posType.map((type) => ({
-      id: type.id,
-      typeName: type.posTypeName,
-      levels: posLevel
-        .filter((level) => level.posTypeId === type.id)
-        .map((level) => ({ levelName: level.posLevelName, id: level.id })),
-    }));
 
-    let _data: any = [];
-    mapData.forEach((type, idx) => {
-      type.levels.forEach((level, idy) => {
-        _data.push({
-          typeName: idy == 0 ? type.typeName : "",
-          levelName: level.levelName,
-          total:
-            orgRootData.length > 0
-              ? orgRootData[0].posMasters.flatMap((x) =>
-                  x.positions
-                    .filter((y) => y.posLevelId === level.id && y.posTypeId === type.id)
-                    .map((z) => ({
-                      position: z.positionName || "",
-                    })),
-                ).length
-              : 0,
-          remark: "",
-        });
-      });
-      _data.push({
-        typeName: "",
-        levelName: "รวม",
-        total:
-          orgRootData.length > 0
-            ? orgRootData[0].posMasters.flatMap((x) =>
-                x.positions
-                  .filter((y) => y.posTypeId === type.id)
-                  .map((z) => ({
-                    position: z.positionName || "",
-                  })),
-              ).length
-            : 0,
-        remark: "",
-      });
-    });
-    _data.push({
-      typeName: "",
-      levelName: "รวมทั้งสิ้น",
-      total:
-        orgRootData.length > 0 ? orgRootData[0].posMasters.flatMap((x) => x.positions).length : 0,
-      remark: "",
-    });
+    // console.log("XXX: ",_posMaster)
+    const groupPosMaster = _posMaster.reduce((total: any, idx: any) => {
+      const sortedLevel = idx.level.split(",").sort().join(",");
+      const key = `${idx.type}-${sortedLevel}`;
+    
+      if (!total[key]) {
+        total[key] = { 
+          type: idx.type, 
+          typeRank: idx.typeRank,
+          level: sortedLevel,
+          LeaveType: idx.levelRank,
+          total: 0,
+          remark: "" 
+        };
+      }
+      total[key].total += 1;
+      return total;
+    }, {});
 
-    return new HttpSuccess({
-      template: "report4",
-      reportName: "report4",
-      data: {
+    let result = Object.values(groupPosMaster)
+    .sort((x:any, y:any) => parseInt(x.typeRank) - parseInt(y.typeRank))
+    .sort((x:any, y:any) => parseInt(x.levelRank) - parseInt(y.levelRank));;
+    // let _TypeTemp = "";
+    // result = result.map((item: any) => {
+    //   if (item.type === _TypeTemp) {
+    //     return { ...item, type: "" };
+    //   }
+    //   _TypeTemp = item.type;
+    //   return item;
+    // });
+    
+    return new HttpSuccess({ 
+      template: "report4", 
+      reportName: "report4", 
+      data: { 
         dateCurrent: Extension.ToThaiShortDate(new Date()),
-        rootName: orgRootData.length > 0 ? orgRootData[0].orgRootName : "-",
-        data: _data,
-      },
-    });
+        rootName: orgRootData ? orgRootData.orgRootName : "-",
+        data: result 
+      } 
+    });    
+
   }
 }