diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 86dca0db..e623570b 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -1369,7 +1369,7 @@ export class ProfileController extends Controller {
       if (body.isDirector == true) {
         condition = {
           orgRootId: posMaster.orgRootId || "",
-          isDirector: true,
+          isDirectorChild: true,
         };
       }
       const [lists, total] = await AppDataSource.getRepository(viewDirectorActing)
@@ -4263,7 +4263,7 @@ export class ProfileController extends Controller {
         child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
         node: null,
         nodeId: null,
-        type: "EMPLOYEE",
+        type: profile.employeeClass,
         salary:
           profile && profile.profileSalarys.length > 0 ? profile.profileSalarys[0].amount : null,
       };
diff --git a/src/entities/CommandSendCC.ts b/src/entities/CommandSendCC.ts
index 0db6e339..d29e023e 100644
--- a/src/entities/CommandSendCC.ts
+++ b/src/entities/CommandSendCC.ts
@@ -6,7 +6,7 @@ import { CommandSend } from "./CommandSend";
 export class CommandSendCC extends EntityBase {
   @Column({
     nullable: true,
-    comment: "เพศ",
+    comment: "ชื่อ",
     length: 255,
     default: null,
   })
diff --git a/src/entities/view/viewDirectorActing.ts b/src/entities/view/viewDirectorActing.ts
index 9ad8515c..5addfba3 100644
--- a/src/entities/view/viewDirectorActing.ts
+++ b/src/entities/view/viewDirectorActing.ts
@@ -16,7 +16,8 @@ import { ViewColumn, ViewEntity } from "typeorm";
                     ELSE \`orgChild4Child\`.\`orgChild4ShortName\`
                 END),
                 \`bma_ehr_organization_demo\`.\`posMaster\`.\`posMasterNo\`) AS \`posNo\`,
-        \`posMasterChild\`.\`isDirector\` AS \`isDirector\`,
+        \`posMasterChild\`.\`isDirector\` AS \`isDirectorChild\`,
+        \`posMaster\`.\`isDirector\` AS \`isDirector\`,
         \`bma_ehr_organization_demo\`.\`posLevel\`.\`posLevelName\` AS \`posLevel\`,
         \`bma_ehr_organization_demo\`.\`posType\`.\`posTypeName\` AS \`posType\`,
         \`bma_ehr_organization_demo\`.\`posMaster\`.\`orgRootId\` AS \`orgRootId\`,
@@ -61,6 +62,8 @@ export class viewDirectorActing {
   @ViewColumn()
   isDirector: boolean;
   @ViewColumn()
+  isDirectorChild: boolean;
+  @ViewColumn()
   orgRootId: string;
   @ViewColumn()
   actFullNameId: string;