TIMOR-TELECOM/service-master-data-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.shiblysolution.id/SAUDE-TL/service-master-data

Browse Source
This commit is contained in:
Muhammad Rayhan Ardiansyah
2026-02-26 16:30:14 +07:00
parent a2a628c1a1 7676dd62c8
commit 3cd4755c8e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/model/doctor_schedule.ts
View File

@ -9,12 +9,13 @@ export class DoctorScheduleModel {
let whereAttr: string[] = []; let whereAttr: string[] = [];
let whereVal: any = {}; let whereVal: any = {};
if (filter && Object.keys(filter).length > 0) { if (filter && Object.keys(filter).length > 0) {
whereAttr = [...whereAttr, ...CommonHelper.handleQueryFilter(filter).whereAttr]; const filterResult = CommonHelper.handleQueryFilter(filter);
whereVal = { ...whereVal, ...CommonHelper.handleQueryFilter(filter).whereVal }; whereAttr = [...whereAttr, ...filterResult.whereAttr];
whereVal = { ...whereVal, ...filterResult.whereVal };
} }
var query = repo.createQueryBuilder("DoctorSchedule") var query = repo.createQueryBuilder("DoctorSchedule")
.leftJoinAndSelect("DoctorSchedule.doctor", "doctor") .leftJoinAndSelect("DoctorSchedule.doctor", "Doctor")
.leftJoinAndSelect("DoctorSchedule.room", "Room"); .leftJoinAndSelect("DoctorSchedule.room", "Room");
if (whereAttr.length != 0) { if (whereAttr.length != 0) {
query = query.where(whereAttr.join(" and "), whereVal); query = query.where(whereAttr.join(" and "), whereVal);