回访问卷代码提交

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/questionnaire/QuestionnaireService.java

@@ -53,7 +53,18 @@ public class QuestionnaireService extends BaseService {
	 */
	public List<QuestionnaireWinningESDO> getQuestionnaireWinningESDOByIdcardAndOpenid(String idcard,String openid) throws Exception{
		//中奖纪录
		String sql = "SELECT * FROM " + esType + "  where del = 0 and ( userIdcard= '" + idcard + "' or userOpenid = '"+openid+"' ) ";
		String sql = "SELECT * FROM " + esType + "  where del = 0";
		
		if(StringUtils.isNotBlank(idcard) && StringUtils.isNotBlank(openid)){
			sql = sql + " and ( userIdcard= '" + idcard + "' or userOpenid = '"+openid+"' ) ";
		}else{
			if(StringUtils.isNotBlank(idcard)){
				sql = sql + " and userIdcard='"+idcard+"'";
			}else if(StringUtils.isNotBlank(openid)){
				sql = sql + " and userOpenid='"+openid+"'";
			}else{}
		}
		
		List<QuestionnaireWinningESDO> result = elasticsearchUtil.excute(sql, QuestionnaireWinningESDO.class, esIndex, esType);
		return result;
	}