Merge branch 'dev' of chenweida/patient-co-management into dev

src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -444,13 +444,8 @@ public class ConsultTeamService extends ConsultService {
		List<ConsultTeamLog> logs = new ArrayList<ConsultTeamLog>();
		// 添加问题咨询日志
		String content ="";
		if(ct.getType()==1||ct.getType()==2){
			 content = "发病时间：" + (StringUtils.isEmpty(ct.getWhen()) ? "无" : ct.getWhen());
			content += "<br>主要症状：" + (StringUtils.isEmpty(ct.getSymptoms()) ? "无" : ct.getSymptoms());
		}else if(ct.getType()==6){
			content = "咨询问题：";
			content += "<br>主要症状：" + (StringUtils.isEmpty(ct.getSymptoms()) ? "无" : ct.getSymptoms());
		}
			content = "咨询问题：" + (StringUtils.isEmpty(ct.getSymptoms()) ? "无" : ct.getSymptoms());
		// 生成提问日志，并推送相关消息
		ConsultTeamLog infoLog = new ConsultTeamLog();
		infoLog.setConsult(ct.getConsult());