update
This commit is contained in:
@ -114,8 +114,8 @@ export class ReferenceRangeController {
|
|||||||
referenceRange.value_min = param.value_min;
|
referenceRange.value_min = param.value_min;
|
||||||
referenceRange.value_max = param.value_max;
|
referenceRange.value_max = param.value_max;
|
||||||
referenceRange.status = param.status;
|
referenceRange.status = param.status;
|
||||||
referenceRange.created_by = req.auth.data.name;
|
referenceRange.created_by = req.auth?.data.name;
|
||||||
referenceRange.updated_by = req.auth.data.name;
|
referenceRange.updated_by = req.auth?.data.name;
|
||||||
await queryRunner.manager.save(referenceRange);
|
await queryRunner.manager.save(referenceRange);
|
||||||
|
|
||||||
await queryRunner.commitTransaction();
|
await queryRunner.commitTransaction();
|
||||||
@ -191,7 +191,7 @@ export class ReferenceRangeController {
|
|||||||
referenceRange.value_min = param.value_min;
|
referenceRange.value_min = param.value_min;
|
||||||
referenceRange.value_max = param.value_max;
|
referenceRange.value_max = param.value_max;
|
||||||
referenceRange.status = param.status;
|
referenceRange.status = param.status;
|
||||||
referenceRange.updated_by = req.auth.data.name;
|
referenceRange.updated_by = req.auth?.data.name;
|
||||||
await queryRunner.manager.save(referenceRange);
|
await queryRunner.manager.save(referenceRange);
|
||||||
|
|
||||||
await queryRunner.commitTransaction();
|
await queryRunner.commitTransaction();
|
||||||
@ -228,7 +228,7 @@ export class ReferenceRangeController {
|
|||||||
|
|
||||||
if (!referenceRange) throw { message: "Reference Range " + Language.lang.failed_not_found };
|
if (!referenceRange) throw { message: "Reference Range " + Language.lang.failed_not_found };
|
||||||
|
|
||||||
referenceRange.deleted_by = req.auth.data.name;
|
referenceRange.deleted_by = req.auth?.data.name;
|
||||||
referenceRange.deleted_at = moment().toDate();
|
referenceRange.deleted_at = moment().toDate();
|
||||||
await OrmHelper.DB.manager.save(referenceRange);
|
await OrmHelper.DB.manager.save(referenceRange);
|
||||||
affected = 1;
|
affected = 1;
|
||||||
|
|||||||
@ -4,18 +4,17 @@ import CommonHelper from "../helpers/common";
|
|||||||
import { OrmHelper } from "../helpers/orm";
|
import { OrmHelper } from "../helpers/orm";
|
||||||
|
|
||||||
export class ReferenceRangeModel {
|
export class ReferenceRangeModel {
|
||||||
static async list(filter = {}): Promise<SelectQueryBuilder<any>> {
|
static async list(filter: Record<string, any> = {}): Promise<SelectQueryBuilder<any>> {
|
||||||
const repo = OrmHelper.DB.getRepository(ReferenceRange);
|
const repo = OrmHelper.DB.getRepository(ReferenceRange);
|
||||||
let whereAttr: string[] = [];
|
|
||||||
let whereVal: any = {};
|
|
||||||
if (filter && Object.keys(filter).length > 0) {
|
|
||||||
whereAttr = [...whereAttr, ...CommonHelper.handleQueryFilter(filter).whereAttr];
|
|
||||||
whereVal = { ...whereVal, ...CommonHelper.handleQueryFilter(filter).whereVal };
|
|
||||||
}
|
|
||||||
|
|
||||||
var query = repo.createQueryBuilder("ReferenceRange");
|
const query = repo.createQueryBuilder("ReferenceRange");
|
||||||
if (whereAttr.length != 0) {
|
|
||||||
query = query.where(whereAttr.join(" and "), whereVal);
|
if (filter && Object.keys(filter).length > 0) {
|
||||||
|
Object.entries(filter).forEach(([key, value]) => {
|
||||||
|
if (value !== undefined && value !== null && value !== "") {
|
||||||
|
query.andWhere(`ReferenceRange.${key} = :${key}`, { [key]: value });
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return query;
|
return query;
|
||||||
|
|||||||
Reference in New Issue
Block a user