Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

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

@@ -607,7 +607,6 @@ public class ConsultTeamService extends ConsultService {
                        if (ctd == null) {
                            continue;
                        }
                        // 推送消息给医生
                        PushMsgTask.getInstance().put(ctd.getTo(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_CONSULT_TEAM_REPLY.D_CT_02.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_CONSULT_TEAM_REPLY.指定咨询.name(), MessageType.MESSAGE_TYPE_DOCTOR_NEW_CONSULT_TEAM_REPLY.您有新的消息.name(), temp.getConsult());
                    }
@@ -726,7 +725,7 @@ public class ConsultTeamService extends ConsultService {
        messages.put("senderId",patient);
        messages.put("senderName",tempPatient.getName());
        users.put(patient,0);
        JSONObject obj  = createTopics(patient,consult.getCode(),"咨询问题:"+consult.getSymptoms(),users,messages);
        JSONObject obj  = createTopics(UUID.randomUUID().toString(),consult.getCode(),"咨询问题:"+consult.getSymptoms(),users,messages);
        if(obj==null){
            throw new RuntimeException("IM消息结束异常！");
        }
@@ -737,6 +736,8 @@ public class ConsultTeamService extends ConsultService {
        return 1;
    }
    /**
     * 发送消息给IM
     *