diff --git a/src/api/index.ts b/src/api/index.ts
index 7e3e8e494..986a55a8f 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -37,7 +37,7 @@ const config = ref<any>({
     API_REPORT2_URI: "https://hrmsbkk.case-collection.com/api/v2",
     LINK_EVALUATE_PUBLISH: "https://bma-ehr-publish.frappet.synology.me",
     API_REPORT_TEMPLATE_URI:
-      "https://report-server.frappet.synology.me/api/v1/report-template",
+      "https://hrmsbkk.case-collection.com/api/v1/report-template",
     API_SUPPORT_URI: "https://hrmsbkk.case-collection.com/api/v1/support",
     DASHBOARD_URL: dashboardPanelUrl,
   },
diff --git a/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue b/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
index 7bb2337b8..d8ca65090 100644
--- a/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
+++ b/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
@@ -25,7 +25,7 @@ const props = defineProps<{
 
 const selected = ref<DataOperators[]>([]);
 const keyword = ref<string>("");
-const isAct = ref<boolean>(true);
+const isAct = ref<boolean>(false);
 const rows = ref<DataOperators[]>([]);
 const visibleColumns = ref<string[]>([
   "posNo",
@@ -79,10 +79,12 @@ const roleName = ref<string>("");
 const roleNameList = ref<string[]>([
   "เจ้าหน้าที่ดำเนินการ",
   "ผอ.สกจ.",
-  "รักษาการ ผอ.สกจ.",
-  "ผอ. กบห.",
-  "รักษาการ ผอ. กบห.",
-  "ผอ. ส่วน",
+  "รักษาการฯ ผอ.สกจ.",
+  "ผอ.",
+  "รักษาการฯ ผอ.",
+  "ผอ.ส่วน",
+  "หน.กลุ่มงาน",
+  "หน.ฝ่าย",
 ]);
 const roleNameOption = ref<string[]>(roleNameList.value);
 
@@ -166,7 +168,7 @@ function fetchNewListOperator() {
 function filterOptionFnRoleName(val: string, update: Function) {
   update(() => {
     if (val === "") {
-      roleNameOption.value = [];
+      roleNameOption.value = roleNameList.value;
     } else {
       const needle = val.toLowerCase();
       roleNameOption.value = roleNameList.value.filter((item: string) =>