diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index a7c71883..9e8063a9 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -3562,8 +3562,9 @@ export class ReportController extends Controller {
         "posMasters.orgChild2",
         "posMasters.orgChild3",
         "posMasters.orgChild4",
-        "posMasters.next_holder",
-        "posMasters.next_holder",
+        "posMasters.current_holder",
+        "posMasters.current_holder.profileSalary",
+        "posMasters.current_holder.profileEducations",
         "posMasters.next_holder",
         "posMasters.next_holder.posLevel",
         "posMasters.next_holder.posType",
@@ -3596,6 +3597,9 @@ export class ReportController extends Controller {
         "posMasters.orgChild2",
         "posMasters.orgChild3",
         "posMasters.orgChild4",
+        "posMasters.current_holder",
+        "posMasters.current_holder.profileSalary",
+        "posMasters.current_holder.profileEducations",
         "posMasters.next_holder",
         "posMasters.next_holder.posLevel",
         "posMasters.next_holder.posType",
@@ -3628,6 +3632,9 @@ export class ReportController extends Controller {
         "posMasters.orgChild2",
         "posMasters.orgChild3",
         "posMasters.orgChild4",
+        "posMasters.current_holder",
+        "posMasters.current_holder.profileSalary",
+        "posMasters.current_holder.profileEducations",
         "posMasters.next_holder",
         "posMasters.next_holder.posLevel",
         "posMasters.next_holder.posType",
@@ -3660,6 +3667,9 @@ export class ReportController extends Controller {
         "posMasters.orgChild2",
         "posMasters.orgChild3",
         "posMasters.orgChild4",
+        "posMasters.current_holder",
+        "posMasters.current_holder.profileSalary",
+        "posMasters.current_holder.profileEducations",
         "posMasters.next_holder",
         "posMasters.next_holder.posLevel",
         "posMasters.next_holder.posType",
@@ -3693,6 +3703,9 @@ export class ReportController extends Controller {
         "posMasters.orgChild2",
         "posMasters.orgChild3",
         "posMasters.orgChild4",
+        "posMasters.current_holder",
+        "posMasters.current_holder.profileSalary",
+        "posMasters.current_holder.profileEducations",
         "posMasters.next_holder",
         "posMasters.next_holder.posLevel",
         "posMasters.next_holder.posType",
@@ -3826,6 +3839,22 @@ export class ReportController extends Controller {
                   education = _education[0];
                 }
               }
+              else {
+                if (
+                  posMaster.current_holder != null &&
+                  posMaster.current_holder.profileEducations != null &&
+                  posMaster.current_holder.profileEducations.length > 0
+                ) {
+                  let _education: any = posMaster.current_holder.profileEducations.sort(
+                    (a, b) =>
+                      (b.finishDate == null ? 0 : b.finishDate.getTime()) -
+                      (a.finishDate == null ? 0 : a.finishDate.getTime()),
+                  );
+                  if (_education.length > 0) {
+                    education = _education[0];
+                  }
+                }
+              }
               let salary: any = "";
               if (
                 posMaster.next_holder != null &&
@@ -3841,7 +3870,22 @@ export class ReportController extends Controller {
                   salary = _salary[0];
                 }
               }
-
+              else {
+                if (
+                  posMaster.current_holder != null &&
+                  posMaster.current_holder.profileSalary != null &&
+                  posMaster.current_holder.profileSalary.length > 0
+                ) {
+                  let _salary: any = posMaster.current_holder.profileSalary.sort(
+                    (a, b) =>
+                      (b.commandDateAffect == null ? 0 : b.commandDateAffect.getTime()) -
+                      (a.commandDateAffect == null ? 0 : a.commandDateAffect.getTime()),
+                  );
+                  if (_salary.length > 0) {
+                    salary = _salary[0];
+                  }
+                }
+              }
               let node = {
                 posMasterOrder: posMaster.posMasterOrder, //
                 isSit: posMaster.isSit, //
@@ -3919,7 +3963,9 @@ export class ReportController extends Controller {
                                 : "-",
                 profileFullname:
                   posMaster.next_holder == null
-                    ? "- ว่าง -"
+                    ? posMaster.current_holder == null 
+                      ? "- ว่าง -"
+                      : `${posMaster.current_holder.prefix}${posMaster.current_holder.firstName} ${posMaster.current_holder.lastName}`
                     : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
                 profilePosMasterNo:
                   posMaster.next_holder == null
@@ -4200,6 +4246,22 @@ export class ReportController extends Controller {
                     education = _education[0];
                   }
                 }
+                else {
+                  if (
+                    posMaster.current_holder != null &&
+                    posMaster.current_holder.profileEducations != null &&
+                    posMaster.current_holder.profileEducations.length > 0
+                  ) {
+                    let _education: any = posMaster.current_holder.profileEducations.sort(
+                      (a, b) =>
+                        (b.finishDate == null ? 0 : b.finishDate.getTime()) -
+                        (a.finishDate == null ? 0 : a.finishDate.getTime()),
+                    );
+                    if (_education.length > 0) {
+                      education = _education[0];
+                    }
+                  }
+                }
                 let salary: any = "";
                 if (
                   posMaster.next_holder != null &&
@@ -4215,6 +4277,22 @@ export class ReportController extends Controller {
                     salary = _salary[0];
                   }
                 }
+                else {
+                  if (
+                    posMaster.current_holder != null &&
+                    posMaster.current_holder.profileSalary != null &&
+                    posMaster.current_holder.profileSalary.length > 0
+                  ) {
+                    let _salary: any = posMaster.current_holder.profileSalary.sort(
+                      (a, b) =>
+                        (b.commandDateAffect == null ? 0 : b.commandDateAffect.getTime()) -
+                        (a.commandDateAffect == null ? 0 : a.commandDateAffect.getTime()),
+                    );
+                    if (_salary.length > 0) {
+                      salary = _salary[0];
+                    }
+                  }
+                }
 
                 let node = {
                   posMasterOrder: posMaster.posMasterOrder, //
@@ -4293,7 +4371,9 @@ export class ReportController extends Controller {
                                   : "-",
                   profileFullname:
                     posMaster.next_holder == null
-                      ? "- ว่าง -"
+                      ? posMaster.current_holder == null 
+                        ? "- ว่าง -"
+                        : `${posMaster.current_holder.prefix}${posMaster.current_holder.firstName} ${posMaster.current_holder.lastName}`
                       : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
                   profilePosMasterNo:
                     posMaster.next_holder == null
@@ -4582,6 +4662,22 @@ export class ReportController extends Controller {
                       education = _education[0];
                     }
                   }
+                  else {
+                    if (
+                      posMaster.current_holder != null &&
+                      posMaster.current_holder.profileEducations != null &&
+                      posMaster.current_holder.profileEducations.length > 0
+                    ) {
+                      let _education: any = posMaster.current_holder.profileEducations.sort(
+                        (a, b) =>
+                          (b.finishDate == null ? 0 : b.finishDate.getTime()) -
+                          (a.finishDate == null ? 0 : a.finishDate.getTime()),
+                      );
+                      if (_education.length > 0) {
+                        education = _education[0];
+                      }
+                    }
+                  }
                   let salary: any = "";
                   if (
                     posMaster.next_holder != null &&
@@ -4597,6 +4693,22 @@ export class ReportController extends Controller {
                       salary = _salary[0];
                     }
                   }
+                  else {
+                    if (
+                      posMaster.current_holder != null &&
+                      posMaster.current_holder.profileSalary != null &&
+                      posMaster.current_holder.profileSalary.length > 0
+                    ) {
+                      let _salary: any = posMaster.current_holder.profileSalary.sort(
+                        (a, b) =>
+                          (b.commandDateAffect == null ? 0 : b.commandDateAffect.getTime()) -
+                          (a.commandDateAffect == null ? 0 : a.commandDateAffect.getTime()),
+                      );
+                      if (_salary.length > 0) {
+                        salary = _salary[0];
+                      }
+                    }
+                  }
 
                   let node = {
                     posMasterOrder: posMaster.posMasterOrder, //
@@ -4675,7 +4787,9 @@ export class ReportController extends Controller {
                                     : "-",
                     profileFullname:
                       posMaster.next_holder == null
-                        ? "- ว่าง -"
+                        ? posMaster.current_holder == null 
+                          ? "- ว่าง -"
+                          : `${posMaster.current_holder.prefix}${posMaster.current_holder.firstName} ${posMaster.current_holder.lastName}`
                         : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
                     profilePosMasterNo:
                       posMaster.next_holder == null
@@ -4980,6 +5094,22 @@ export class ReportController extends Controller {
                         education = _education[0];
                       }
                     }
+                    else {
+                      if (
+                        posMaster.current_holder != null &&
+                        posMaster.current_holder.profileEducations != null &&
+                        posMaster.current_holder.profileEducations.length > 0
+                      ) {
+                        let _education: any = posMaster.current_holder.profileEducations.sort(
+                          (a, b) =>
+                            (b.finishDate == null ? 0 : b.finishDate.getTime()) -
+                            (a.finishDate == null ? 0 : a.finishDate.getTime()),
+                        );
+                        if (_education.length > 0) {
+                          education = _education[0];
+                        }
+                      }
+                    }
                     let salary: any = "";
                     if (
                       posMaster.next_holder != null &&
@@ -4995,6 +5125,22 @@ export class ReportController extends Controller {
                         salary = _salary[0];
                       }
                     }
+                    else {
+                      if (
+                        posMaster.current_holder != null &&
+                        posMaster.current_holder.profileSalary != null &&
+                        posMaster.current_holder.profileSalary.length > 0
+                      ) {
+                        let _salary: any = posMaster.current_holder.profileSalary.sort(
+                          (a, b) =>
+                            (b.commandDateAffect == null ? 0 : b.commandDateAffect.getTime()) -
+                            (a.commandDateAffect == null ? 0 : a.commandDateAffect.getTime()),
+                        );
+                        if (_salary.length > 0) {
+                          salary = _salary[0];
+                        }
+                      }
+                    }
 
                     let node = {
                       posMasterOrder: posMaster.posMasterOrder, //
@@ -5073,7 +5219,9 @@ export class ReportController extends Controller {
                                       : "-",
                       profileFullname:
                         posMaster.next_holder == null
-                          ? "- ว่าง -"
+                          ? posMaster.current_holder == null 
+                            ? "- ว่าง -"
+                            : `${posMaster.current_holder.prefix}${posMaster.current_holder.firstName} ${posMaster.current_holder.lastName}`
                           : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
                       profilePosMasterNo:
                         posMaster.next_holder == null
@@ -5382,6 +5530,22 @@ export class ReportController extends Controller {
                         education = _education[0];
                       }
                     }
+                    else {
+                      if (
+                        posMaster.current_holder != null &&
+                        posMaster.current_holder.profileEducations != null &&
+                        posMaster.current_holder.profileEducations.length > 0
+                      ) {
+                        let _education: any = posMaster.current_holder.profileEducations.sort(
+                          (a, b) =>
+                            (b.finishDate == null ? 0 : b.finishDate.getTime()) -
+                            (a.finishDate == null ? 0 : a.finishDate.getTime()),
+                        );
+                        if (_education.length > 0) {
+                          education = _education[0];
+                        }
+                      }
+                    }
                     let salary: any = "";
                     if (
                       posMaster.next_holder != null &&
@@ -5397,6 +5561,22 @@ export class ReportController extends Controller {
                         salary = _salary[0];
                       }
                     }
+                    else {
+                      if (
+                        posMaster.current_holder != null &&
+                        posMaster.current_holder.profileSalary != null &&
+                        posMaster.current_holder.profileSalary.length > 0
+                      ) {
+                        let _salary: any = posMaster.current_holder.profileSalary.sort(
+                          (a, b) =>
+                            (b.commandDateAffect == null ? 0 : b.commandDateAffect.getTime()) -
+                            (a.commandDateAffect == null ? 0 : a.commandDateAffect.getTime()),
+                        );
+                        if (_salary.length > 0) {
+                          salary = _salary[0];
+                        }
+                      }
+                    }
 
                     let node = {
                       posMasterOrder: posMaster.posMasterOrder, //
@@ -5475,7 +5655,9 @@ export class ReportController extends Controller {
                                       : "-",
                       profileFullname:
                         posMaster.next_holder == null
-                          ? "- ว่าง -"
+                          ? posMaster.current_holder == null 
+                            ? "- ว่าง -"
+                            : `${posMaster.current_holder.prefix}${posMaster.current_holder.firstName} ${posMaster.current_holder.lastName}`
                           : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
                       profilePosMasterNo:
                         posMaster.next_holder == null
@@ -5693,11 +5875,11 @@ export class ReportController extends Controller {
                   }),
               );
               _node = null;
-            }
-          }
-        }
-      }
-    }
+            } // End for orgChild4
+          } // End for orgChild3
+        } // End for orgChild2
+      } // End for orgChild1
+    } // End for orgRoot
 
     //   const metaData = { template: "report2", reportName: "report2", data: { data } };
     //   sendWebSocket(metaData);