Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -2851,6 +2851,6 @@ public class ImService {
		msg.put("cancleReason",cancleReason);
		msg.put("cancleContent",cancleContent);
		logger.info("开始发送"+msg.toJSONString());
		return imUtil.sendMessage(doctor,patientCode,"1",msg.toString());
		return imUtil.sendMessage(doctor,patientCode,"2",msg.toString());
	}
}