diff --git a/src/api/18_command/api.command.ts b/src/api/18_command/api.command.ts
index 32b17f1ba..8c3491460 100644
--- a/src/api/18_command/api.command.ts
+++ b/src/api/18_command/api.command.ts
@@ -10,7 +10,12 @@ export default {
   commandAction: (commandId: string, type: string) =>
     `${command}/${type}/${commandId}`,
 
-  commandSalaryList:(command:string)=>`${commandSalary}/list?commandSysId=${command}`,
-  commandSwap:(tab:string,direction:string,commandReciveId:string)=>`${command}/${tab}/swap/${direction}/${commandReciveId}`,
-  commandEditRecive:(tab:string,commandReciveId:string)=>`${command}/${tab}/recive/${commandReciveId}`
+  commandSalaryList: (command: string) =>
+    `${commandSalary}/list?commandSysId=${command}`,
+  commandSwap: (tab: string, direction: string, commandReciveId: string) =>
+    `${command}/${tab}/swap/${direction}/${commandReciveId}`,
+  commandEditRecive: (tab: string, commandReciveId: string) =>
+    `${command}/${tab}/recive/${commandReciveId}`,
+
+  checkIdofficer: `${env.API_URI}/org/profile/keycloak/idofficer`,
 };
diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index 96c863638..8475ad36a 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -42,10 +42,21 @@ let formData = reactive<FormDataDetail>({
   isAttachment: true,
 });
 const modalPreview = ref<boolean>(false); //แสดงตัวอย่าง
+const isIdofficer = ref<boolean>(false); //เช็ค สกจ.
+
+async function fetchCheckIdofficer() {
+  await http
+    .get(config.API.checkIdofficer)
+    .then((res) => {
+      isIdofficer.value = res.data.result;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    });
+}
 
 /**
  * ฟังก์ชันบันทึกข้อมูลรายละเอียดคำสั่ง
- *
  * และกำหนด isChangeData เป็น false
  */
 async function onSubmit() {
@@ -77,6 +88,7 @@ onMounted(() => {
   formData.commandAffectDate = props.formCommandList.commandAffectDate;
   formData.commandExcecuteDate = props.formCommandList.commandExcecuteDate;
   formData.isBangkok = props.formCommandList.isBangkok;
+  fetchCheckIdofficer();
 });
 
 /**
@@ -273,43 +285,6 @@ defineExpose({
             @update:model-value="onCheckChangeData()"
             type="textarea"
           />
-          <!-- <q-card bordered flat>
-          <div class="bg-grey-2 row q-py-sm q-px-md text-bold">
-            เนื้อหาคำสั่งส่วนต้น
-          </div>
-          <q-separator />
-          <q-card-section>
-            <q-field
-              class="q_field_p_none"
-              ref="fieldRef"
-              v-model="formData.detailHeader"
-              borderless
-              hide-bottom-space
-            >
-              <template #control>
-                <q-editor
-                  @update:model-value="onCheckChangeData()"
-                  :readonly="store.readonly"
-                  class="full-width"
-                  v-model="formData.detailHeader"
-                  min-height="5rem"
-                  :toolbar="[
-                    ['left', 'center', 'right', 'justify'],
-                    [
-                      'bold',
-                      'italic',
-                      'strike',
-                      'underline',
-                      'subscript',
-                      'superscript',
-                    ],
-                    ['unordered', 'ordered'],
-                  ]"
-                />
-              </template>
-            </q-field>
-          </q-card-section>
-        </q-card> -->
         </div>
 
         <!-- เนื้อหาคำสั่งส่วนกลาง -->
@@ -327,43 +302,6 @@ defineExpose({
             :rules="[(val: string) => !!val || `${'กรุณากรอกเนื้อหาคำสั่งหลัก'}`]"
             lazy-rules
           />
-          <!-- <q-card bordered flat>
-          <div class="bg-grey-2 row q-py-sm q-px-md text-bold">
-            เนื้อหาคำสั่งส่วนกลาง
-          </div>
-          <q-separator />
-          <q-card-section>
-            <q-field
-              class="q_field_p_none"
-              ref="fieldRef"
-              v-model="formData.detailBody"
-              borderless
-              hide-bottom-space
-            >
-              <template #control>
-                <q-editor
-                  @update:model-value="onCheckChangeData()"
-                  :readonly="store.readonly"
-                  class="full-width"
-                  v-model="formData.detailBody"
-                  min-height="5rem"
-                  :toolbar="[
-                    ['left', 'center', 'right', 'justify'],
-                    [
-                      'bold',
-                      'italic',
-                      'strike',
-                      'underline',
-                      'subscript',
-                      'superscript',
-                    ],
-                    ['unordered', 'ordered'],
-                  ]"
-                />
-              </template>
-            </q-field>
-          </q-card-section>
-        </q-card> -->
         </div>
 
         <!-- เนื้อหาคำสั่งส่วนท้าย -->
@@ -379,47 +317,11 @@ defineExpose({
             @update:model-value="onCheckChangeData()"
             type="textarea"
           />
-          <!-- <q-card bordered flat>
-          <div class="bg-grey-2 row q-py-sm q-px-md text-bold">
-            เนื้อหาคำสั่งส่วนท้าย
-          </div>
-          <q-separator />
-          <q-card-section>
-            <q-field
-              class="q_field_p_none"
-              ref="fieldRef"
-              v-model="formData.detailFooter"
-              borderless
-              hide-bottom-space
-            >
-              <template #control>
-                <q-editor
-                  @update:model-value="onCheckChangeData()"
-                  :readonly="store.readonly"
-                  class="full-width"
-                  v-model="formData.detailFooter"
-                  min-height="5rem"
-                  :toolbar="[
-                    ['left', 'center', 'right', 'justify'],
-                    [
-                      'bold',
-                      'italic',
-                      'strike',
-                      'underline',
-                      'subscript',
-                      'superscript',
-                    ],
-                    ['unordered', 'ordered'],
-                  ]"
-                />
-              </template>
-            </q-field>
-          </q-card-section>
-        </q-card> -->
         </div>
 
-        <div class="col-12 q-gutter-sm">
+        <div class="col-12 q-gutter-sm" v-if="isIdofficer">
           <q-radio
+            :disable="store.readonly"
             keep-color
             color="primary"
             dense
@@ -429,6 +331,7 @@ defineExpose({
           />
 
           <q-radio
+            :disable="store.readonly"
             keep-color
             color="primary"
             dense
diff --git a/src/modules/18_command/interface/request/Main.ts b/src/modules/18_command/interface/request/Main.ts
index 0872313e5..b928e4b16 100644
--- a/src/modules/18_command/interface/request/Main.ts
+++ b/src/modules/18_command/interface/request/Main.ts
@@ -24,7 +24,7 @@ interface FormDataDetail {
   commandExcecuteDate: Date | null;
   commandSysId?: string;
   commandTypeName?: string;
-  isBangkok?: string;
+  isBangkok?: string | null;
   isAttachment: boolean;
 }