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"
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({