瀏覽代碼

Merge branch 'dev' of trick9191/patient-co-management into dev

trick9191 8 年之前
父節點
當前提交
e5d2ced8f5

+ 8 - 8
patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@ -3327,7 +3327,7 @@ public class StatisticsService extends BaseService {
                    " wlyy_patient_reservation w " +
                    " WHERE " +
                    " w.admin_team_code = " + teamCode +
                    " AND w.doctor_code = '" + doctor + "'" +
                    " AND w.doctor = '" + doctor + "'" +
                    " AND w.czrq <= '" + endDate + "' " +
                    " AND w.czrq >= '" + startDate + "' " +
                    " GROUP BY dateNo";
@ -3341,7 +3341,7 @@ public class StatisticsService extends BaseService {
                    " wlyy_patient_reservation w " +
                    " WHERE " +
                    " w.admin_team_code = " + teamCode +
                    " AND w.doctor_code = '" + doctor + "'" +
                    " AND w.doctor = '" + doctor + "'" +
                    " AND w.czrq <= '" + endDate + "' " +
                    " AND w.czrq >= '" + startDate + "' " +
                    " GROUP BY weekOfMonth";
@ -3363,8 +3363,8 @@ public class StatisticsService extends BaseService {
                " LEFT JOIN ( " +
                " SELECT " +
                " COUNT(1) AS reservationCount, " +
                " w.doctor_code AS doctorCode, " +
                " w.doctor AS name " +
                " w.doctor AS doctorCode, " +
                " w.dname AS name " +
                " FROM " +
                " wlyy_patient_reservation w " +
                " WHERE " +
@ -3391,8 +3391,8 @@ public class StatisticsService extends BaseService {
                " LEFT JOIN ( " +
                " SELECT " +
                " COUNT(1) AS reservationCount, " +
                " w.doctor_code AS doctorCode, " +
                " w.doctor AS name " +
                " w.doctor AS doctorCode, " +
                " w.dname AS name " +
                " FROM " +
                " wlyy_patient_reservation w " +
                " WHERE " +
@ -3470,7 +3470,7 @@ public class StatisticsService extends BaseService {
                " wlyy_patient_reservation w " +
                " WHERE " +
                " w.admin_team_code =  " + teamCode +
                " AND w.doctor_code ='" + doctor + "' " +
                " AND w.doctor ='" + doctor + "' " +
                " AND w.czrq <= '" + endDate + "' ";
        String addSQL = "SELECT " +
@ -3479,7 +3479,7 @@ public class StatisticsService extends BaseService {
                " wlyy_patient_reservation w " +
                " WHERE " +
                " w.admin_team_code =  " + teamCode +
                " AND w.doctor_code ='" + doctor + "' " +
                " AND w.doctor ='" + doctor + "' " +
                " AND w.czrq <= '" + endDate + "' " +
                " AND w.czrq >= '" + startDate + "'";
        JSONObject rs = new JSONObject();