From 321345f65a572e2b9216d55cbe04dc9441f5fd6f Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 13 Jan 2025 09:24:25 +0700
Subject: [PATCH] fixing result

---
 src/controllers/EvaluateResultController.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/controllers/EvaluateResultController.ts b/src/controllers/EvaluateResultController.ts
index c80459c..0db3668 100644
--- a/src/controllers/EvaluateResultController.ts
+++ b/src/controllers/EvaluateResultController.ts
@@ -236,12 +236,17 @@ export class EvaluateResultController extends Controller {
     if (!experimenteeData) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลบุคคล");
     }
+
+    const splitOc = await experimenteeData.organization.split("/");
+    const splitOcAmount = await splitOc.length;
     const experimentee = await {
       ...experimenteeData,
       name:
         experimenteeData.prefixName + experimenteeData.firstName + " " + experimenteeData.lastName,
-      Oc: experimenteeData.organization,
       PositionLevel: experimenteeData.positionName + experimenteeData.positionLevelName,
+      Department: splitOcAmount > 2 ? splitOc[splitOcAmount - 3] : "-",
+      OrganizationOrganization: splitOcAmount > 1 ? splitOc[splitOcAmount - 2] : "-",
+      Oc: experimenteeData.orgRootName,
     };
 
     const directorData = await this.assignDirectorRepository.find({