diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index 74ef251d0..5e996a521 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -516,9 +516,9 @@ async function onSearch() {
       total.value = res.data.result.total;
       rows.value = data.map((item: any, index: number) => ({
         no: index + 1,
-        fullName: `${item.prefix ?? ""}${item.firstName ?? ""} ${
-          item.lastName ?? ""
-        }`,
+        fullName: item.firstName
+          ? `${item.prefix ?? ""}${item.firstName ?? ""} ${item.lastName ?? ""}`
+          : "-",
         posNo: item.searchShortName ?? "-",
         position: item.position ?? "-",
         posType: item.posTypeName ?? "-",
@@ -556,8 +556,8 @@ function exportToExcel() {
   XLSX.utils.sheet_add_aoa(worksheet, [headers], { origin: "A1" });
 
   const workbook = XLSX.utils.book_new();
-  XLSX.utils.book_append_sheet(workbook, worksheet, "ข้อมูล"); //ชื่อไฟล เเละ ชื่อ sheet
-  XLSX.writeFile(workbook, "ข้อมูล.xlsx");
+  XLSX.utils.book_append_sheet(workbook, worksheet, "รายงานทะเบียนประวัติ"); //ชื่อไฟล เเละ ชื่อ sheet
+  XLSX.writeFile(workbook, "รายงานทะเบียนประวัติ.xlsx");
 }
 
 onMounted(async () => {
@@ -624,7 +624,11 @@ onMounted(async () => {
               <template v-if="org" v-slot:append>
                 <q-icon
                   name="cancel"
-                  @click.stop.prevent="org = '',storeReport.formFilter.node = null,storeReport.formFilter.nodeId = null"
+                  @click.stop.prevent="
+                    (org = ''),
+                      (storeReport.formFilter.node = null),
+                      (storeReport.formFilter.nodeId = null)
+                  "
                   class="cursor-pointer"
                 />
               </template>