健康教育，活动抽奖

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java

@@ -2427,7 +2427,7 @@ public class StatisticsESService {
        //获取结果集
        List<Map<String, Object>> resultList = null;
        if ("0".equals(type)) {
            resultList = DateUtil.findDates(dateFormat.parse(startDate), dateFormat.parse(endDate));
            resultList = DateUtil.findDates(dateFormat.parse(startDate), dateFormat.parse(DateUtil.getNextDay(endDate,1)));
        } else {
            resultList = DateUtil.findDateASWeeks(dateFormat.parse(startDate), dateFormat.parse(endDate));
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/questionnaire/QuestionnaireController.java

@@ -70,6 +70,16 @@ public class QuestionnaireController extends BaseController {
            if (result!=null && result.size()>0){
                return write(-1,"不好意思，您已经抽过奖了！");
            }
            boolean paramFlag = true;
            paramFlag = checkParam(name,50);
            paramFlag = checkParam(idcard,50);
            paramFlag = checkParam(openid,50);
            paramFlag = checkParam(mobile,50);
            paramFlag = checkParam(census,50);
            paramFlag = checkParam(address,200);
            if (!paramFlag){
                return write(-1,"您填的信息格式不合格，请您检查！");
            }
            Map<String,Object> map = questionnaireUsersService.saveUpdateUser(code, name, idcard, openid, mobile, census, address);
            boolean flag = (Boolean) map.get("flag");
            if (flag){
@@ -83,6 +93,18 @@ public class QuestionnaireController extends BaseController {
        }
    }
    private boolean checkParam(String param, int length){
        boolean flag = true;
        if (StringUtils.isEmpty(param)){
            flag = false;
            return  flag;
        }
        if (param.length()>length){
            flag = false;
            return flag;
        }
        return flag;
    }
    //----------------------电影票活动抽奖-------------------------------//
    @RequestMapping(value = "/checkLotto",method = RequestMethod.POST)