diff --git a/src/modules/06_evaluate/components/PopupCheckFeatures.vue b/src/modules/06_evaluate/components/PopupCheckFeatures.vue
index 9867b55..00f9583 100644
--- a/src/modules/06_evaluate/components/PopupCheckFeatures.vue
+++ b/src/modules/06_evaluate/components/PopupCheckFeatures.vue
@@ -21,10 +21,7 @@ const props = defineProps({
     type: String,
     default: "ตรวจสอบคุณสมบัติ",
   },
-  desc: {
-    type: String,
-    default: "",
-  },
+  educations: Array,
   closeModal: {
     type: Function,
     default: () => {},
@@ -39,35 +36,38 @@ const rows = ref<any[]>([
     level: "หลักสูตร ๔ ปี",
     expert: "๖ ปี",
     special: "๘ ปี",
-    checked: "",
+    checked: "ต่ำกว่าปริญญาตรี",
+    // year: 4,
   },
   {
     degree: "ปริญญาตรี หรือเทียบเท่า",
     level: "หลักสูตร ๕ ปี",
     expert: "๕ ปี",
     special: "๗ ปี",
-    checked: "",
+    checked: "ปริญญาตรี",
+    year: 5,
   },
   {
     degree: "ปริญญาตรี หรือเทียบเท่า",
     level: "หลักสูตร ๖ ปี",
     expert: "๔ ปี",
     special: "๖ ปี",
-    checked: "",
+    checked: "ปริญญาตรี",
+    year: 6,
   },
   {
     degree: "ปริญญาโท หรือเทียบเท่า",
     level: "-",
     expert: "๔ ปี",
     special: "๖ ปี",
-    checked: "",
+    checked: "ปริญญาโท",
   },
   {
     degree: "ปริญญาเอก หรือเทียบเท่า",
     level: "-",
     expert: "๒ ปี",
     special: "๔ ปี",
-    checked: "",
+    checked: "ปริญญาเอก",
   },
 ]);
 
@@ -177,7 +177,14 @@ watch(props, () => {
                 {{ props.row.special }}
               </q-td>
               <q-td key="checked" :props="props">
-                <q-icon name="checked" color="primary" />
+                <!-- v-if="educations?.find((x:any)=> (props.row.year && x.educationLevel == props.row.checked && x.year == props.row.year) || (!props.row.year && x.educationLevel == props.row.checked))" -->
+
+                <q-icon
+                  v-if="props.rowIndex == 0"
+                  name="checked"
+                  color="primary"
+                  size="xs"
+                />
               </q-td>
             </q-tr>
           </template>
diff --git a/src/modules/06_evaluate/components/Tab1.vue b/src/modules/06_evaluate/components/Tab1.vue
index 8e5efa0..1763fe9 100644
--- a/src/modules/06_evaluate/components/Tab1.vue
+++ b/src/modules/06_evaluate/components/Tab1.vue
@@ -330,7 +330,9 @@ onMounted(async () => {
                 v-if="store.step === 1"
                 @update:spec="updateCheckSpec"
                 :evaluateId="store.evaluateId"
+                :educations="formDetail?.educations"
               />
+
               <Step2
                 v-if="store.step === 2"
                 @update:form="updateformCommand"
diff --git a/src/modules/06_evaluate/components/step/step1.vue b/src/modules/06_evaluate/components/step/step1.vue
index 7e3774a..1742760 100644
--- a/src/modules/06_evaluate/components/step/step1.vue
+++ b/src/modules/06_evaluate/components/step/step1.vue
@@ -18,6 +18,7 @@ const props = defineProps({
   evaluateId: {
     type: String,
   },
+  educations: Array
 });
 
 const modal = ref<boolean>(false);
@@ -205,7 +206,7 @@ onMounted(() => {
     </q-item>
   </q-list>
 
-  <PopupCheckFeatures :modal="modal" :show="show" :close-modal="closeModal" />
+  <PopupCheckFeatures :modal="modal" :show="show" :close-modal="closeModal" :educations="educations"/>
 </template>
 
 <style scoped></style>