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

src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorDiscussionGroupController.java

@@ -674,7 +674,7 @@ public class DoctorDiscussionGroupController extends BaseController {
			,@RequestParam(required = false) Integer page
			,@RequestParam(required = false) Integer pagesize){
		try{
			JSONArray result = talkGroupService.getOneToOneIm("fa4dd8565f0f11e68344fa163e8aee56",doctorName);
			JSONArray result = talkGroupService.getOneToOneIm(getUID(),doctorName);
			if(page != null && pagesize != null){
				int from = (page - 1)*pagesize;