diff --git a/src/model/schedule.ts b/src/model/schedule.ts index 9b43503..9064c64 100644 --- a/src/model/schedule.ts +++ b/src/model/schedule.ts @@ -546,14 +546,14 @@ export class ScheduleModel { const query = ` SELECT - ro."scheduleSeriesId" AS series_id, + ro.schedule_series_id AS series_id, DATE(ro.visit_date) AS visit_date, COUNT(ro.id) AS used_count FROM emr.emr_registration_outpatient ro - WHERE ro."scheduleSeriesId" IN (${placeholders}) + WHERE ro.schedule_series_id IN (${placeholders}) AND DATE(ro.visit_date) BETWEEN $${startParamIndex} AND $${endParamIndex} AND ro.deleted_at IS NULL - GROUP BY ro."scheduleSeriesId", DATE(ro.visit_date) + GROUP BY ro.schedule_series_id, DATE(ro.visit_date) `; const rows: Array<{ series_id: string; visit_date: string | Date; used_count: string | number }> = await OrmHelper.DB.manager.query(