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

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

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

@@ -769,10 +769,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "content", value = "消息内容", defaultValue = "")
			@RequestParam(value = "content", required = true) String content
	)throws Exception{
		if (!org.apache.commons.lang3.StringUtils.isNoneBlank(session_id)){
			session_id = imService.getPatientGuaidenceConsult(sender_id,session_id,content_type);
		}
		session_id = imService.getPatientGuaidenceConsult(sender_id,session_id,content_type);
		String result = imService.patientGuaidenceAppend(sender_id,sender_name,session_id,content_type,content,"1");
		return success(result);
	}