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

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

@@ -51,6 +51,7 @@ import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import com.ylzinfo.onepay.sdk.utils.StringUtil;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -2274,14 +2275,18 @@ 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()+",");
				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()+",");
					}
					if (content!=null){
						content.delete(content.length()-1,content.length());
					}
					map.put("icd10Name",content);
				}
				content.delete(content.length()-1,content.length());
				map.put("consultAdvice",content);
			}
		}
		return mapList;