diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index b433b459c..31a93624a 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -309,9 +309,10 @@ watch(props.data, async () => {
     formData.investigationStatusResult = props.data.investigationStatusResult;
     formData.investigationCauseText = props.data.investigationCauseText;
     formData.result = props.data.result;
-    
-    investigateFactStore.rowsAdd = props.data.persons
-    rows.value = props.data.directors
+    formData.disciplineInvestigateDocs = props.data.disciplineInvestigateDocs;
+
+    investigateFactStore.rowsAdd = props.data.persons;
+    rows.value = props.data.directors;
   }
 });
 
@@ -332,6 +333,7 @@ function uploadFileRelevant() {
     })
     .finally(async () => {
       hideLoader();
+      formData.evidenceFiles = null;
     });
 }
 
@@ -352,6 +354,7 @@ function uploadFile() {
     })
     .finally(async () => {
       hideLoader();
+      formData.documentFile = null;
     });
 }
 
@@ -586,6 +589,7 @@ onMounted(async () => {
             outlined
             hide-bottom-space
             dense
+            lazy-rules
             ref="investigationDetailRef"
             :rules="[(val) => !!val || `${'กรุณาเลือกลักษณะการสืบสวน'}`]"
             v-model="formData.investigationDetail"
@@ -1105,11 +1109,6 @@ onMounted(async () => {
                 dense
                 v-model="formData.evidenceFiles"
                 label="เอกสารที่เกี่ยวข้องกับการสืบสวน"
-                lazy-rules
-                :rules="[
-                  (val) =>
-                    !!val || 'กรุณาเลือกไฟล์เอกสารที่เกี่ยวข้องกับการสืบสวน',
-                ]"
                 hide-bottom-space
               >
                 <template v-slot:prepend>
@@ -1118,6 +1117,7 @@ onMounted(async () => {
               </q-file>
               <div class="col-1 self-center">
                 <q-btn
+                  v-if="formData.evidenceFiles"
                   size="14px"
                   flat
                   round
@@ -1201,8 +1201,6 @@ onMounted(async () => {
               dense
               v-model="formData.documentFile"
               label="ไฟล์เอกสารหลักฐาน"
-              lazy-rules
-              :rules="[(val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']"
               hide-bottom-space
             >
               <template v-slot:prepend>
@@ -1211,6 +1209,7 @@ onMounted(async () => {
             </q-file>
             <div class="col-1 self-center">
               <q-btn
+                v-if="formData.documentFile"
                 size="14px"
                 flat
                 round
@@ -1223,8 +1222,15 @@ onMounted(async () => {
               >
             </div>
           </div>
+          <div v-if="formData.disciplineInvestigateDocs.length === 0" class="col-12">
+            <q-card class="bg-grey-4 q-ma-sm q-py-md" bordered>
+              <p class="text-subtitle1 text-center q-ma-none text-bold">
+                ไม่มีรายการเอกสาร
+              </p>
+            </q-card>
+          </div>
           <div class="col-xs-12 q-pa-sm row">
-            <q-list bordered separator class="full-width">
+            <q-list  separator class="full-width">
               <q-item
                 clickable
                 v-ripple
@@ -1264,6 +1270,7 @@ onMounted(async () => {
               </q-item>
             </q-list>
           </div>
+          
         </q-card>
       </div>
     </div>
diff --git a/src/modules/11_discipline/interface/request/investigateFact.ts b/src/modules/11_discipline/interface/request/investigateFact.ts
index 24b56069c..0ec2e06f4 100644
--- a/src/modules/11_discipline/interface/request/investigateFact.ts
+++ b/src/modules/11_discipline/interface/request/investigateFact.ts
@@ -19,7 +19,7 @@ interface FormData {
   result: string
   directors:object|null
   status:string
-  disciplineInvestigateDocs:object|null
+  disciplineInvestigateDocs:any
   disciplineInvestigateRelevantDocs:object|null
   documentFile:any|null
   respondentType:string