diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 77aeb4546..d4693d183 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -303,7 +303,7 @@ async function fetchDatadetail() {
 
     mainStore.rowsAdd = props.data.persons;
     mainStore.rowsCheck = mainStore.rowsAdd.filter(
-      (item: any) => item.report === false && item.isSuspend === 'NEW' && item.isSend === 'NEW'
+      (item: any) => item.isSuspend === "NEW" && item.isSend === "NEW"
     );
     /** MAP รายชื่อกรรมการ หน้าหลัก */
     const dataMap = props.data.director.map((item: any) => ({
@@ -645,7 +645,11 @@ onMounted(async () => {
                   </div> -->
                   <div
                     class="col-xs-12 col-sm-4"
-                    v-if="route.name === 'disciplineDisciplinaryEdit'"
+                    v-if="
+                      route.name === 'disciplineDisciplinaryEdit' &&
+                      props.data &&
+                      props.data.status === 'NEW'
+                    "
                   >
                     <q-btn
                       class="q-pa-sm"