up
This commit is contained in:
@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"printWidth": 5000,
|
|
||||||
"semi": true,
|
|
||||||
"singleQuote": false,
|
|
||||||
"tabWidth": 4,
|
|
||||||
"useTabs": true
|
|
||||||
}
|
|
||||||
@ -40,8 +40,25 @@ export class ReferenceRangeController {
|
|||||||
let param: Paging = await schema.validateAsync(req.query);
|
let param: Paging = await schema.validateAsync(req.query);
|
||||||
|
|
||||||
let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
|
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;
|
const offset = (param.page - 1) * param.limit;
|
||||||
let limit = param.limit;
|
let limit = param.limit;
|
||||||
|
|||||||
Reference in New Issue
Block a user