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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageLogDO.java

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

@@ -2281,7 +2281,9 @@ public class ImService {
					content.append(consultAdvice.getAdviceValue()+",");
				}
				content.delete(content.length()-1,content.length());
				map.put("icd10Name",content);
				if("1".equals(type) || "15".equals(type) || type.contains(",")){
					map.put("icd10Name",content);
				}
			}
		}
		return mapList;