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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -750,7 +750,7 @@ public class ConsultTeamService extends ConsultService {
        //推送给IM去创建议题，取得成员消息
        JSONObject messages  = ImUtill.getCreateTopicMessage(patient,tempPatient.getName(),consult.getTitle(),consult.getSymptoms(),consult.getImages());
        users.put(patient,0);
        JSONObject obj  = ImUtill.createTopics(patient+"_consult_"+ct.getType(),consult.getCode(),"咨询问题:"+consult.getSymptoms(),users,messages,"1");
        JSONObject obj  = ImUtill.createTopics(patient+"_consult_"+ct.getType(),consult.getCode(),tempPatient.getName()+" "+IdCardUtil.getAgeForIdcard(tempPatient.getIdcard()),users,messages,"1");
        if(obj==null){
            throw new RuntimeException("IM消息结束异常！");
        }

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

@@ -624,16 +624,7 @@ public class ConsultController extends WeixinBaseController {
                logs.add(log);
            }else if (type == 2) {
                // 图片消息
                if (StringUtils.isEmpty(content)) {
                    String images = request.getParameter("mediaIds");
                    if (!StringUtils.isEmpty(images)) {
                        arr = images.split(",");
                    }
                } else {
                    arr = content.split(",");
                }
                content =  fetchWxImages();
                // 将临时图片拷贝到正式存储路径下
                if (StringUtils.isNotEmpty(content)) {
                    content = CommonUtil.copyTempImage(content);