diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 98d3a3353..280d6d138 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -253,7 +253,7 @@ watch(
         <div class="row q-col-gutter-sm items-start q-mb-sm">
           <div class="col-12 col-sm-5 col-md-3">
             <q-select
-              label="สถานภาพ"
+              label="ประเภทตำแหน่ง"
               v-model="employeeClass"
               :options="employeeClassOption"
               emit-value
diff --git a/src/modules/09_leave/components/02_WorkList/Tab1.vue b/src/modules/09_leave/components/02_WorkList/Tab1.vue
index fbda1a43e..9dca91523 100644
--- a/src/modules/09_leave/components/02_WorkList/Tab1.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab1.vue
@@ -57,7 +57,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "profileType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "profileType",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/09_leave/components/02_WorkList/Tab2.vue b/src/modules/09_leave/components/02_WorkList/Tab2.vue
index 6469328c6..f6a17f085 100644
--- a/src/modules/09_leave/components/02_WorkList/Tab2.vue
+++ b/src/modules/09_leave/components/02_WorkList/Tab2.vue
@@ -50,7 +50,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "profileType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "profileType",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/09_leave/components/02_WorkList/ToolBar.vue b/src/modules/09_leave/components/02_WorkList/ToolBar.vue
index f401aebff..d3b300aab 100644
--- a/src/modules/09_leave/components/02_WorkList/ToolBar.vue
+++ b/src/modules/09_leave/components/02_WorkList/ToolBar.vue
@@ -137,7 +137,7 @@ function calculateMaxDate() {
         dense
         option-value="id"
         option-label="name"
-        label="สถานภาพ"
+        label="ประเภทตำแหน่ง"
         use-input
         v-model="roleStatus"
         hide-selected
diff --git a/src/modules/09_leave/components/02_WorkList/ToolBarDate.vue b/src/modules/09_leave/components/02_WorkList/ToolBarDate.vue
index 0dab24ce3..ff6c77587 100644
--- a/src/modules/09_leave/components/02_WorkList/ToolBarDate.vue
+++ b/src/modules/09_leave/components/02_WorkList/ToolBarDate.vue
@@ -111,7 +111,7 @@ function filterOptionFn(val: string, update: Function) {
         dense
         option-value="id"
         option-label="name"
-        label="สถานภาพ"
+        label="ประเภทตำแหน่ง"
         use-input
         v-model="roleStatus"
         hide-selected
diff --git a/src/modules/09_leave/components/05_Leave/TableList.vue b/src/modules/09_leave/components/05_Leave/TableList.vue
index 86ab16cba..8ae79f261 100644
--- a/src/modules/09_leave/components/05_Leave/TableList.vue
+++ b/src/modules/09_leave/components/05_Leave/TableList.vue
@@ -36,7 +36,7 @@ const columnsLeave = ref<QTableProps["columns"]>([
   {
     name: "profileType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "profileType",
     headerStyle: "font-size: 14px",
@@ -160,7 +160,7 @@ const columnsReject = ref<QTableProps["columns"]>([
   {
     name: "profileType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "profileType",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/09_leave/components/05_Leave/ToolBarLeave.vue b/src/modules/09_leave/components/05_Leave/ToolBarLeave.vue
index cbdde4c80..6526523bd 100644
--- a/src/modules/09_leave/components/05_Leave/ToolBarLeave.vue
+++ b/src/modules/09_leave/components/05_Leave/ToolBarLeave.vue
@@ -141,7 +141,7 @@ watch(
         dense
         option-value="id"
         option-label="name"
-        label="สถานภาพ"
+        label="ประเภทตำแหน่ง"
         use-input
         :model-value="
           querySting.profileType == 'ALL' ? 'ทั้งหมด' : querySting.profileType
diff --git a/src/modules/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue
index c7d3475c9..024e0e380 100644
--- a/src/modules/09_leave/views/06_ReportMain.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -317,7 +317,7 @@ onMounted(() => {
                 dense
                 v-model="employeeClass"
                 :options="employeeClassOption"
-                label="สถานภาพ"
+                label="ประเภทตำแหน่ง"
                 emit-value
                 map-options
                 option-label="name"
diff --git a/src/modules/09_leave/views/07_ReportCheckin.vue b/src/modules/09_leave/views/07_ReportCheckin.vue
index e69c6654b..6df613344 100644
--- a/src/modules/09_leave/views/07_ReportCheckin.vue
+++ b/src/modules/09_leave/views/07_ReportCheckin.vue
@@ -292,7 +292,7 @@ onMounted(() => {
               dense
               v-model="employeeClass"
               :options="employeeClassOption"
-              label="สถานภาพ"
+              label="ประเภทตำแหน่ง"
               emit-value
               map-options
               option-label="name"
diff --git a/src/modules/11_discipline/components/1_Complaint/EditPage.vue b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
index 067a12b9a..ecff74148 100644
--- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
@@ -89,7 +89,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "profileType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: false,
     field: "profileType",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
index cc09b074a..77ef0f04b 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
@@ -62,7 +62,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "profileType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "profileType",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
index 078a0c20e..6814f13ba 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
@@ -66,7 +66,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "profileType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "profileType",
     headerStyle: "font-size: 14px",
@@ -272,7 +272,7 @@ onMounted(async () => {
               :options="employeeClassOption"
               option-value="id"
               option-label="name"
-              label="สถานภาพ"
+              label="ประเภทตำแหน่ง"
               style="min-width: 250px"
               @update:model-value="getList"
             />
diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
index e86c3f0fd..349a3befc 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
@@ -119,7 +119,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "profileType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "profileType",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
index 47f429640..c21b24d3d 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
@@ -77,7 +77,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "profileType",
     align: "left",
-    label: "สถานภาพ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "profileType",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts
index eed996867..fc3ba8341 100644
--- a/src/modules/11_discipline/store/Main.ts
+++ b/src/modules/11_discipline/store/Main.ts
@@ -48,7 +48,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     {
       name: "profileType",
       align: "left",
-      label: "สถานภาพ",
+      label: "ประเภทตำแหน่ง",
       sortable: true,
       field: "profileType",
       headerStyle: "font-size: 14px",
@@ -159,7 +159,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     {
       name: "profileType",
       align: "left",
-      label: "สถานภาพ",
+      label: "ประเภทตำแหน่ง",
       sortable: true,
       field: "profileType",
       headerStyle: "font-size: 14px",
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
index c7759be51..5b8f09bf1 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
@@ -186,7 +186,7 @@ onMounted(() => {
                 borderless
                 readonly
                 :model-value="formDetail.posNo"
-                label="ตำแหน่งเลขที่"
+                label="เลขที่ตำแหน่ง"
               />
             </div>
             <div class="col-xs-6 col-sm-4 col-md-3">
diff --git a/src/modules/12_evaluatePersonal/store/Evaluate.ts b/src/modules/12_evaluatePersonal/store/Evaluate.ts
index 6ec02e82f..97a32cde2 100644
--- a/src/modules/12_evaluatePersonal/store/Evaluate.ts
+++ b/src/modules/12_evaluatePersonal/store/Evaluate.ts
@@ -44,9 +44,9 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => {
   function convertType(val: string) {
     if (val === "EXPERT") {
       return "ชำนาญการ";
-    } else {
+    } else if (val == "SPECIAL_EXPERT") {
       return "ชำนาญการพิเศษ";
-    }
+    } else return "เชี่ยวชาญ";
   }
 
   const rows = ref<EvaluateList[]>([]);
@@ -134,7 +134,7 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => {
     {
       name: "positionNumber",
       align: "left",
-      label: "ตำแหน่งเลขที่",
+      label: "เลขที่ตำแหน่ง",
       sortable: true,
       field: "positionNumber",
       headerStyle: "font-size: 14px",
diff --git a/src/modules/12_evaluatePersonal/store/EvaluateDetail.ts b/src/modules/12_evaluatePersonal/store/EvaluateDetail.ts
index 2887fdca6..f4bcb2fad 100644
--- a/src/modules/12_evaluatePersonal/store/EvaluateDetail.ts
+++ b/src/modules/12_evaluatePersonal/store/EvaluateDetail.ts
@@ -112,7 +112,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
     {
       name: "posNo",
       align: "left",
-      label: "ตำแหน่งเลขที่",
+      label: "เลขที่ตำแหน่ง",
       sortable: true,
       field: "posNo",
       headerStyle: "font-size: 14px",
@@ -139,7 +139,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
     {
       name: "positionType",
       align: "left",
-      label: "ประเภทตำแหน่ง",
+      label: "ตำแหน่งประเภท",
       sortable: true,
       field: "positionType",
       headerStyle: "font-size: 14px",