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

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

@@ -2345,7 +2345,13 @@ public class ImService {
			}else {
				sessionType=imUtil.SESSION_TYPE_GUIDANCE_HOSPITAL;
			}
			JSONObject sessionJson  = imUtil.createSession(participants,sessionType,"居民 "+basePatientDO.getName()+" "+patientSex,session_id);
			String patientAge = "";
			if (org.apache.commons.lang3.StringUtils.isNoneBlank(basePatientDO.getIdcard())){
				int age = DateUtil.getAgeForIdcard(basePatientDO.getIdcard());
				patientAge = ""+age;
			}
			JSONObject sessionJson  = imUtil.createSession(participants,sessionType,basePatientDO.getName()+" "+patientSex+" "+patientAge,session_id);
			if(sessionJson.getInteger("status") ==-1){
				throw  new RuntimeException(sessionJson.getString("message"));
			}else{