diff --git a/.env.production b/.env.production
index 277058b..17b2902 100644
--- a/.env.production
+++ b/.env.production
@@ -10,4 +10,6 @@ VITE_URL_SSO: VITE_URL_SSO
 # VITE_CLIENTID_KEYCLOAK: "bma-ehr-exam-vue3"
 # VITE_URL_KEYCLOAK: "https://id.frappet.synology.me/"
 # VITE_API_URI_CONFIG: "https://bma-ehr.frappet.synology.me/api/v1"
-# VITE_API_PUBLISH_URL: "https://bma-ehr-publish.frappet.synology.me"
\ No newline at end of file
+# VITE_API_PUBLISH_URL: "https://bma-ehr-publish.frappet.synology.me"
+VITE_API_REPORT_URL=VITE_API_REPORT_URL
+
diff --git a/entrypoint.sh b/entrypoint.sh
index d84bb9b..c386c66 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -16,6 +16,8 @@ do
   sed -i 's|VITE_CLIENTSECRET_KEYCLOAK|'${VITE_CLIENTSECRET_KEYCLOAK}'|g' $file
   sed -i 's|VITE_MANUAL_URL|'${VITE_MANUAL_URL}'|g' $file
   sed -i 's|VITE_URL_SSO|'${VITE_URL_SSO}'|g' $file
+  sed -i 's|VITE_API_REPORT_URL|'${VITE_API_REPORT_URL}'|g' $file 
+
 
 done
 
diff --git a/src/api/index.ts b/src/api/index.ts
index b646c57..90fc5db 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -4,6 +4,7 @@ import { ref } from "vue";
 const env = ref<string>(process.env.NODE_ENV || "development");
 export const apiUrlConfig = import.meta.env.VITE_API_URI_CONFIG;
 export const apiUrlConfigPublish = import.meta.env.VITE_API_PUBLISH_URL;
+export const apiUrlConfigReport = import.meta.env.VITE_API_REPORT_URL;
 
 // if (process.env.VUE_APP_TEST) {
 //   env = "test";
