diff --git a/src/modules/09_scholarship/views/detail.vue b/src/modules/09_scholarship/views/detail.vue
index 898ba70..555e40f 100644
--- a/src/modules/09_scholarship/views/detail.vue
+++ b/src/modules/09_scholarship/views/detail.vue
@@ -271,13 +271,17 @@ function onOpenReturn() {
   dialogReturn.value = true;
 }
 
-function onDownload(type: string) {
+async function onDownload(type: string) {
   showLoader();
-  http
+  await http
     .get(config.API.developmentScholarshipReport + `/${id.value}`)
-    .then((res) => {
+    .then(async (res) => {
       const dataList = res.data.result;
-      genReport(dataList, "ฟอร์มรายงานตัวกลับเข้ารับราชการ(ต้นแบบ)", type);
+      await genReport(
+        dataList,
+        "ฟอร์มรายงานตัวกลับเข้ารับราชการ(ต้นแบบ)",
+        type
+      );
     })
     .catch((e) => {
       messageError($q, e);
@@ -470,9 +474,7 @@ function fetchDataDetail(id: string) {
       dataPerson.positionSide = data.posExecutive ? data.posExecutive : "-";
       dataPerson.org = data.org ? data.org : "-";
 
-      dataGuarantor.citizenId = data.guarantorCitizenId
-        ? data.guarantorCitizenId
-        : "-";
+      dataGuarantor.citizenId = data.guarantorCitizenId;
       dataGuarantor.name = `${data.guarantorPrefix}${data.guarantorFirstName} ${data.guarantorLastName}`;
       dataGuarantor.position = data.position ? data.position : "-";
       dataGuarantor.type = data.posTypeguarantorName
@@ -1072,7 +1074,8 @@ onMounted(async () => {
                   </template>
                 </datepicker>
               </div>
-              <div class="col-12">
+
+              <div class="col-12" v-if="dataGuarantor.citizenId">
                 <q-card bordered tyle="border: 1px solid #d6dee1">
                   <div class="text-weight-medium bg-grey-1 q-py-sm q-px-md">
                     ข้อมูลผู้ค้ำประกัน