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

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

@@ -198,11 +198,12 @@ public class DoctorConsultController extends WeixinBaseController {
                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());
                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);
            }

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

@@ -387,16 +387,16 @@ public class DoctorDiscussionGroupController extends BaseController {
            @RequestParam(required = false, defaultValue = "0") int doctorType) {
        try {
            WlyyTalkGroup group = talkGroupService.findTalkGroup(groupCode);
            if(group == null){
                return error(-1,"讨论组不存在");
            if (group == null) {
                return error(-1, "讨论组不存在");
            }
            if (talkGroupService.isMemberExists(groupCode, groupName)) {
                return error(-2, "成员已在该讨论组");
            }
            WlyyTalkGroupMember member = new WlyyTalkGroupMember();
            Doctor doc = doctorService.findDoctorByCode(doctor);
            if(doc == null){
                return error(-1,"添加的医生的信息查询失败");
            if (doc == null) {
                return error(-1, "添加的医生的信息查询失败");
            }
            member.setGroupCode(groupCode);
@@ -443,9 +443,9 @@ public class DoctorDiscussionGroupController extends BaseController {
     */
    @RequestMapping(value = "/addmembers", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String addMembers(@RequestParam(required = true)String groupCode,
                             @RequestParam(required = false)String groupName,
                             @RequestParam(required = true)String members) {
    public String addMembers(@RequestParam(required = true) String groupCode,
                             @RequestParam(required = false) String groupName,
                             @RequestParam(required = true) String members) {
        try {
            List<WlyyTalkGroupMember> talkMembers = new ArrayList<>();
            JSONArray membersJArray = new JSONArray(members);
@@ -615,6 +615,7 @@ public class DoctorDiscussionGroupController extends BaseController {
            return error(-1, "查询失败");
        }
    }
    /**
     * 根据讨论组查找咨询code
     *
@@ -625,7 +626,7 @@ public class DoctorDiscussionGroupController extends BaseController {
    @ResponseBody
    public String getConsultByGroupCode(String groupCode) {
        try {
            ConsultTeam consult= talkGroupService.findConsultByGroup(groupCode);
            ConsultTeam consult = talkGroupService.findConsultByGroup(groupCode);
            JSONObject json = new JSONObject();
            json.put("id", consult.getId());
            // 设置咨询标识
@@ -658,15 +659,22 @@ public class DoctorDiscussionGroupController extends BaseController {
            json.put("guidance", consult.getGuidance());
            json.put("startId", consult.getStartMsgId());
            json.put("endId", consult.getEndMsgId());
            WlyyTalkGroup wlyyTalkGroup= talkGroupService.findTalkGroup(groupCode);
            json.put("groupCreator", wlyyTalkGroup.getCreator());
            json.put("groupCreatorName", wlyyTalkGroup.getCreatorName());
            json.put("groupType", wlyyTalkGroup.getType());
            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());
                    json.put("groupCreator"+ wlyyTalkGroup.getType(), wlyyTalkGroup.getCreator());
                    json.put("groupCreatorName"+ wlyyTalkGroup.getType(), wlyyTalkGroup.getCreatorName());
                    json.put("groupType"+ wlyyTalkGroup.getType(), wlyyTalkGroup.getType());
                }
            }
            return write(200, "查询成功", "data", json);
        } catch (Exception e) {
            return error(-1, "查询失败");
        }
    }
    /**
     * 获取讨论组成员列表
     *