Merge branch 'develop' of github.com:Frappet/bma-ehr-kpi into develop

2024-04-19 17:36:02 +07:00 · 2024-04-19 17:36:02 +07:00 · e29c7c127f
commit e29c7c127f
parent 1c42a242c0 17f110d345
5 changed files with 312 additions and 171 deletions
--- a/src/controllers/KpiPlanController.ts
+++ b/src/controllers/KpiPlanController.ts
@ -274,9 +274,6 @@ export class kpiPlanController extends Controller {
          round: `${round?.trim().toUpperCase()}`,
        },
      )
-      .andWhere(keyword != undefined ? "kpiPlan.projectName LIKE :keyword" : "1=1", {
-        keyword: `%${keyword}%`,
-      })
      .select([
        "kpiPlan.id",
        "kpiPlan.year",