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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/SignFamilyDao.java

@@ -427,4 +427,9 @@ public interface SignFamilyDao extends PagingAndSortingRepository<SignFamily, Lo
    // 查询已签约未缴费居民
    @Query("select a from SignFamily a where  a.patient = ?1 and a.type = 2 and a.expensesStatus = '0' and a.status >0")
    SignFamily findUnpay(String patient);
    //根据身份证号码查询该人的签约情况
    @Query("select count(1) from SignFamily a where a.idcard=?1 and a.status>0 and a.type=2")
    int hasSignCount(String idcard);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/archives/PatientArchiveInfoService.java

@@ -178,7 +178,7 @@ public class PatientArchiveInfoService {
        }
        //查看是否已经签约
        int signCount = signFamilyDao.hasSingStatus(archiveInfoDto.getIdentityCardNo());
        int signCount = signFamilyDao.hasSignCount(archiveInfoDto.getIdentityCardNo());
        if (signCount>0){
            archiveInfoDto.setSignStatus(1);
        }else{

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)

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/EsStatisticsController.java

@@ -860,8 +860,8 @@ public class EsStatisticsController extends BaseController {
                                   @RequestParam(required = true) String endDate) {
        try {
            //return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo(getUID(), startDate, endDate));
            return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo("xh1D2017031502222",startDate,endDate));
            return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo(getUID(), startDate, endDate));
            //return write(200, "查询成功", "data", statisticsESService.getStatTitleInfo("xh1D2017031502222",startDate,endDate));
        } catch (Exception e) {
            error(e);