diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index b03e0d965..3ce59c892 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -61,11 +61,21 @@ const menuList = readonly<any[]>([
     children: [
       {
         key: 3.1,
+        label: "ข้อมูลเกี่ยวกับบุคคล",
+        path: "masterPersonal",
+      },
+      {
+        key: 3.2,
+        label: "ข้อมูลตำแหน่ง",
+        path: "masterPosition",
+      },
+      {
+        key: 3.3,
         label: "ข้อมูลปฏิทินวันหยุด",
         path: "masterCalendarWork",
       },
       {
-        key: 3.2,
+        key: 3.4,
         label: "ข้อมูลเครื่องราชอิสริยาภรณ์",
         path: "masterInsignia",
       },
diff --git a/src/modules/01_metadataNew/components/personal/01ListPrefix.vue b/src/modules/01_metadataNew/components/personal/01ListPrefix.vue
new file mode 100644
index 000000000..dd89f390e
--- /dev/null
+++ b/src/modules/01_metadataNew/components/personal/01ListPrefix.vue
@@ -0,0 +1,3 @@
+<template>
+    คำนำหน้าชื่อ
+</template>
\ No newline at end of file
diff --git a/src/modules/01_metadataNew/components/personal/02ListRank.vue b/src/modules/01_metadataNew/components/personal/02ListRank.vue
new file mode 100644
index 000000000..c033171b7
--- /dev/null
+++ b/src/modules/01_metadataNew/components/personal/02ListRank.vue
@@ -0,0 +1,3 @@
+<template>
+    ยศ
+</template>
\ No newline at end of file
diff --git a/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue b/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
new file mode 100644
index 000000000..06e1e95ca
--- /dev/null
+++ b/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
@@ -0,0 +1,3 @@
+<template>
+    กลุ่มเลือด
+</template>
\ No newline at end of file
diff --git a/src/modules/01_metadataNew/components/personal/04ListGender.vue b/src/modules/01_metadataNew/components/personal/04ListGender.vue
new file mode 100644
index 000000000..fe540f2ec
--- /dev/null
+++ b/src/modules/01_metadataNew/components/personal/04ListGender.vue
@@ -0,0 +1,3 @@
+<template>
+   เพศ 
+</template>
\ No newline at end of file
diff --git a/src/modules/01_metadataNew/components/personal/05ListReligion.vue b/src/modules/01_metadataNew/components/personal/05ListReligion.vue
new file mode 100644
index 000000000..a71807508
--- /dev/null
+++ b/src/modules/01_metadataNew/components/personal/05ListReligion.vue
@@ -0,0 +1,3 @@
+<template>
+   ศาสนา 
+</template>
\ No newline at end of file
diff --git a/src/modules/01_metadataNew/components/personal/06ListRelationship.vue b/src/modules/01_metadataNew/components/personal/06ListRelationship.vue
new file mode 100644
index 000000000..9a64c12af
--- /dev/null
+++ b/src/modules/01_metadataNew/components/personal/06ListRelationship.vue
@@ -0,0 +1,3 @@
+<template>
+   สถานภาพ 
+</template>
\ No newline at end of file
diff --git a/src/modules/01_metadataNew/components/personal/DialogForm.vue b/src/modules/01_metadataNew/components/personal/DialogForm.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/modules/01_metadataNew/router.ts b/src/modules/01_metadataNew/router.ts
index 91cbaebff..36df4d815 100644
--- a/src/modules/01_metadataNew/router.ts
+++ b/src/modules/01_metadataNew/router.ts
@@ -4,6 +4,10 @@ const masterInsignia = () =>
   import("@/modules/01_metadataNew/views/insignia.vue");
 const dateilInsignia = () =>
   import("@/modules/01_metadataNew/components/insignia/InsigniaDetail.vue");
+  const personalPage = () =>
+  import("@/modules/01_metadataNew/views/personal.vue");
+  const positionPage = () =>
+  import("@/modules/01_metadataNew/views/position.vue");
 
 export default [
   {
@@ -36,4 +40,24 @@ export default [
       Role: "metadata",
     },
   },
+  {
+    path: "/master-data/personal",
+    name: "masterPersonal",
+    component: personalPage,
+    meta: {
+      Auth: true,
+      Key: [7],
+      Role: "metadata",
+    },
+  },
+  {
+    path: "/master-data/position",
+    name: "masterPosition",
+    component: positionPage,
+    meta: {
+      Auth: true,
+      Key: [7],
+      Role: "metadata",
+    },
+  },
 ];
diff --git a/src/modules/01_metadataNew/views/personal.vue b/src/modules/01_metadataNew/views/personal.vue
new file mode 100644
index 000000000..6ec599662
--- /dev/null
+++ b/src/modules/01_metadataNew/views/personal.vue
@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import ListPrefix from "@/modules/01_metadataNew/components/personal/01ListPrefix.vue";
+import ListRank from "@/modules/01_metadataNew/components/personal/02ListRank.vue";
+import ListBloodGroup from "@/modules/01_metadataNew/components/personal/03ListBloodGroup.vue";
+import ListGender from "@/modules/01_metadataNew/components/personal/04ListGender.vue";
+import ListReligion from "@/modules/01_metadataNew/components/personal/05ListReligion.vue";
+import ListRelationship from "@/modules/01_metadataNew/components/personal/06ListRelationship.vue";
+</script>
+
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    ข้อมูลเกี่ยวกับบุคคล
+  </div>
+
+  <q-card flat bordered class="q-pa-md">
+    <ListPrefix />
+    <ListRank />
+    <ListBloodGroup />
+    <ListGender />
+    <ListReligion />
+    <ListRelationship />
+  </q-card>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/01_metadataNew/views/position.vue b/src/modules/01_metadataNew/views/position.vue
new file mode 100644
index 000000000..f309c1b9a
--- /dev/null
+++ b/src/modules/01_metadataNew/views/position.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts"></script>
+
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    ข้อมูลตำแหน่ง
+  </div>
+
+  <q-card flat bordered class="q-pa-md"> ตำแหน่ง </q-card>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/02_organizationalNew/components/DialogFormDateTime.vue b/src/modules/02_organizationalNew/components/DialogFormDateTime.vue
index 8ed7e8166..74cfaa9b1 100644
--- a/src/modules/02_organizationalNew/components/DialogFormDateTime.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormDateTime.vue
@@ -84,24 +84,27 @@ function onSubmit() {
   });
 }
 
-function onClickPublish(){
-  dialogConfirm($q,()=>{
-
-
-  alert('get')
-  // showLoader()
-  // http
-  // .get(config.API.organizationPublishGet)
-  // .then((res)=>{
-    props.close?.()
-  // })
-  // .catch((e)=>{
-  //   messageError($q,e)
-  // })
-  // .finally(()=>{
-  //   hideLoader()
-  // })
-},'ยืนยันการเผยเเพร่ข้อมูล','ต้องการยืนยันการเผยเเพร่ข้อมูลนี้ใช่หรือไม่?')
+function onClickPublish() {
+  dialogConfirm(
+    $q,
+    () => {
+      alert("get");
+      // showLoader()
+      // http
+      // .get(config.API.organizationPublishGet)
+      // .then((res)=>{
+      props.close?.();
+      // })
+      // .catch((e)=>{
+      //   messageError($q,e)
+      // })
+      // .finally(()=>{
+      //   hideLoader()
+      // })
+    },
+    "ยืนยันการเผยเเพร่ข้อมูล",
+    "ต้องการยืนยันการเผยเเพร่ข้อมูลนี้ใช่หรือไม่?"
+  );
 }
 watch(
   () => props.modal,
@@ -115,7 +118,7 @@ watch(
 <template>
   <template>
     <q-dialog v-model="props.modal" persistent>
-      <q-card style="min-width: 10vw">
+      <q-card style="min-width: 18vw">
         <form @submit.prevent="validateForm">
           <DialogHeader :tittle="`ตั้งเวลาเผยแพร่`" :close="props.close" />
           <q-separator />
@@ -170,9 +173,16 @@ watch(
             </div>
           </q-card-section>
           <q-separator />
-          <q-card-actions align="right" class="bg-white text-teal">
-            <q-btn :label="`เผยแพร่ข้อมูล`" color="indigo-9" @click="onClickPublish()"/>
-            <q-space/>
+          <q-card-actions align="right">
+            <q-btn
+              flat
+              color="blue-7"
+              icon="public"
+              @click="onClickPublish()"
+            >
+              <q-tooltip>เผยแพร่ข้อมูลทันที</q-tooltip>
+            </q-btn>
+            <q-space />
             <q-btn type="submit" :label="`บันทึก`" color="public" />
           </q-card-actions>
         </form>
diff --git a/src/modules/02_organizationalNew/components/DialogSortPosition.vue b/src/modules/02_organizationalNew/components/DialogSortPosition.vue
index fcca5e20c..23abbc724 100644
--- a/src/modules/02_organizationalNew/components/DialogSortPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogSortPosition.vue
@@ -69,13 +69,10 @@ function getData() {
       keyword: "",
     })
     .then((res) => {
-      console.log(res);
       const dataList = res.data.result.data;
       const dataMap = dataList.map((item: any) => ({
         id: item.id,
-        name: `${item.posMasterNoPrefix}${item.posMasterNo}${
-          item.posMasterNoSuffix == null ? "" : `(${item.posMasterNoSuffix})`
-        }`,
+        name: `${item.orgShortname}${item.posMasterNoPrefix}${item.posMasterNo}${item.posMasterNoSuffix}`,
         posMasterNoPrefix: item.posMasterNoPrefix,
         posMasterNo: item.posMasterNo,
         posMasterNoSuffix: item.posMasterNoSuffix,
@@ -129,8 +126,8 @@ watch(
             hide-pagination
             hide-header
           />
-          <div v-else class="bg-grey-3 text-center q-pa-md text-bold">
-            ไม่พบข้อมูลลำดับตำแหน่ง
+          <div v-else class="bg-grey-1 text-center q-pa-md">
+            ไม่มีข้อมูล
           </div>
         </q-card-section>
         <q-separator />
diff --git a/src/modules/02_organizationalNew/components/mainTree.vue b/src/modules/02_organizationalNew/components/mainTree.vue
index 1aa50d30d..1f4cdfb8c 100644
--- a/src/modules/02_organizationalNew/components/mainTree.vue
+++ b/src/modules/02_organizationalNew/components/mainTree.vue
@@ -370,6 +370,7 @@ onMounted(async () => {});
               </div>
             </div>
 
+            <!-- v-if="store.typeOrganizational === 'draft' && !store.isPublic" -->
             <q-btn
               v-if="store.typeOrganizational === 'draft'"
               flat