diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index fdbff84aa..4ab0839a5 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -122,8 +122,7 @@ async function onSubmit() {
   if (
     store.isIdofficer &&
     formData.isBangkok !== "BANGKOK" &&
-    formData.isBangkok !== "OFFICE" &&
-    commandCode.value !== "C-PM-47"
+    formData.isBangkok !== "OFFICE"
   ) {
     dialogMessageNotify($q, "กรุณาเลือกคำสั่ง");
     return;
@@ -224,6 +223,8 @@ onMounted(async () => {
     formData.commandExcecuteDate = props.formCommandList.commandExcecuteDate;
     formData.isBangkok = !store.isIdofficer
       ? null
+      : props.formCommandList.commandCode === "C-PM-47"
+      ? "OFFICE"
       : props.formCommandList.isBangkok;
     commandCode.value = props.formCommandList.commandCode;
     const [volume, chapter] = props.formCommandList.commandNo.split("/");
@@ -485,12 +486,9 @@ onMounted(async () => {
                 />
               </div>
 
-              <div
-                class="col-12 q-gutter-sm"
-                v-if="store.isIdofficer && commandCode !== 'C-PM-47'"
-              >
+              <div class="col-12 q-gutter-sm" v-if="store.isIdofficer">
                 <q-radio
-                  :disable="store.readonly"
+                  :disable="store.readonly || commandCode === 'C-PM-47'"
                   keep-color
                   color="primary"
                   dense
@@ -500,7 +498,7 @@ onMounted(async () => {
                 />
 
                 <q-radio
-                  :disable="store.readonly"
+                  :disable="store.readonly || commandCode === 'C-PM-47'"
                   keep-color
                   color="primary"
                   dense