@@ -15,6 +16,8 @@ const config = ref<any>({
     API_URL_SUPPORT: "https://bma-ehr.frappet.synology.me/api/v1/support",
     MEET_URI: "meet.frappet.com",
     LINK_EVALUATE_PUBLISH: "https://bma-ehr-publish.frappet.synology.me",
+    API_REPORT_TEMPLATE_URI:
+      "https://report-server.frappet.synology.me/api/v1/report-template",
   },
   test: {
     API_URI: "http://localhost:5010/api/v1",
@@ -27,6 +30,7 @@ const config = ref<any>({
       "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230707_115124.json",
     MEET_URI: "meet.frappet.com",
     LINK_EVALUATE_PUBLISH: apiUrlConfigPublish,
+    API_REPORT_TEMPLATE_URI: apiUrlConfigReport,
   },
 });
 
@@ -36,6 +40,9 @@ const MEET_URI = ref<string>(config.value[env.value].MEET_URI);
 const LINK_EVALUATE_PUBLISH = ref<string>(
   config.value[env.value].LINK_EVALUATE_PUBLISH
 );
+const API_REPORT_TEMPLATE_URI = ref<string>(
+  config.value[env.value].API_REPORT_TEMPLATE_URI
+);
 
 export default {
   env: env.value,
@@ -44,4 +51,5 @@ export default {
   API_URL_SUPPORT: API_URL_SUPPORT.value,
   MEET_URI: MEET_URI.value,
   LINK_EVALUATE_PUBLISH: LINK_EVALUATE_PUBLISH.value,
+  API_REPORT_TEMPLATE_URI: API_REPORT_TEMPLATE_URI.value,
 };
diff --git a/src/api/reports/api.report.ts b/src/api/reports/api.report.ts
new file mode 100644
index 0000000..e8c98b4
--- /dev/null
+++ b/src/api/reports/api.report.ts
@@ -0,0 +1,7 @@
+import env from "../index";
+
+const reportTemplate = `${env.API_REPORT_TEMPLATE_URI}`;
+
+export default {
+  reportTemplate,
+};
diff --git a/src/app.config.ts b/src/app.config.ts
index 0b1387d..ecbd141 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -14,6 +14,9 @@ import kpi from "./api/KPI/api.kpis";
 import probation from "./api/probation/api.probation";
 import development from "./api/api.development";
 
+/** API reports  */
+import reports from "./api/reports/api.report";
+
 const API = {
   ...testtest,
   ...retirementResign,
@@ -27,6 +30,8 @@ const API = {
   ...kpi,
   ...probation,
   ...development,
+  //reports
+  ...reports,
 };
 
 const path =
@@ -61,7 +66,9 @@ const generatePopupPath = (routeName: any, type: string) => {
     return `${path}/manual/chapter-6-user-transfer`;
   }
   if (routeName.includes("appealComplain")) {
-    return `${path}/manual/chapter-${type ? "4" : "7"}-user${type}-appeal-complain`;
+    return `${path}/manual/chapter-${
+      type ? "4" : "7"
+    }-user${type}-appeal-complain`;
   }
   if (routeName.includes("KPI-evaluator")) {
     return `${path}/manual/chapter-9-user-KPI-evaluator`;
diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue
index f3e70c5..0fb2ead 100644
--- a/src/modules/10_registry/views/main.vue
+++ b/src/modules/10_registry/views/main.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
 import avatar from "@/assets/avatar_user.jpg";
 import { ref, reactive, onMounted } from "vue";
+import axios from "axios";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
 import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
-import axios from "axios";
+import genReport from "@/plugins/genreport";
+
 //หน้าเมนู
 import InformationPage from "@/modules/10_registry/tabs/01_information.vue";
 import GovernmentPage from "@/modules/10_registry/tabs/02_government.vue";
@@ -18,8 +20,6 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useQuasar } from "quasar";
 
-const apiGenReport =
-  "https://report-server.frappet.synology.me/api/v1/report-template/docx";
 const store = useRegistryInFormationStore();
 const $q = useQuasar();
 const dataStore = useDataStore();
@@ -42,14 +42,20 @@ async function onClickDownloadKp7(type: string) {
   showLoader();
   const url =
     type === "FULL"
-      ?  config.API.profileReportId(store.profileId, dataStore.officerType == "OFFICER" ? 'profile':'profile-employee')
-      : config.API.profileKp7ShortId(store.profileId, dataStore.officerType == "OFFICER" ? 'profile':'profile-employee');
+      ? config.API.profileReportId(
+          store.profileId,
+          dataStore.officerType == "OFFICER" ? "profile" : "profile-employee"
+        )
+      : config.API.profileKp7ShortId(
+          store.profileId,
+          dataStore.officerType == "OFFICER" ? "profile" : "profile-employee"
+        );
   const fileName = type === "FULL" ? "ก.พ.7/ก.ก.1" : "ประวัติแบบย่อ";
   await http
     .get(url)
     .then(async (res) => {
       const data = await res.data.result;
-      await genReport(data, fileName);
+      await genReport(data, fileName, "pdf");
       hideLoader();
     })
     .catch((err) => {
@@ -59,46 +65,6 @@ async function onClickDownloadKp7(type: string) {
     .finally(() => {});
 }
 
-async function genReport(data: any, fileName: string) {
-  showLoader();
-  await axios
-    .post(apiGenReport, data, {
-      headers: {
-        accept: "application/pdf",
-        "content-Type": "application/json",
-      },
-      responseType: "arraybuffer",
-    })
-    .then((res) => {
-      const data = res.data;
-      if (data) {
-        // สร้าง Blob จาก array buffer
-        const blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-        });
-
-        // สร้าง URL สำหรับไฟล์ Blob
-        const url = URL.createObjectURL(blob);
-
-        // สร้างลิงก์เพื่อดาวน์โหลดไฟล์
-        const link = document.createElement("a");
-        link.href = url;
-        link.download = `${fileName}.pdf`; // กำหนดชื่อไฟล์ที่จะดาวน์โหลด
-        document.body.appendChild(link);
-        link.click();
-
-        // ลบ URL ที่สร้างขึ้นหลังจากใช้งาน
-        URL.revokeObjectURL(url);
-      }
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
 /**
  * ฟังชั่นกลับหน้าหลัก
  */
diff --git a/src/plugins/genreport.ts b/src/plugins/genreport.ts
index 5346948..3c8a638 100644
--- a/src/plugins/genreport.ts
+++ b/src/plugins/genreport.ts
@@ -1,4 +1,6 @@
 import axios from "axios";
+import config from "@/app.config";
+
 import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 
@@ -7,18 +9,21 @@ const $q = useQuasar();
 const mixin = useCounterMixin();
 const { showLoader, hideLoader, messageError } = mixin;
 
-const apiGenReport =
-  "https://report-server.frappet.synology.me/api/v1/report-template/docx";
-
-async function genReport(data: any, fileName: string) {
+async function genReport(data: any, fileName: string, type: string = "docx") {
   showLoader();
   await axios
-    .post(apiGenReport, data, {
-      headers: {
-        accept:
-          "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-        "content-Type": "application/json",
-      },
+    .post(config.API.reportTemplate + `/docx`, data, {
+      headers:
+        type == "docx"
+          ? {
+              accept:
+                "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+              "content-Type": "application/json",
+            }
+          : {
+              accept: "application/pdf",
+              "content-Type": "application/json",
+            },
       responseType: "arraybuffer",
     })
     .then((res) => {
@@ -35,7 +40,7 @@ async function genReport(data: any, fileName: string) {
         // สร้างลิงก์เพื่อดาวน์โหลดไฟล์
         const link = document.createElement("a");
         link.href = url;
-        link.download = `${fileName}.docx`; // กำหนดชื่อไฟล์ที่จะดาวน์โหลด
+        link.download = `${fileName}.${type === "docx" ? "docx" : "pdf"}`; // กำหนดชื่อไฟล์ที่จะดาวน์โหลด
         document.body.appendChild(link);
         link.click();