Merge branch 'dev' of huangwenjie/wlyy2.0 into dev

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1609,6 +1609,16 @@ public class ImService {
		return imUtil.sessionCountByType(userid,type,status);
	}
	
	/**
	 *获取所有会话未读消息数
	 * @param userid
	 * @param type
	 * @return
	 */
	public Integer SessionsUnreadMessageCount(String userid,Integer type){
		return imUtil.SessionsUnreadMessageCount(userid,type);
	}
	
	/**
	 * 发送复诊诊断和药品消息
	 * @param wlyyPrescriptionVO

business/im-service/src/main/java/com/yihu/jw/im/util/ImUtil.java

@@ -706,21 +706,21 @@ public class ImUtil {
	}
	
	/**
	 *按会话类型获取会话总数
	 *获取所有会话未读消息数。
	 * @param userid
	 * @param type
	 * @param status
	 * @return
	 */
	public Integer SessionsUnreadMessageCount(String userid,Integer type){
		String url = im_host + "api/v2//sessions/unread_message_count?user_id="+userid;
		String url = im_host + "api/v2/sessions/unread_message_count?user_id="+userid;
		String ret = HttpClientUtil.get(url,"utf-8");
		JSONObject obj = JSON.parseObject(ret);
		if(obj.getInteger("status") ==200){
			return obj.getInteger("count");
		}else{
			return 0;
		}
//		if(obj.getInteger("count") ==200){
		return obj.getInteger("count");
//		}else{
//			return 0;
//		}
	}
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -202,10 +202,12 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            Integer zjqzCount = imService.sessionCountByType(doctor.getId(),15,0);
    
            //专家咨询
//            Integer unreadMessageCount = imService.sessionCountByType(doctor,1,0);
            Integer unreadMessageCount = imService.SessionsUnreadMessageCount(doctor.getId(),1);
            result.put("zjCount",zjCount+zjqzCount);//专家咨询数量
            result.put("zjUnreadMessageCount",unreadMessageCount);//专家咨询未读数
        }else{
            result.put("zjCount",0);//专家咨询数量
            result.put("zjUnreadMessageCount",0);//专家咨询未读数
        }
        return success("请求成功",result);
    }