Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/consult/ConsultService.java

@@ -213,13 +213,20 @@ public class ConsultService {
        sql += " ORDER BY a.czrq desc ";
        logger.info("sql="+sql);
        List<Map<String,Object>> result = hibenateUtils.createSQLQuery(sql,page,pagesize);
        Map<String,Integer> unreadNum = new HashedMap();
        for (Map<String,Object> map:result){
            if(type.equals(ImUtil.SESSION_TYPE_ONLINE)){
                String sessionId = patient+"_"+String.valueOf(map.get("doctorCode"))+"_23";
                //新增未读消息数量
                Integer count = imUtil.UserSessionsUnreadMessageCount(sessionId,patient);
                if(unreadNum.containsKey(sessionId)){
                    map.put("count",0);
                }else{
                    Integer count = imUtil.UserSessionsUnreadMessageCount(sessionId,patient);
                    map.put("count",count);
                    unreadNum.put(sessionId,count);
                }
                map.put("sessionId",sessionId);
                map.put("count",count);
            }
        }
        return result;