diff --git a/src/modules/02_organization/components/DialogFormAgency.vue b/src/modules/02_organization/components/DialogFormAgency.vue
index 53f3f93f5..bb9776c56 100644
--- a/src/modules/02_organization/components/DialogFormAgency.vue
+++ b/src/modules/02_organization/components/DialogFormAgency.vue
@@ -82,6 +82,8 @@ const formData = reactive<FormDataAgency>({
   responsibility: "",
   isOfficer: false,
   isDeputy: false,
+  isCommission: false,
+  isInformation: false,
   misId: "",
 });
 
@@ -128,12 +130,24 @@ function onSubmit() {
             ? formData.isDeputy
             : false
           : undefined,
+      isCommission:
+        type === "Root"
+          ? formData.isCommission
+            ? formData.isCommission
+            : false
+          : undefined,
       isOfficer:
         type === "Child1"
           ? formData.isOfficer
             ? formData.isOfficer
             : false
           : undefined,
+      isInformation:
+        type === "Child1"
+          ? formData.isInformation
+            ? formData.isInformation
+            : false
+          : undefined,
 
       [nameId]: rootId,
       responsibility:
@@ -206,6 +220,8 @@ function closeClear() {
   formData.responsibility = "";
   formData.isOfficer = false;
   formData.isDeputy = false;
+  formData.isCommission = false;
+  formData.isInformation = false;
   formData.misId = "";
   props.close?.();
 }
@@ -404,6 +420,8 @@ watch(
           formData.responsibility = props.dataNode.responsibility;
           formData.isOfficer = props.dataNode.isOfficer ?? false;
           formData.isDeputy = props.dataNode.isDeputy ?? false;
+          formData.isCommission = props.dataNode.isCommission ?? false;
+          formData.isInformation = props.dataNode.isInformation ?? false;
           formData.misId = props.dataNode.misId;
           orgLevelOption.value =
             props.dataNode.orgTreeRank === "DEPARTMENT"
@@ -641,6 +659,15 @@ watch(
                   class="q-ml-sm"
                   @update:model-value="onChangeIsOfficer"
                 />
+                <q-checkbox
+                  keep-color
+                  color="primary"
+                  dense
+                  v-model="formData.isInformation"
+                  label="ศูนย์สารสนเทศทรัพยากรบุคคล"
+                  class="q-ml-sm"
+                  @update:model-value="onChangeIsOfficer"
+                />
               </div>
               <div
                 v-if="
@@ -658,6 +685,15 @@ watch(
                   class="q-ml-sm"
                   @update:model-value="onChangeIsDeputy"
                 />
+                <q-checkbox
+                  keep-color
+                  color="primary"
+                  dense
+                  v-model="formData.isCommission"
+                  label="สำนักงาน กก."
+                  class="q-ml-sm"
+                  @update:model-value="onChangeIsDeputy"
+                />
               </div>
             </div>
           </q-card-section>
diff --git a/src/modules/02_organization/interface/index/Main.ts b/src/modules/02_organization/interface/index/Main.ts
index 0f5cf8af0..a2d85f019 100644
--- a/src/modules/02_organization/interface/index/Main.ts
+++ b/src/modules/02_organization/interface/index/Main.ts
@@ -37,6 +37,8 @@ interface FormDataAgency {
   responsibility: string;
   isOfficer?: boolean;
   isDeputy?: boolean;
+  isInformation?: boolean;
+  isCommission?: boolean;
   misId: string;
 }