diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index f18a9300a..6f6e1b670 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -243,6 +243,7 @@ function changOption(val: string) {
     val === "KPI9"
   ) {
     persanalId.value = val === "KPI8" ? persanalId.value : "";
+    fullNameShow.value = val === "KPI8" ? fullNameShow.value : "";
     organization.value = val === "KPI8" ? "" : organization.value;
   } else {
     round.value = "";
@@ -747,6 +748,20 @@ onMounted(() => {
                 <div class="col-12 row q-pa-sm">
                   <q-space />
                   <q-btn
+                    :disable="
+                      ((typeReport == 'KPI1' ||
+                        typeReport == 'KPI2' ||
+                        typeReport == 'KPI3' ||
+                        typeReport == 'KPI7' ||
+                        typeReport == 'KPI9') &&
+                        (round == '' || organization == '')) ||
+                      ((typeReport == 'KPI4' ||
+                        typeReport == 'KPI5' ||
+                        typeReport == 'KPI6') &&
+                        persanalId == '') ||
+                      (typeReport == 'KPI8' &&
+                        (round == '' || persanalId == ''))
+                    "
                     dense
                     class="q-px-md"
                     label="ค้นหา"