diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 5beb782a9..eee30764f 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -340,10 +340,12 @@ async function getTable() {
             statusNameCheck: convertContainStatus(data.statusId),
 
             statusName:
-              convertContainStatus(data.statusId) +
-              (data.typeCommand != ""
-                ? convertTypeCommand(data.typeCommand)
-                : ""),
+              data.statusId == "CONTAIN"
+                ? convertTypeCommand(data.typeCommand) + "แล้ว"
+                : convertContainStatus(data.statusId) +
+                  (data.typeCommand != ""
+                    ? convertTypeCommand(data.typeCommand)
+                    : ""),
             organizationName:
               data.root +
               " " +
@@ -895,7 +897,7 @@ onMounted(async () => {
               dense
             >
               <q-menu transition-show="jump-down" transition-hide="jump-up">
-                <q-list dense style="min-width: 100px">
+                <q-list dense style="min-width: 180px">
                   <q-item
                     v-if="
                       roleAdmin &&
@@ -929,9 +931,8 @@ onMounted(async () => {
                   </q-item>
                   <q-item
                     v-if="
-                      roleAdmin &&
-                      props.row.draft === 'รอส่งตัว' &&
-                      props.row.nodeName !== null
+                      props.row.nodeName !== null &&
+                      props.row.statusId !== 'CONTAIN'
                     "
                     clickable
                     v-close-popup
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
index 059d07dfe..6317bbe60 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
@@ -337,7 +337,7 @@ onMounted(async () => {
 
             <div class="col-12">
               <span class="text-top0 q-pl-sm">สังกัด</span>
-              {{ probationStore.person.Oc }}
+              {{ probationStore.person.Oc ? probationStore.person.Oc : "-" }}
             </div>
           </div>
 
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
index 74fc01bab..bbd3eef27 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateAdd.vue
@@ -327,7 +327,8 @@ onMounted(async () => {
                 </div>
 
                 <div class="col-12">
-                  <span class="text-top0 q-pl-sm">สังกัด</span> {{ person.Oc }}
+                  <span class="text-top0 q-pl-sm">สังกัด</span>
+                  {{ person.Oc ? person.Oc : "-" }}
                 </div>
               </div>
 
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
index 8bd7fc836..f5b8bf69c 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@@ -469,7 +469,7 @@ onMounted(async () => {
               </div>
               <div class="col-12">
                 <span class="text-top0 q-pl-sm">สังกัด</span>
-                {{ probationStore.person.Oc }}
+                {{ probationStore.person.Oc ? probationStore.person.Oc : "-" }}
               </div>
             </div>
             <q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
index 0bfd8c85f..543dabf1a 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
@@ -444,7 +444,7 @@ watch(lengthdiscipline_level, (newLength) => {
                   </div>
                   <div class="col-12">
                     <span class="text-top0 q-pl-sm">สังกัด</span>
-                    {{ person.Oc }}
+                    {{ person.Oc ? person.Oc : "-" }}
                   </div>
                 </div>
                 <q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index 5ed63fd91..dc1b27742 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -290,15 +290,15 @@ onMounted(() => {
         <div class="col-12 q-pl-md q-pb-md">
           <div class="col-12">
             <span class="text-top0 q-pl-sm">ตำแหน่งในสายงาน</span>
-            {{ person.PositionLineName }}
+            {{ person.positionName }}
           </div>
           <div class="col-12">
             <span class="text-top0 q-pl-sm">ระดับ</span>
-            {{ person.PositionLevelName }}
+            {{ person.positionLevelName }}
           </div>
           <div class="col-12">
             <span class="text-top0 q-pl-sm">สังกัด</span>
-            {{ person.Oc }}
+            {{ person.Oc ? person.Oc : "-" }}
           </div>
         </div>
       </div>
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
index 0985bbfde..d6ab2ed90 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
@@ -400,7 +400,7 @@ onMounted(async () => {
           </div>
           <div class="col-12">
             <span class="text-top0 q-pl-sm">สังกัด</span>
-            {{ probationStore.person.Oc }}
+            {{ probationStore.person.Oc ? probationStore.person.Oc : "-" }}
           </div>
         </div>
 
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
index 6e2a80c02..3091f0caf 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
@@ -393,7 +393,8 @@ onMounted(async () => {
                 {{ person.positionLevelName }}
               </div>
               <div class="col-12">
-                <span class="text-top0 q-pl-sm">สังกัด</span> {{ person.Oc }}
+                <span class="text-top0 q-pl-sm">สังกัด</span>
+                {{ person.Oc ? person.Oc : "-" }}
               </div>
             </div>
 
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue
index ba0b5f5d2..a39f0b494 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue
@@ -404,7 +404,8 @@ onMounted(async () => {
                 {{ person.positionLevelName }}
               </div>
               <div class="col-12">
-                <span class="text-top0 q-pl-sm">สังกัด</span> {{ person.Oc }}
+                <span class="text-top0 q-pl-sm">สังกัด</span>
+                {{ person.Oc ? person.Oc : "-" }}
               </div>
             </div>
 
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
index 06894a166..def14c6bd 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
@@ -410,7 +410,7 @@ onMounted(async () => {
           </div>
           <div class="col-12">
             <span class="text-top0 q-pl-sm">สังกัด</span>
-            {{ probationStore.person.Oc }}
+            {{ probationStore.person.Oc ? probationStore.person.Oc : "-" }}
           </div>
         </div>