From 71c547c5c6ae4047416f1eef1290443ca59d93a0 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Tue, 30 Apr 2024 11:48:23 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=9F=E0=B8=B4=E0=B8=A5=E0=B8=94=E0=B9=8C=E0=B9=80?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=B2=20report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ReportController.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 6becec6..4ba6f07 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -286,6 +286,8 @@ export class ReportController extends Controller {
           ? ""
           : Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.graduatedDate)),
       graduatedReason: getDevelopment.graduatedReason,
+      useOfficialTime: getDevelopment.useOfficialTime,
+      isGraduated: getDevelopment.isGraduated
     };
 
     return new HttpSuccess({

From d129fd7a47432496268b887e4c48baf73953149c Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Tue, 30 Apr 2024 13:16:11 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2=E0=B8=94?=
 =?UTF-8?q?=E0=B9=89=E0=B8=A7=E0=B8=A2=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/DevelopmentScholarshipController.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/controllers/DevelopmentScholarshipController.ts b/src/controllers/DevelopmentScholarshipController.ts
index ab59272..c9ba84b 100644
--- a/src/controllers/DevelopmentScholarshipController.ts
+++ b/src/controllers/DevelopmentScholarshipController.ts
@@ -174,6 +174,14 @@ export class DevelopmentScholarshipController extends Controller {
               keyword: `%${keyword}%`,
             },
           )
+            .orWhere(
+              keyword != null && keyword != ""
+                ? "developmentScholarship.citizenId LIKE :keyword"
+                : "1=1",
+              {
+                keyword: `%${keyword}%`,
+              },
+            )
             .orWhere(
               keyword != null && keyword != ""
                 ? "developmentScholarship.position LIKE :keyword"