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

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

@@ -136,8 +136,8 @@ public class ImService {
	 */
	public List<ConsultVO>  findConsultRecordByPatient(String patient, String id,Integer type, int page,int pagesize, String title) {
		if(page <= 0){
			pagesize = 1;
		if(page >=1){
			page --;
		}
		
		if (pagesize <= 0) {

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -246,9 +246,9 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
			imgCount = 0;
		}
		
		result.put("zjCount",zjCount);
		result.put("imgCount",imgCount);
		result.put("videoCount",waitVideoCount+_videoOnlineCount);
		result.put("zjCount",zjCount);//专家咨询数量
		result.put("imgCount",imgCount);//图文复诊数量
		result.put("videoCount",waitVideoCount+_videoOnlineCount);//视频复诊数量
		
		
		return success("请求成功",result);