diff --git a/src/modules/03_recruiting/components/ExamFinished.vue b/src/modules/03_recruiting/components/ExamFinished.vue
index 397e4741c..87282aa20 100644
--- a/src/modules/03_recruiting/components/ExamFinished.vue
+++ b/src/modules/03_recruiting/components/ExamFinished.vue
@@ -61,6 +61,15 @@
+ ภาค ก
+
+ {{ scoreAFull }}
+
+
+ {{ scoreA }}
+
+ คะแนน
+
ภาค ข
{{ scoreBFull }}
@@ -169,6 +178,8 @@ const examNumber = ref("");
const citizenId = ref("");
const examSeat = ref("");
const number = ref("");
+const scoreAFull = ref(null);
+const scoreA = ref(null);
const scoreBFull = ref(null);
const scoreB = ref(null);
const scoreCFull = ref(null);
@@ -195,30 +206,20 @@ const fetchCard = async () => {
examNumber.value = data.examIdenNumber;
citizenId.value = data.citizenId;
examSeat.value = data.seatNumber;
+ scoreAFull.value = data.pointTotalA;
+ scoreA.value = data.pointA;
scoreBFull.value = data.pointTotalB;
scoreB.value = data.pointB;
scoreCFull.value = data.pointTotalC;
scoreC.value = data.pointC;
- if (data.pointB != null && data.pointC != null) {
- scoreSum.value = parseInt(data.pointB) + parseInt(data.pointC);
- } else if (data.pointC != null) {
- scoreSum.value = parseInt(data.pointC);
- } else if (data.pointB != null) {
- scoreSum.value = parseInt(data.pointB);
- } else {
- scoreSum.value = null;
- }
- if (data.pointTotalB != null && data.pointTotalC != null) {
- scoreSumFull.value =
- parseInt(data.pointTotalB) + parseInt(data.pointTotalC);
- } else if (data.pointTotalC != null) {
- scoreSumFull.value = parseInt(data.pointTotalC);
- } else if (data.pointTotalB != null) {
- scoreSumFull.value = parseInt(data.pointTotalB);
- } else {
- scoreSumFull.value = null;
- }
- scoreC.value = data.pointC;
+ scoreSum.value =
+ parseInt(data.pointA == null ? 0 : data.pointA) +
+ parseInt(data.pointB == null ? 0 : data.pointB) +
+ parseInt(data.pointC == null ? 0 : data.pointC);
+ scoreSumFull.value =
+ parseInt(data.pointTotalA == null ? 0 : data.pointTotalA) +
+ parseInt(data.pointTotalB == null ? 0 : data.pointTotalB) +
+ parseInt(data.pointTotalC == null ? 0 : data.pointTotalC);
examResultinscore.value = data.pass;
avatar.value = data.avatar;
score_expired.value = new Date(data.announcementDate);