diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 43962d8..0000000 --- a/.prettierrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "printWidth": 5000, - "semi": true, - "singleQuote": false, - "tabWidth": 4, - "useTabs": true -} diff --git a/src/controllers/reference_range.ts b/src/controllers/reference_range.ts index 6e5a5d5..aed5f1a 100644 --- a/src/controllers/reference_range.ts +++ b/src/controllers/reference_range.ts @@ -40,8 +40,25 @@ export class ReferenceRangeController { let param: Paging = await schema.validateAsync(req.query); let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; + const filterAny = filter.any && filter.any !== "" ? String(filter.any) : ""; + let filterObj = { ...filter } as any; + delete filterObj.any; - var query = await ReferenceRangeModel.list(filter); + var query = await ReferenceRangeModel.list(filterObj); + if (filterAny !== "") { + const anyVal = filterAny.includes("%") ? filterAny : `%${filterAny}%`; + query.andWhere( + `( + ReferenceRange.status::text ILIKE :any + OR ReferenceRange.gender::text ILIKE :any + OR ReferenceRange.age_range_min::text ILIKE :any + OR ReferenceRange.age_range_max::text ILIKE :any + OR ReferenceRange.value_min::text ILIKE :any + OR ReferenceRange.value_max::text ILIKE :any + )`, + { any: anyVal }, + ); + } const offset = (param.page - 1) * param.limit; let limit = param.limit;