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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/EvaluateService.java

@@ -296,7 +296,7 @@ public class EvaluateService extends BaseService {
    public JSONArray getDoctorSorceList(String doctor,String type,Integer page,Integer size){
        String sql = "SELECT " +
                " (case e.type WHEN 2 then '匿名' ELSE p.`name` END) `name`,  " +
                " (case e.type WHEN 2 then '匿名' ELSE p.`name` END) `name`,p.sex ,LEFT(c.czrq,10) AS date,s.remark, " +
                " TIMESTAMPDIFF(YEAR,p.birthday,SYSDATE()) age,s.consult,s.score,e.type,  " +
                " max(case e.evaluate_type when 1 then e.score else 0 end) ability,  " +
                " max(case e.evaluate_type when 2 then e.score else 0 end) attitude,  " +
@@ -327,9 +327,9 @@ public class EvaluateService extends BaseService {
        if(page!=null&&size!=null){
            page = page -1;
            sql = sql+ " GROUP BY s.consult LIMIT "+page*size+","+size+" ";
            sql = sql+ " GROUP BY s.consult ORDER BY date DESC LIMIT "+page*size+","+size+" ";
        }else{
            sql = sql=" GROUP BY s.consult ";
            sql = sql +" GROUP BY s.consult ORDER BY date DESC ";
        }
        List<Map<String,Object>> rs = jdbcTemplate.queryForList(sql);