diff --git a/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
index fc52738..5b276e5 100644
--- a/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
@@ -81,8 +81,8 @@ const formDetail = reactive<any>({
 
 /** Option  รอบการประเมิน*/
 const roundOp = ref<DataOptions[]>([
-  { id: "APR", name: "รอบเมษายน" },
-  { id: "OCT", name: "รอบตุลาคม" },
+  { id: "APR", name: "รอบที่ 1 เมษายน" },
+  { id: "OCT", name: "รอบที่ 2 ตุลาคม" },
 ]);
 
 function fetchListPlan() {
diff --git a/src/modules/08_KPI/views/form.vue b/src/modules/08_KPI/views/form.vue
index b8137c9..02eafe2 100644
--- a/src/modules/08_KPI/views/form.vue
+++ b/src/modules/08_KPI/views/form.vue
@@ -31,7 +31,14 @@ const isReadonly = <boolean>(route.name === "KPIEditEvaluator" ? true : false);
 const store = useKpiDataStore();
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError, dialogConfirm, success } = mixin;
+const {
+  showLoader,
+  hideLoader,
+  messageError,
+  dialogConfirm,
+  success,
+  findOrgName,
+} = mixin;
 
 const evaluatorIdOp = ref<DataOptions[]>([]);
 const commanderIdOp = ref<DataOptions[]>([]);
@@ -522,11 +529,16 @@ onMounted(async () => {
                 :style="$q.screen.gt.xs ? 'padding-left: 12%' : ''"
               >
                 <div class="row col-12 items-center justify-center">
-                  <span class="text-h6 text-weight-medium text-primary">{{
-                    store.dataEvaluation.firstName
-                      ? `${store.dataEvaluation.prefix}${store.dataEvaluation.firstName} ${store.dataEvaluation.lastName}`
-                      : ""
-                  }}</span>
+                  <div>
+                    <span class="text-h6 text-weight-medium text-primary">{{
+                      store.dataEvaluation.firstName
+                        ? `${store.dataEvaluation.prefix}${store.dataEvaluation.firstName} ${store.dataEvaluation.lastName}`
+                        : ""
+                    }}</span>
+                    <p class="q-mb-none">
+                      {{ findOrgName(store.dataProfile) }}
+                    </p>
+                  </div>
                   <q-space v-if="$q.screen.gt.xs" />
 
                   <div class="q-gutter-x-sm">
diff --git a/src/modules/08_KPI/views/main.vue b/src/modules/08_KPI/views/main.vue
index f2306e3..1c35609 100644
--- a/src/modules/08_KPI/views/main.vue
+++ b/src/modules/08_KPI/views/main.vue
@@ -63,7 +63,7 @@ const columns = ref<QTableProps["columns"]>([
     field: "durationKPI",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (v) => (v == "OCT" ? "ตุลาคม" : "เมษายน"),
+    format: (v) => (v == "OCT" ? "รอบที่ 2 ตุลาคม" : "รอบที่ 1 เมษายน"),
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -148,9 +148,9 @@ function fetchRoundOption(type: string) {
         id: e.id,
         name:
           e.durationKPI === "OCT"
-            ? "รอบตุลาคม"
+            ? "รอบที่ 2 ตุลาคม"
             : e.durationKPI === "APR"
-            ? "รอบเมษายน"
+            ? "รอบที่ 1 เมษายน"
             : "",
         isClosed: !e.isActive,
       }));
diff --git a/src/modules/08_KPI/views/mainEvaluator.vue b/src/modules/08_KPI/views/mainEvaluator.vue
index c4f0a6e..25a3b24 100644
--- a/src/modules/08_KPI/views/mainEvaluator.vue
+++ b/src/modules/08_KPI/views/mainEvaluator.vue
@@ -102,9 +102,9 @@ function fetchRoundOption(type: boolean = false) {
         id: e.id,
         name:
           e.durationKPI === "OCT"
-            ? "รอบตุลาคม"
+            ? "รอบที่ 2 ตุลาคม"
             : e.durationKPI === "APR"
-            ? "รอบเมษายน"
+            ? "รอบที่ 1 เมษายน"
             : "",
       }));
       roundOp.value = list;