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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -135,7 +135,15 @@ public class DoctorConsultController extends WeixinBaseController {
                    json.put("doctorRead", consult.getDoctorRead());
                    // 设置关联指导
                    json.put("guidance", consult.getGuidance());
                    json.put("startId", consult.getStartMsgId());
                    json.put("endId", consult.getEndMsgId());
                    List<WlyyTalkGroup> wlyyTalkGroups = talkGroupService.findAllConsultTalkGroup(consult.getConsult());
                    if (wlyyTalkGroups != null && wlyyTalkGroups.size() > 0) {
                        for (WlyyTalkGroup wlyyTalkGroup : wlyyTalkGroups) {
                            json.put("group" + wlyyTalkGroup.getType(), wlyyTalkGroup.getCode());
                            json.put("groupName" + wlyyTalkGroup.getType(), wlyyTalkGroup.getName());
                        }
                    }
                    jsonArray.put(json);
                }
            }