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

@@ -3169,8 +3169,16 @@ public class ImService {
			sql =sql +" ORDER BY op.create_time DESC";
		}
		
		return hibenateUtils.createSQLQuery(sql);
		List<Map<String,Object>> mapList = hibenateUtils.createSQLQuery(sql);
		for (Map<String,Object> map:mapList){
			if (map.get("patientIdcard")!=null){
				String idcard = map.get("patientIdcard").toString();
				Integer age =IdCardUtil.getAgeForIdcard(idcard);
				map.put("age",age);
			}
		}
		return mapList;
	}
	
	/**