diff --git a/src/api/recruiting/api.recruit.ts b/src/api/recruiting/api.recruit.ts
index 5c9cc69e1..38d004a97 100644
--- a/src/api/recruiting/api.recruit.ts
+++ b/src/api/recruiting/api.recruit.ts
@@ -42,5 +42,9 @@ export default {
   exportPassExamList: (id: string) => `${recruit_report}pass/${id}`,
   periodRecruitToPlacement: (examId: string) => `${recruit}placement/${examId}`,
 
-  reportRecruit:(type:string)=>`${recruit}${type}`
+  reportRecruit:(type:string)=>`${recruit}${type}`,
+
+
+  exportCandidateListNew: (id: string) => `${recruit_report}candidate-new/${id}`,
+
 };
diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index c057526ed..4d6a37981 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -206,40 +206,42 @@ async function fetchData() {
  * ดาวน์โหลดรายชื่อผู้สอบแข่งขันได้
  * @param id รอบสอบเเข่งขัน
  */
-function clickPassExam(id: string) {
+async function clickPassExam(id: string) {
   showLoader();
-  http
+  await http
     .get(config.API.exportPassExamList(id))
-    .then((res) => {
+    .then(async (res) => {
       const data = res.data.result;
       data.reportName = `CandidateList`;
-      genReport(data, data.reportName, "pdf");
+      await genReport(data, data.reportName, "pdf");
     })
     .catch(async (e) => {
       messageError($q, JSON.parse(await e.response.data.text()));
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /**
  * ดาวน์โหลดรายชื่อผู้มีสิทธิ์สอบ
  * @param id รอบสอบเเข่งขัน
  */
-function clickCandidateList(id: string) {
+async function clickCandidateList(id: string) {
   showLoader();
-  http
-    .get(config.API.exportCandidateList(id))
-    .then((res) => {
+  await http
+    .get(config.API.exportCandidateListNew(id))
+    .then(async (res) => {
       const data = res.data.result;
       data.reportName = `CandidateList`;
-      genReport(data, data.reportName, "pdf");
+      await genReport(data, data.reportName, "pdf");
     })
     .catch(async (e) => {
       messageError($q, JSON.parse(await e.response.data.text()));
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /**
diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
index fbda1be2c..3a987724b 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
@@ -168,37 +168,39 @@ const visibleColumnsHistory = ref<String[]>([
 ]);
 
 /**  ดาวน์โหลดรายชื่อผู้สอบคัดเลือกคนพิการได้ */
-function clickPassExam(id: string) {
+async function clickPassExam(id: string) {
   showLoader();
-  http
+  await http
     .get(config.API.exportDisablePassExamList(id))
-    .then((res) => {
+    .then(async (res) => {
       const data = res.data.result;
       data.reportName = `CandidateList`;
-      genReport(data, data.reportName, "pdf");
+      await genReport(data, data.reportName, "pdf");
     })
     .catch(async (e) => {
-      hideLoader();
       messageError($q, e);
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /** ดาวน์โหลดรายชื่อผู้มีสิทธิ์สอบ */
-function clickCandidateList(id: string) {
+async function clickCandidateList(id: string) {
   showLoader();
-  http
+  await http
     .get(config.API.exportDisableCandidateList(id))
-    .then((res) => {
+    .then(async (res) => {
       const data = res.data.result;
       data.reportName = `CandidateList`;
-      genReport(data, data.reportName, "pdf");
+      await genReport(data, data.reportName, "pdf");
     })
     .catch(async (e) => {
-      hideLoader();
       messageError($q, e);
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /**
diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index d282229e2..2a4ade79f 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -875,13 +875,13 @@ async function clickdownloadFile(type: string) {
         `แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ-${fullname.value}`,
         type
       );
-      hideLoader();
     })
     .catch(async (e) => {
       messageError($q, JSON.parse(await e.response.data.text()));
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 /** เช็ค จำนวนเดือน เเละ วันที่เริ่ม ไม่เท่ากับ undefined*/
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index 75241f9f0..b2b8d206b 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -6,7 +6,7 @@ import { useRoute, useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useProbationDataStore } from "@/modules/05_placement/storeProbation";
-import genReport from "@/plugins/genreport";
+
 
 import FormUploadFile from "@/modules/05_placement/components/probation/FormEvaluation/FormUploadFile.vue";
 import DialogSelectAuthority from "@/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue";
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
index e0f0f4ec7..e76f4593b 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
@@ -97,13 +97,13 @@ async function FileDownload(type: string) {
           `แบบบันทึกผล(ผู้บังคับบัญชา)_${probationStore.person.name}_ครั้งที่${numTab.no}`,
           type
         );
-        hideLoader();
       })
       .catch(async (e) => {
         messageError($q, JSON.parse(await e.response.data.text()));
-        hideLoader();
       })
-      .finally(() => {});
+      .finally(() => {
+        hideLoader();
+      });
   } else {
     //ผุ้บังคับ
     showLoader();
@@ -116,13 +116,13 @@ async function FileDownload(type: string) {
           `แบบบันทึกผล(ผู้บังคับบัญชา)_${probationStore.person.name}_ครั้งที่${numTab.no}`,
           type
         );
-        hideLoader();
       })
       .catch(async (e) => {
         messageError($q, JSON.parse(await e.response.data.text()));
-        hideLoader();
       })
-      .finally(() => {});
+      .finally(() => {
+        hideLoader();
+      });
   }
 }
 
diff --git a/src/modules/11_discipline/components/9_DisciplineReport/Main.vue b/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
index 841eda64e..728cd7dfc 100644
--- a/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
+++ b/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
@@ -5,7 +5,7 @@ import { useRoute } from "vue-router";
 import { VuePDF, usePDF } from "@tato30/vue-pdf";
 import axios from "axios";
 import genReportXLSX from "@/plugins/genreportxlsx";
-import genReport from "@/plugins/genreport";
+
 
 import http from "@/plugins/http";
 import config from "@/app.config";