diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue
index e752aba..ca4ab4e 100644
--- a/src/modules/06_evaluate/components/step/step2.vue
+++ b/src/modules/06_evaluate/components/step/step2.vue
@@ -103,7 +103,49 @@ async function onClickDowloadFile(
   fileName: string
 ) {
   showLoader();
+      let educations: any = [];
+      if(profile.value!=null){
+        profile.value.education.map((e: any) => {
+        educations.push({
+          educationLevel: e.educationLevel ?? "",
+          finishYear: e.finishDate == null ? "":new Date(e.finishDate).getFullYear()+543,
+          institute: e.institute ?? "",
+        });
+      });}
+      let certificates: any = [];
+      if(profile.value!=null){
+        profile.value.certificate.map((e: any) => {
+        certificates.push({
+          certificateNo: e.certificateNo ?? "",
+          certificateType: e.certificateType ?? "",
+          issuer: e.issuer ?? "",
+        });
+      });}
+      let salaries: any = [];
+      if(profile.value!=null){
+        profile.value.salaries.map((e: any) => {
+        salaries.push({
+          date: e.date == null ? "":date2Thai(new Date(e.date)),
+          position: e.position ?? "",
+          amount: e.amount ?? "",
+        });
+      });}
+      let trainings: any = [];
+      if(profile.value!=null){
+        profile.value.training.map((e: any) => {
+        trainings.push({
+          yearly: e.yearly ?? "",
+          startDate: e.startDate == null ? "":date2Thai(new Date(e.startDate)),
+          endDate: e.endDate == null ? "":date2Thai(new Date(e.endDate)),
+          name: e.name ?? "",
+          topic: e.topic ?? "",
+        });
+      });}
   const data = Object.assign(
+    { educations: educations },
+    { certificates: certificates },
+    { salaries: salaries },
+    { trainings: trainings },
     { fullName: profile.value == null ? "" : profile.value.fullName },
     { position: profile.value == null ? "" : profile.value.position },
     { positionLevel: profile.value == null ? "" : profile.value.positionLevel },
@@ -283,7 +325,7 @@ onMounted(async () => {
 <template>
   <div class="row q-col-gutter-md">
     <!-- แบบพิจารณาคุณสมบัติบุคคล -->
-    <div class="col-6" v-if="store.currentStep === 2">
+    <div class="col-6">
       <q-card bordered style="border: 1px solid #d6dee1">
         <div class="text-weight-medium bg-grey-1 q-py-sm q-px-md">
           แบบพิจารณาคุณสมบัติบุคคล