diff --git a/src/modules/03_recruiting/views/01_compete/DetailEx.vue b/src/modules/03_recruiting/views/01_compete/DetailEx.vue
index db2c5ab85..4292fffaf 100644
--- a/src/modules/03_recruiting/views/01_compete/DetailEx.vue
+++ b/src/modules/03_recruiting/views/01_compete/DetailEx.vue
@@ -27,6 +27,8 @@ const scoreAFull = ref<string>("");
 const scoreA = ref<string>("");
 const scoreBFull = ref<string>("");
 const scoreB = ref<string>("");
+const scoreDFull = ref<string>("");
+const scoreD = ref<string>("");
 const scoreCFull = ref<string>("");
 const scoreC = ref<string>("");
 const scoreSumFull = ref<string>("");
@@ -38,6 +40,7 @@ const mixin = useCounterMixin();
 const { messageError, showLoader, hideLoader } = mixin;
 const examID = ref<string>("");
 const prefix = ref<string>("");
+const TypeTest = ref<string>("");
 const fullname = ref<string>("");
 const importId = ref<string>(route.params.id as string); // Period Import Id
 const examId = ref<string>(route.params.examId as string); // เลขประจำตัวสอบ
@@ -66,6 +69,8 @@ async function fetchData() {
         examAttribute.value = data.examAttribute;
         number.value = data.number;
         examOrder.value = data.examOrder;
+        TypeTest.value = data.TypeTest;
+
         score_expired.value = data.scoreExpire;
         if (data.scoreResult != null) {
           scoreAFull.value = data.scoreResult.scoreAFull;
@@ -77,6 +82,8 @@ async function fetchData() {
           scoreSumFull.value = data.scoreResult.scoreSumFull;
           scoreSum.value = data.scoreResult.scoreSum;
           examResultinscore.value = data.scoreResult.examResult;
+          scoreDFull.value = data.scoreResult.scoreDFull;
+          scoreD.value = data.scoreResult.scoreD;
         }
         isData.value = true;
       }
@@ -169,82 +176,82 @@ onMounted(async () => {
               เลขประจำตัวประชาชน
             </div>
             <div class="col-6 text-black" v-if="profile_id !== null">
-              {{ profile_id }}
+              {{ profile_id ? profile_id : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="prefix !== null">
               คำนำหน้าชื่อนาม
             </div>
             <div class="col-6 text-black" v-if="prefix !== null">
-              {{ prefix }}
+              {{ prefix ? prefix : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="fullname !== null">
               ชื่อ-นามสกุล
             </div>
             <div class="col-6 text-black" v-if="fullname !== null">
-              {{ fullname }}
+              {{ fullname ? fullname : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="birthdate !== null">
               วัน/เดือน/ปี เกิด
             </div>
             <div class="col-6 text-black" v-if="birthdate !== null">
-              {{ birthdate }}
+              {{ birthdate ? birthdate : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="gender !== null">เพศ</div>
             <div class="col-6 text-black" v-if="gender !== null">
-              {{ gender }}
+              {{ gender ? gender : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="position_name !== null">
               ตำแหน่งที่สมัคร
             </div>
             <div class="col-6 text-black" v-if="position_name !== null">
-              {{ position_name }}
+              {{ position_name ? position_name : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="university !== null">
               สถานศึกษา
             </div>
             <div class="col-6 text-black" v-if="university !== null">
-              {{ university }}
+              {{ university ? university : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="degree !== null">
               วุฒิการศึกษา
             </div>
             <div class="col-6 text-black" v-if="degree !== null">
-              {{ degree }}
+              {{ degree ? degree : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="major !== null">
               สาขาวิชาเอก
             </div>
             <div class="col-6 text-black" v-if="major !== null">
-              {{ major }}
+              {{ major ? major : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="major !== null">
               ครั้งที่ประกาศรับสมัคร
             </div>
             <div class="col-6 text-black" v-if="major !== null">
-              {{ examOrder }}
+              {{ examOrder ? examOrder : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="cert_issuedate !== null">
               ใบอนุญาตประกอบวิชาชีพ วัน เดือน ปีที่ได้รับ
             </div>
             <div class="col-6 text-black" v-if="cert_issuedate !== null">
-              {{ cert_issuedate }}
+              {{ cert_issuedate ? cert_issuedate : "-" }}
             </div>
 
             <div class="col-6 text-grey-7" v-if="examAttribute !== null">
               สถานะการคัดกรองคุณสมบัติ
             </div>
             <div class="col-6 text-black" v-if="examAttribute !== null">
-              {{ examAttribute }}
+              {{ examAttribute ? examAttribute : "-" }}
             </div>
           </div>
         </q-card>
@@ -297,10 +304,24 @@ onMounted(async () => {
                 <q-tooltip>ดาวน์โหลดผลคะแนน</q-tooltip>
               </q-btn>
             </div>
-            <div class="row items-center q-gutter-y-sm col-12">
-              <div class="col-xs-4 col-sm-5 text-weight-medium text-grey-7">
+            <div class="row items-top q-gutter-y-sm col-12">
+              <div class="col-xs-12 col-sm-12 text-weight-medium text-grey-7">
                 ประเภท
               </div>
+
+              <div class="col-xs-4 col-sm-5 text-grey-7">
+                ภาคความรู้ความสามารถทั่วไป (ภาค ก)
+              </div>
+              <div class="col-xs-3 col-sm-2 q-pr-xs">
+                {{ TypeTest == "bangkok" ? "กทม." : "ก.พ." }}
+              </div>
+              <div class="col-xs-3 col-sm-2 q-pr-xs"></div>
+                            <div class="col-12">
+                <q-separator />
+              </div>
+              <div class="col-xs-4 col-sm-5 text-weight-medium text-grey-7">
+                
+              </div>
               <div class="col-xs-3 col-sm-2 text-primary text-weight-bold">
                 คะแนนเต็ม
               </div>
@@ -310,8 +331,9 @@ onMounted(async () => {
               <div
                 class="col-xs-2 col-sm-2 text-primary text-weight-bold"
               ></div>
-
-              <div class="col-xs-4 col-sm-5 text-grey-7">ภาค ก</div>
+              <div class="col-xs-4 col-sm-5 text-grey-7">
+                ภาคความรู้ความสามารถที่ใช้เฉพาะตำแหน่ง (ภาค ข)
+              </div>
               <div class="col-xs-3 col-sm-2 q-pr-xs">
                 {{ scoreAFull }}
               </div>
@@ -320,30 +342,35 @@ onMounted(async () => {
               </div>
               <div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
 
-              <div class="col-xs-4 col-sm-5 text-grey-7">ภาค ข</div>
-              <div class="col-xs-3 col-sm-2 q-pr-xs">
-                {{ scoreBFull }}
+              <div class="col-xs-12 col-sm-12 text-grey-7">
+                ภาคความเหมาะสมกับตำแหน่ง (ภาค ค)
+              </div>
+
+              <div class="col-xs-4 col-sm-5 text-grey-7">
+                - ทดสอบสมรรถนะ และทดสอบจิตวิทยาฯ
               </div>
               <div class="col-xs-3 col-sm-2 q-pr-xs">
-                {{ scoreB }}
+                {{ scoreCFull ? scoreCFull : "-" }}
+              </div>
+              <div class="col-xs-3 col-sm-2 q-pr-xs">
+                {{ scoreC ? scoreC : "-" }}
               </div>
               <div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
-
-              <div class="col-xs-4 col-sm-5 text-grey-7">ภาค ค</div>
+              <div class="col-xs-4 col-sm-5 text-grey-7">- สัมภาษณ์</div>
               <div class="col-xs-3 col-sm-2 q-pr-xs">
-                {{ scoreCFull }}
+                {{ scoreDFull ? scoreDFull : "-" }}
               </div>
               <div class="col-xs-3 col-sm-2 q-pr-xs">
-                {{ scoreC }}
+                {{ scoreD ? scoreD : "-" }}
               </div>
               <div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
 
               <div class="col-xs-4 col-sm-5 text-grey-7">รวมทั้งหมด</div>
               <div class="col-xs-3 col-sm-2 q-pr-xs">
-                {{ scoreSumFull }}
+                {{ scoreSumFull ? scoreSumFull : "-" }}
               </div>
               <div class="col-xs-3 col-sm-2 q-pr-xs">
-                {{ scoreSum }}
+                {{ scoreSum ? Number(scoreSum).toFixed(2) : "-" }}
               </div>
               <div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
 
@@ -363,14 +390,14 @@ onMounted(async () => {
 
               <div class="col-xs-6 col-sm-5 text-grey-7">ลำดับที่สอบได้</div>
               <div class="col-xs-6 col-sm-7 q-pr-xs">
-                {{ number }}
+                {{ number ? number : "-" }}
               </div>
 
               <div class="col-xs-6 col-sm-5 text-grey-7">
                 วันหมดอายุบัญชีสอบแข่งขัน
               </div>
               <div class="col-xs-6 col-sm-7 q-pr-xs">
-                {{ score_expired }}
+                {{ score_expired ? score_expired : "-" }}
               </div>
             </div>
           </div>