diff --git a/src/controllers/KpiUserDevelopmentController.ts b/src/controllers/KpiUserDevelopmentController.ts
index a1b8a5e..fca466a 100644
--- a/src/controllers/KpiUserDevelopmentController.ts
+++ b/src/controllers/KpiUserDevelopmentController.ts
@@ -337,7 +337,8 @@ export class KpiUserDevelopmentController extends Controller {
       // evaluating?: boolean | null;
     },
   ) {
-    const [firstName, lastName] = requestBody.keyword ? requestBody.keyword.split(" ") : ["", ""];
+    let conditionFullName =
+      "CONCAT(kpiUserEvaluation.prefix, kpiUserEvaluation.firstName, ' ', kpiUserEvaluation.lastName) LIKE :keyword";
     const [kpiUserDevelopment, total] = await AppDataSource.getRepository(KpiUserDevelopment)
       .createQueryBuilder("kpiUserDevelopment")
       .leftJoinAndSelect("kpiUserDevelopment.kpiUserEvaluation", "kpiUserEvaluation")
@@ -372,10 +373,9 @@ export class KpiUserDevelopmentController extends Controller {
             .orWhere("kpiUserDevelopment.name LIKE :keyword", {
               keyword: `%${requestBody.keyword}%`,
             })
-            .orWhere(`kpiUserEvaluation.firstName LIKE :firstName`, {
-              firstName: `%${firstName}%`,
-            })
-            .orWhere(`kpiUserEvaluation.lastName LIKE :lastName`, { lastName: `%${lastName}%` });
+            .orWhere(conditionFullName, {
+              keyword: `%${requestBody.keyword}%`,
+            });
         }),
       )
       .orderBy("kpiUserDevelopment.createdAt", "ASC")
diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts
index 2509798..2bc3adc 100644
--- a/src/controllers/KpiUserEvaluationController.ts
+++ b/src/controllers/KpiUserEvaluationController.ts
@@ -215,7 +215,8 @@ export class KpiUserEvaluationController extends Controller {
       evaluating?: boolean | null;
     },
   ) {
-    const [firstName, lastName] = requestBody.keyword ? requestBody.keyword.split(" ") : ["", ""];
+    let conditionFullName =
+      "CONCAT(kpiUserEvaluation.prefix, kpiUserEvaluation.firstName, ' ', kpiUserEvaluation.lastName) LIKE :keyword";
     const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation)
       .createQueryBuilder("kpiUserEvaluation")
       .andWhere(requestBody.kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", {
@@ -248,28 +249,27 @@ export class KpiUserEvaluationController extends Controller {
           qb.orWhere("kpiUserEvaluation.prefix LIKE :keyword", {
             keyword: `%${requestBody.keyword}%`,
           })
-            .orWhere("kpiUserEvaluation.firstName LIKE :keyword", {
-              keyword: `%${requestBody.keyword}%`,
-            })
-            .orWhere("kpiUserEvaluation.lastName LIKE :keyword", {
-              keyword: `%${requestBody.keyword}%`,
-            })
-            .orWhere("kpiUserEvaluation.org LIKE :keyword", {
-              keyword: `%${requestBody.keyword}%`,
-            })
-            .orWhere("kpiUserEvaluation.position LIKE :keyword", {
-              keyword: `%${requestBody.keyword}%`,
-            })
-            .orWhere("kpiUserEvaluation.posTypeName LIKE :keyword", {
-              keyword: `%${requestBody.keyword}%`,
-            })
-            .orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", {
-              keyword: `%${requestBody.keyword}%`,
-            })
-            .orWhere(`kpiUserEvaluation.firstName LIKE :firstName`, {
-              firstName: `%${firstName}%`,
-            })
-            .orWhere(`kpiUserEvaluation.lastName LIKE :lastName`, { lastName: `%${lastName}%` });
+          .orWhere("kpiUserEvaluation.firstName LIKE :keyword", {
+            keyword: `%${requestBody.keyword}%`,
+          })
+          .orWhere("kpiUserEvaluation.lastName LIKE :keyword", {
+            keyword: `%${requestBody.keyword}%`,
+          })
+          .orWhere("kpiUserEvaluation.org LIKE :keyword", {
+            keyword: `%${requestBody.keyword}%`,
+          })
+          .orWhere("kpiUserEvaluation.position LIKE :keyword", {
+            keyword: `%${requestBody.keyword}%`,
+          })
+          .orWhere("kpiUserEvaluation.posTypeName LIKE :keyword", {
+            keyword: `%${requestBody.keyword}%`,
+          })
+          .orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", {
+            keyword: `%${requestBody.keyword}%`,
+          })
+          .orWhere(conditionFullName, {
+            keyword: `%${requestBody.keyword}%`,
+          })
         }),
       )
       .orderBy("kpiUserEvaluation.createdAt", "ASC")