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

@@ -2274,14 +2274,14 @@ public class ImService {
				}
			}
			if (map.get("id")!=null){
				String consultCode = map.get("id").toString();
				List<WlyyConsultAdvice> consultAdvices = wlyyConsultAdviceDao.getByConsult(consultCode);
				StringBuffer content = new StringBuffer();
				for (WlyyConsultAdvice consultAdvice:consultAdvices){
					content.append(consultAdvice.getAdviceValue()+",");
				}
				content.delete(content.length()-1,content.length());
				if("1".equals(type) || "15".equals(type) || type.contains(",")){
					String consultCode = map.get("id").toString();
					List<WlyyConsultAdvice> consultAdvices = wlyyConsultAdviceDao.getByConsult(consultCode);
					StringBuffer content = new StringBuffer();
					for (WlyyConsultAdvice consultAdvice:consultAdvices){
						content.append(consultAdvice.getAdviceValue()+",");
					}
					content.delete(content.length()-1,content.length());
					map.put("icd10Name",content);
				}
			}