diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 7cce510c..c9302286 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -1954,27 +1954,71 @@ export class CommandController extends Controller {
             ];
           }
           const orgLeave = _OrgLeave.filter((x: any) => x !== undefined && x !== null).join("\n");
+          let profileTemp = {
+            org: "-",
+            position: "-",
+            posLevel: "-",
+            posNo: "-",
+          };
+          if (commandCode == "C-PM-21") {
+            profileTemp.position = profile?.positionTemp ?? "-";
+            profileTemp.posLevel = profile?.posLevelNameTemp ?? "-";
+            profileTemp.org = (profile?.child4Temp == null ? "" : profile?.child4Temp + "\n") +
+              (profile?.child3Temp == null ? "" : profile?.child3Temp + "\n") +
+              (profile?.child2Temp == null ? "" : profile?.child2Temp + "\n") +
+              (profile?.child1Temp == null ? "" : profile?.child1Temp + "\n") +
+              (profile?.rootTemp == null ? "" : profile?.rootTemp)
+            if (profile?.nodeTemp) {
+              switch (profile?.nodeTemp) {
+                case "4":
+                  profileTemp.posNo = `${profile.child4ShortNameTemp} ${profile?.posMasterNoTemp}`;
+                  break
+                case "3":
+                  profileTemp.posNo = `${profile.child3ShortNameTemp} ${profile?.posMasterNoTemp}`; 
+                  break
+                case "2":
+                  profileTemp.posNo = `${profile.child2ShortNameTemp} ${profile?.posMasterNoTemp}`;
+                  break
+                case "1":
+                  profileTemp.posNo = `${profile.child1ShortNameTemp} ${profile?.posMasterNoTemp}`; 
+                  break
+                case "0":
+                  profileTemp.posNo = `${profile.rootShortNameTemp} ${profile?.posMasterNoTemp}`; 
+                  break
+                default: break;
+              }
+            }
+          }
           return {
             no: Extension.ToThaiNumber((idx + 1).toString()),
-            org: profile?.isLeave == false
-              ? (_child4 == null ? "" : _child4 + "\n") +
-                (_child3 == null ? "" : _child3 + "\n") +
-                (_child2 == null ? "" : _child2 + "\n") +
-                (_child1 == null ? "" : _child1 + "\n") +
-                (_root == null ? "" : _root)
-              : orgLeave,
+            org: commandCode != "C-PM-21"
+              ? profile?.isLeave == false
+                ? (_child4 == null ? "" : _child4 + "\n") +
+                  (_child3 == null ? "" : _child3 + "\n") +
+                  (_child2 == null ? "" : _child2 + "\n") +
+                  (_child1 == null ? "" : _child1 + "\n") +
+                  (_root == null ? "" : _root)
+                : orgLeave
+              : profileTemp.org,
             fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
             citizenId: Extension.ToThaiNumber(x.citizenId),
-            position: profile?.position ? profile?.position : "-",
-            posLevel:
-              profile?.posType && profile?.posLevel
+            position: commandCode != "C-PM-21"
+              ? profile?.position 
+                ? profile?.position 
+                : "-"
+              : profileTemp.position,
+            posLevel: commandCode != "C-PM-21"
+              ? profile?.posType && profile?.posLevel
                 ? Extension.ToThaiNumber(
                     `${profile?.posType.posTypeShortName} ${profile?.posLevel.posLevelName}`,
                   )
-                : "-",
-            posNo: shortName
-              ? Extension.ToThaiNumber(shortName)
-              : "-",
+                : "-"
+              : Extension.ToThaiNumber(profileTemp.posLevel),
+            posNo: commandCode != "C-PM-21"
+              ? shortName
+                ? Extension.ToThaiNumber(shortName)
+                : "-"
+              : Extension.ToThaiNumber(profileTemp.posNo),
             amount: x.amount ? Extension.ToThaiNumber(x.amount.toLocaleString()) : "-",
             dateRetire: profile?.dateRetire
               ? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile?.dateRetire))