diff --git a/src/modules/11_discipline/components/1_Complaint/MainPage.vue b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
index 800fd3acd..d2e3c1a8b 100644
--- a/src/modules/11_discipline/components/1_Complaint/MainPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
@@ -28,7 +28,7 @@ const filterKeyword = ref<string>("");
 const maxPage = ref<number>(1);
 const page = ref<number>(1);
 const rowsPerPage = ref<number>(10);
-const statusFilter = ref<string>("ALL");
+const statusFilter = ref<string>("NEW");
 
 async function updatePagingProp(rowPerpage: number, pageCurrent: number) {
   rowsPerPage.value = rowPerpage;
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
index 87fb70752..b27372954 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
@@ -25,7 +25,7 @@ function resetFilter() {
     getList();
   }
 }
-const statusFilter = ref<string>("ALL");
+const statusFilter = ref<string>("NEW");
 const currentPage = ref<number>(1);
 const maxPage = ref<number>(1);
 const page = ref<number>(1);
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 310c9543e..a09239c23 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -669,8 +669,6 @@ onMounted(async () => {
                       map-options
                       hide-bottom-space
                       :options="complainstStore.complainantoptions"
-                      :rules="[(val) => !!val || `${'กรุณาเลือกผู้ร้องเรียน'}`]"
-                      lazy-rules
                       @update:model-value="
                         selectComplainant(formData.respondentType);
                         changeFormData();
@@ -709,41 +707,9 @@ onMounted(async () => {
                       v-model="formData.organizationId"
                       :options="organizationOption"
                       label="เลือกสำนักงาน"
-                      :rules="[(val) => !!val || `${'กรุณาเลือกสำนักงาน'}`]"
-                      lazy-rules
                       @update:model-value="changeFormData()"
                     />
                   </div>
-                  <!-- <div class="col-xs-12 col-sm-3" id="consideredAgency">
-                    <q-select
-                  ref="consideredAgencyRef"
-                  for="selectAgency"
-                  dense
-                  outlined
-                  v-model="formData.consideredAgency"
-                  :options="organizationOption"
-                  label="หน่วยงานที่พิจารณา"
-                  option-value="id"
-                  option-label="name"
-                  hide-bottom-space
-                  emit-value
-                  map-options
-                  :rules="[(val) => !!val || `${'กรุณาเลือกหน่วยงาน'}`]"
-                  lazy-rules
-                  use-input
-                  @filter="(inputValue: any,
-                  doneFn: Function) => filterSelector(inputValue, doneFn, 'filterconsideredAgencytoptions'
-                  )"
-                >
-                  <template v-slot:no-option>
-                    <q-item>
-                      <q-item-section class="text-grey">
-                        ไม่มีข้อมูล
-                      </q-item-section>
-                    </q-item>
-                  </template>
-                </q-select>
-                  </div> -->
                   <div
                     class="col-xs-12 col-sm-4"
                     v-if="
@@ -907,11 +873,6 @@ onMounted(async () => {
                             : null
                         "
                         :label="`${'วันที่มีคำสั่งให้สอบสวน'}`"
-                        :rules="[
-                          (val) =>
-                            !!val || `${'กรุณาเลือกวันที่มีคำสั่งให้สอบสวน'}`,
-                        ]"
-                        lazy-rules
                       >
                         <template v-slot:prepend>
                           <q-icon
@@ -958,11 +919,6 @@ onMounted(async () => {
                             : null
                         "
                         :label="`${'วันที่รับทราบข้อกล่าวหา'}`"
-                        :rules="[
-                          (val) =>
-                            !!val || `${'กรุณาเลือกวันที่รับทราบข้อกล่าวหา'}`,
-                        ]"
-                        lazy-rules
                       >
                         <template v-slot:prepend>
                           <q-icon
@@ -1037,7 +993,7 @@ onMounted(async () => {
                                 for="#daysExtend"
                                 outlined
                                 dense
-                                lazy-rules
+       
                                 ref="daysExtendRef"
                                 v-model="formData.daysExtend"
                                 :options="investigateDis.daysExtendOps"
@@ -1045,13 +1001,6 @@ onMounted(async () => {
                                 emit-value
                                 hide-bottom-space
                                 map-options
-                                :rules="[
-                                  (val) =>
-                                    formData.extendStatus
-                                      ? !!val ||
-                                        'กรุณาเลือกจำนวนวันที่ต้องการขยาย'
-                                      : true,
-                                ]"
                                 option-label="name"
                                 option-value="id"
                                 use-input
@@ -1099,7 +1048,6 @@ onMounted(async () => {
                                     "
                                     outlined
                                     dense
-                                    lazy-rules
                                     borderless
                                     hide-bottom-space
                                     :model-value="
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
index fc6bc9f12..5756dd897 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
@@ -22,7 +22,7 @@ const router = useRouter();
 const filter = ref<string>(""); //search data table
 const page = ref<number>(1);
 const maxPage = ref<number>(1);
-const status = ref<string>("ALL");
+const status = ref<string>("NEW");
 async function fetchListDisciplinary() {
   showLoader();
   await http
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
index 8bf753782..e8685f732 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
@@ -9,7 +9,7 @@ const filterRef = ref<any>(null);
 const attrs = ref<any>(useAttrs());
 const paging = ref<boolean>(true);
 const currentPage = ref<number>(1);
-const statusFilter = ref<string>("ALL");
+const statusFilter = ref<string>("NEW");
 
 /** รับ props มาจากหน้าหลัก */
 const props = defineProps({
diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index daa14549e..61b8d51ce 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -138,12 +138,13 @@ function onSubmit() {
         .then(() => {
           isSave.value = false;
           success($q, "บันทึกข้อมูลสำเร็จ");
+          props.fetchData();
         })
         .catch((err) => {
           messageError($q, err);
         })
         .finally(async () => {
-          await props.fetchData();
+
         });
     },
     "ยืนยันการบันทึกข้อมูล",
diff --git a/src/modules/11_discipline/components/4_Result/MainPage.vue b/src/modules/11_discipline/components/4_Result/MainPage.vue
index a3dcd7f45..30d9ff18a 100644
--- a/src/modules/11_discipline/components/4_Result/MainPage.vue
+++ b/src/modules/11_discipline/components/4_Result/MainPage.vue
@@ -26,7 +26,7 @@ const page = ref<number>(1);
 const pageSize = ref<number>(10);
 const maxPage = ref<number>(1);
 const filter = ref<string>("");
-const status = ref<string>("ALL");
+const status = ref<string>("DONE");
 /** function เรียกรายการสรุปผลการพิจารณาทางวินัย*/
 async function fetchListResult() {
   showLoader();
diff --git a/src/modules/11_discipline/components/4_Result/Table.vue b/src/modules/11_discipline/components/4_Result/Table.vue
index 0cfb4787e..6a9d2aba3 100644
--- a/src/modules/11_discipline/components/4_Result/Table.vue
+++ b/src/modules/11_discipline/components/4_Result/Table.vue
@@ -7,7 +7,7 @@ const table = ref<any>(null);
 const filterRef = ref<any>(null);
 const attrs = ref<any>(useAttrs());
 const paging = ref<boolean>(true);
-const statusFilter = ref<string>("ALL");
+const statusFilter = ref<string>("DONE");
 /** รับ props มาจากหน้าหลัก */
 const props = defineProps({
   count: Number,