|
@ -2293,20 +2293,30 @@ public class StatisticsService extends BaseService {
|
|
String sql;
|
|
String sql;
|
|
//周计算
|
|
//周计算
|
|
if ("0".equals(type)) {
|
|
if ("0".equals(type)) {
|
|
sql = "SELECT DATE_FORMAT(t.czrq,'%Y-%m-%d') AS dateNo,ifnull(ROUND(AVG(s.score),1),0) as avgCount " +
|
|
|
|
" FROM wlyy_consult_team t" +
|
|
|
|
" LEFT JOIN wlyy_doctor d ON d.code = t.doctor " +
|
|
|
|
" LEFT JOIN wlyy_evaluate_score s ON s.doctor = t.doctor " +
|
|
|
|
" WHERE t.czrq <='" + endDate + "' AND t.czrq >='" + startDate + "'" +
|
|
|
|
" AND t.admin_team_code =" + id +
|
|
|
|
" GROUP BY dateNo ";
|
|
|
|
|
|
sql = "SELECT " +
|
|
|
|
" DATE_FORMAT(t.czrq, '%Y-%m-%d') AS dateNo, " +
|
|
|
|
" ifnull(ROUND(AVG(s.score), 1), 0) AS avgCount " +
|
|
|
|
" FROM " +
|
|
|
|
" wlyy_evaluate_score s ,wlyy_consult_team t " +
|
|
|
|
" WHERE " +
|
|
|
|
" s.consult = t.consult " +
|
|
|
|
" AND " +
|
|
|
|
" t.czrq <= '"+endDate+"' " +
|
|
|
|
" AND t.czrq >= '"+startDate+"' " +
|
|
|
|
" AND t.admin_team_code = " +id+
|
|
|
|
" GROUP BY dateNo";
|
|
} else {
|
|
} else {
|
|
sql = "SELECT (DATE_FORMAT(t.czrq,'%v')-DATE_FORMAT('" + startDate + "','%v')+1) AS weekNo,ifnull(ROUND(AVG(s.score),1),0) as avgCount " +
|
|
|
|
" FROM wlyy_consult_team t " +
|
|
|
|
" LEFT JOIN wlyy_doctor d ON d.code = t.doctor " +
|
|
|
|
" LEFT JOIN wlyy_evaluate_score s ON s.doctor = t.doctor " +
|
|
|
|
" WHERE t.czrq <='" + endDate + "' AND t.czrq >='" + startDate + "'" +
|
|
|
|
" AND t.admin_team_code =" + id +
|
|
|
|
|
|
sql = "SELECT " +
|
|
|
|
" (DATE_FORMAT(t.czrq,'%v')-DATE_FORMAT('"+startDate+"','%v')+1) AS weekNo, " +
|
|
|
|
" ifnull(ROUND(AVG(s.score), 1), 0) AS avgCount " +
|
|
|
|
" FROM " +
|
|
|
|
" wlyy_evaluate_score s,wlyy_consult_team t " +
|
|
|
|
" WHERE " +
|
|
|
|
" s.consult = t.consult " +
|
|
|
|
" AND " +
|
|
|
|
" t.czrq <= '"+endDate+"' " +
|
|
|
|
" AND t.czrq >= '"+startDate+"' " +
|
|
|
|
" AND t.admin_team_code = " +id +
|
|
" GROUP BY weekNo";
|
|
" GROUP BY weekNo";
|
|
}
|
|
}
|
|
|
|
|