diff --git a/src/modules/05_placement/views/09_reportMain.vue b/src/modules/05_placement/views/09_reportMain.vue
index faa55bb04..6c9966d53 100644
--- a/src/modules/05_placement/views/09_reportMain.vue
+++ b/src/modules/05_placement/views/09_reportMain.vue
@@ -71,7 +71,7 @@ const splitterModel = ref<number>(14);
 /** tree*/
 const filterTree = ref<string>("");
 const nodeId = ref<string>("");
-const orgTreeDnaId = ref<string>("");
+const orgTreeId = ref<string>("");
 const nodeLevel = ref<number>(0);
 const node = ref<DataStructureTree[]>([]);
 const expanded = ref<string[]>([]);
@@ -96,7 +96,7 @@ function onSelectedNode(data: any) {
   org.value = data.orgName;
   nodeId.value = data.orgTreeId;
   nodeLevel.value = data.orgLevel;
-  orgTreeDnaId.value = data.orgTreeDnaId;
+  orgTreeId.value = data.orgTreeId;
   expandedModal.value = false;
 }
 
@@ -110,7 +110,7 @@ function fetchDataReport() {
   const queryParams = {
     nodeId:
       reportType.value.type === "probation" && reportType.value.id === "2"
-        ? orgTreeDnaId.value
+        ? orgTreeId.value
         : nodeId.value,
     node: nodeLevel.value,
     startDate: dateToISO(dateStart.value),
@@ -184,7 +184,7 @@ function clearFilter() {
   org.value = "";
   nodeId.value = "";
   nodeLevel.value = 0;
-  orgTreeDnaId.value = "";
+  orgTreeId.value = "";
   reportType.value = undefined;
   detailReport.value = undefined;
   pdfSrc.value = undefined;
diff --git a/src/modules/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue
index 01454d49f..a4817882c 100644
--- a/src/modules/09_leave/views/06_ReportMain.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -112,7 +112,7 @@ const nodeId = ref<string>("");
 const nodeLevel = ref<number>(0);
 const node = ref<DataStructureTree[]>([]);
 const expanded = ref<string[]>([]);
-const orgTreeDnaId = ref<string>("");
+const orgTreeId = ref<string>("");
 
 /** ฟังก์ชันเรียกข้อมูลโครงสร้างหน่วยงาน*/
 async function fetchDataTree() {
@@ -136,7 +136,7 @@ function onSelectedNode(data: any) {
   nodeId.value = data.orgTreeId;
   nodeLevel.value = data.orgLevel;
   expandedModal.value = false;
-  orgTreeDnaId.value = data.orgTreeDnaId;
+  orgTreeId.value = data.orgTreeId;
   updateLeaveday();
 }
 
@@ -221,7 +221,7 @@ async function fetchLeaveday(
   startDate: Date,
   endDate: Date
 ) {
-  const nodeIdVal = typeReport.value === 3 ? orgTreeDnaId.value : nodeId.value;
+  const nodeIdVal = typeReport.value === 3 ? orgTreeId.value : nodeId.value;
   const body = {
     type:
       year === "FULL"
@@ -337,7 +337,7 @@ function filterOption(val: string, update: any, typeOp: string) {
 function clearData() {
   nodeId.value = "";
   nodeLevel.value = 0;
-  orgTreeDnaId.value = "";
+  orgTreeId.value = "";
   org.value = "";
   typeReport.value = null;
   yearType.value = "FULL";
@@ -414,7 +414,7 @@ function getReport() {
         : "WEEKLY",
     startDate: dateToISO(dateStart.value),
     endDate: dateToISO(dateEnd.value),
-    nodeId: orgTreeDnaId.value,
+    nodeId: orgTreeId.value,
     node: nodeLevel.value,
   };
   http
@@ -847,7 +847,10 @@ onMounted(() => {
                           </template>
                         </datepicker>
                       </div>
-                      <div class="col-12" v-if="yearType == 'MONTH' || leaveType == 'MONTH'">
+                      <div
+                        class="col-12"
+                        v-if="yearType == 'MONTH' || leaveType == 'MONTH'"
+                      >
                         <datepicker
                           v-model="dateMonth"
                           :locale="'th'"