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

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

@@ -225,10 +225,10 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	                                           @RequestParam(value = "doctor",required = true) String doctor){
		
		//专家咨询
		Integer zjCount = imService.sessionCountByType(doctor,1);
		Integer zjCount = imService.sessionCountByType(doctor,1,0);
		
		//复诊咨询
		Integer imgCount = imService.sessionCountByType(doctor,9);
		Integer imgCount = imService.sessionCountByType(doctor,9,0);
		//正在进行中的视频复诊
		Long _videoOnlineCount = prescriptionService.doctorIndexConsultCount(doctor);