From 499918033ccf52f197f27ae5694b1b2a32dae469 Mon Sep 17 00:00:00 2001 From: Tony McCormick Date: Sat, 6 Nov 2010 01:26:35 -0700 Subject: [PATCH] Phyaura Calendar speed inhancement --- interface/main/calendar/modules/PostCalendar/pnuserapi.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/main/calendar/modules/PostCalendar/pnuserapi.php b/interface/main/calendar/modules/PostCalendar/pnuserapi.php index a6f9fb0c3..8eba1c7a5 100644 --- a/interface/main/calendar/modules/PostCalendar/pnuserapi.php +++ b/interface/main/calendar/modules/PostCalendar/pnuserapi.php @@ -754,12 +754,12 @@ function &postcalendar_userapi_pcQueryEventsFA($args) { "concat(u.fname,' ',u.lname) as provider_name, " . "concat(pd.fname,' ',pd.lname) as patient_name, " . "concat(u2.fname, ' ', u2.lname) as owner_name, pd.DOB as patient_dob " . - "FROM ( $table AS a, $cattable AS b ) " . + "FROM ( $table AS a ) " . + "LEFT JOIN $cattable AS b ON b.pc_catid = a.pc_catid " . "LEFT JOIN users as u ON a.pc_aid = u.id " . "LEFT JOIN users as u2 ON a.pc_aid = u2.id " . "LEFT JOIN patient_data as pd ON a.pc_pid=pd.pid " . - "WHERE b.pc_catid = a.pc_catid " . - "AND a.pc_eventstatus = $eventstatus " . + "WHERE a.pc_eventstatus = $eventstatus " . "AND (a.pc_endDate >= '$start' OR a.pc_endDate = '0000-00-00') " . "AND a.pc_eventDate <= '$end' " . "AND (a.pc_aid = '" . $provider_id . "' OR a.pc_aid = '')"; @@ -984,12 +984,12 @@ function &postcalendar_userapi_pcQueryEvents($args) "concat(pd.lname,', ',pd.fname) as patient_name, " . "concat(u2.fname, ' ', u2.lname) as owner_name, " . "DOB as patient_dob, pd.pubpid " . - "FROM ( $table AS a, $cattable AS b ) " . + "FROM ( $table AS a ) " . + "LEFT JOIN $cattable AS b ON b.pc_catid = a.pc_catid ". "LEFT JOIN users as u ON a.pc_aid = u.id " . "LEFT JOIN users as u2 ON a.pc_aid = u2.id " . "LEFT JOIN patient_data as pd ON a.pc_pid = pd.pid " . - "WHERE b.pc_catid = a.pc_catid " . - "AND a.pc_eventstatus = $eventstatus " . + "WHERE a.pc_eventstatus = $eventstatus " . "AND ((a.pc_endDate >= '$start' AND a.pc_eventDate <= '$end') OR " . "(a.pc_endDate = '0000-00-00' AND a.pc_eventDate >= '$start' AND " . "a.pc_eventDate <= '$end')) "; -- 2.11.4.GIT