diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue
index eeb90fb..edfa89c 100644
--- a/src/modules/06_evaluate/components/step/step2.vue
+++ b/src/modules/06_evaluate/components/step/step2.vue
@@ -225,8 +225,8 @@ async function fetchPathUpload(
     fileList: {
       fileName: type,
       metadata: {
-        subject: performance.value,
-        author: performanceOwner.value,
+        subject: formCommand.subject,
+        author: formCommand.author,
       },
     },
   };
diff --git a/src/modules/06_evaluate/components/step/step6.vue b/src/modules/06_evaluate/components/step/step6.vue
index 9cb7cd9..b6b9c92 100644
--- a/src/modules/06_evaluate/components/step/step6.vue
+++ b/src/modules/06_evaluate/components/step/step6.vue
@@ -33,10 +33,6 @@ const emit = defineEmits(["update:form"]);
 
 const fileEvaluation1 = ref<any>();
 
-const performance = ref<string>("");
-const performanceOwner = ref<string>("");
-const position = ref<string>("");
-
 /** form จัดเตรียมเอกสารเล่ม 2*/
 const formCommand = reactive<FormCommand>({
   commanderFullname: "",
@@ -92,9 +88,9 @@ async function fetchPathUpload(
     fileList: {
       fileName: type,
       metadata: {
-        subject: performance.value,
-        author: performanceOwner.value,
-        position: position.value,
+        subject: formCommand.subject,
+        author: formCommand.author,
+        position: formCommand.assignedPosition,
       },
     },
   };