diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index 492a43a56..96c863638 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -38,7 +38,7 @@ let formData = reactive<FormDataDetail>({
   issue: null,
   commandAffectDate: null, //วันที่ลงนาม
   commandExcecuteDate: null, //วันที่คำสั่งมีผล
-  isBangkok: false,
+  isBangkok: null,
   isAttachment: true,
 });
 const modalPreview = ref<boolean>(false); //แสดงตัวอย่าง
@@ -418,13 +418,23 @@ defineExpose({
         </q-card> -->
         </div>
 
-        <div class="col-12">
-          <q-checkbox
+        <div class="col-12 q-gutter-sm">
+          <q-radio
             keep-color
             color="primary"
             dense
             v-model="formData.isBangkok"
-            label="นี่คือคำสั่งกรุงเทพมหานคร"
+            label="คำสั่งสำนักปลัดกรุงเทพมหานคร"
+            val="OFFICE"
+          />
+
+          <q-radio
+            keep-color
+            color="primary"
+            dense
+            v-model="formData.isBangkok"
+            label="คำสั่งกรุงเทพมหานคร"
+            val="BANGKOK"
           />
         </div>
       </div>
diff --git a/src/modules/18_command/interface/request/Main.ts b/src/modules/18_command/interface/request/Main.ts
index 713e3c78c..0872313e5 100644
--- a/src/modules/18_command/interface/request/Main.ts
+++ b/src/modules/18_command/interface/request/Main.ts
@@ -24,8 +24,8 @@ interface FormDataDetail {
   commandExcecuteDate: Date | null;
   commandSysId?: string;
   commandTypeName?: string;
-  isBangkok?: boolean;
-  isAttachment:boolean
+  isBangkok?: string;
+  isAttachment: boolean;
 }
 
 interface ListCommandSalaryType {