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

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/config/quartz/JobFactory.java

@@ -16,9 +16,9 @@ public class JobFactory extends AdaptableJobFactory {
    private AutowireCapableBeanFactory capableBeanFactory;
    @Override
    protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
    // 调用父类的方法
        // 调用父类的方法
        Object jobInstance = super.createJobInstance(bundle);
    // 进行注入
       // 进行注入
        capableBeanFactory.autowireBean(jobInstance);
        return jobInstance;
    }

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/dataFilter/SignDataFilter.java

@@ -330,6 +330,9 @@ public class SignDataFilter {
            e.printStackTrace();
            return returnLevel2Key;
        }
        if(StringUtils.isEmpty(returnLevel2Key)){
            return "0";
        }
        return returnLevel2Key;
    }
@@ -352,12 +355,12 @@ public class SignDataFilter {
        }
        StringBuffer returnLevel2KeyBuffer=new StringBuffer(group);
        //如果是慢病组  区分65岁以上还是以下   65岁以上的慢病患者是7  65岁上下是2
//        if("2".equals(returnLevel2KeyBuffer.toString())){
//             Integer age=IdCardUtil.getAgeForIdcard(signFamily.getIdcard());
//            if(age>65){
//                returnLevel2KeyBuffer=new StringBuffer("7");
//            }
//        }
        if("2".equals(returnLevel2KeyBuffer.toString())){
             Integer age=IdCardUtil.getAgeForIdcard(signFamily.getIdcard());
            if(age>65){
                returnLevel2KeyBuffer=new StringBuffer("7");
            }
        }
        if("2".equals(returnLevel2KeyBuffer.toString())||"7".equals(returnLevel2KeyBuffer.toString())){
            String returnLevel2KeyTemp="-1";
            boolean hasGXY=false;//有高血压

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/mycache/CachePool.java

@@ -103,7 +103,7 @@ public class CachePool {
     * @throws Exception
     */
    public  String getHealthGroup(String patientCode){
        String code="0";
        String code;
        try{
            if(healthGroup.size()==0){
                initHealthGroup();
@@ -111,7 +111,10 @@ public class CachePool {
             code= healthGroup.get(patientCode);
        }catch (Exception e){
            e.printStackTrace();
            return code;
            return "0";
        }
        if(StringUtils.isEmpty(code)){
            code="0";
        }
        return code;
    }

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentDayAllQuotaJob.java

@@ -485,7 +485,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //统计数据 二级维度
            List<Map<String, Map<String, List<ETLModel>>>>  deleteLevel2Data= SpringUtil.getBean(Level2Role.class).elt(deleteReturnDatas);;
            //保存数据 1 表示：从1开始循环 6表示：循环6次 3表示 2级维度是 3
             SpringUtil.getBean(RedisStorage.class).saveByLevel2(level2Data,deleteLevel2Data,quotaId,6,3,-1);
             SpringUtil.getBean(RedisStorage.class).saveByLevel2(level2Data,deleteLevel2Data,quotaId,7,3,-1);
            allContent.append(etlModels.getMessage());
        }catch (Exception e){
            e.printStackTrace();

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/HealthSignJob.java

@@ -47,8 +47,6 @@ public class HealthSignJob implements Job {
    @Autowired
    private DBStorage dbStorage;
    @Autowired
    private DBExtract dbExtract;
    @Autowired
    private SignDataFilter signDataFilter;
    @Autowired
    private CachePool cachePool;

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/QuartzHelper.java

@@ -103,7 +103,6 @@ public class QuartzHelper {
                .startAt(time)
                .withSchedule(simpleSchedule().withIntervalInSeconds(10).withRepeatCount(0).withMisfireHandlingInstructionFireNow())
                .build();
        scheduler.scheduleJob(job, trigger);
        scheduler.start();
    }

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/SignJob.java

@@ -46,8 +46,6 @@ public class SignJob implements Job {
    @Autowired
    private DBStorage dbStorage;
    @Autowired
    private DBExtract dbExtract;
    @Autowired
    private SignDataFilter signDataFilter;
    @Autowired
    private CachePool cachePool;
@@ -160,8 +158,8 @@ public class SignJob implements Job {
            //统计数据 二级维度
            List<Map<String, Map<String, List<ETLModel>>>>  level2Data= level2Role.elt(returnDatas);
            //保存数据 1 表示：从1开始循环 6表示：循环6次 3表示 2级维度是 3
            // dbStorage.saveByLevel2(level2Data,yesterday,wlyyQuota,7,3,1);
            dbStorage.saveByLevel2(level2Data,yesterday,wlyyQuota,6,3,-1);
             dbStorage.saveByLevel2(level2Data,yesterday,wlyyQuota,7,3,-1);
            //dbStorage.saveByLevel2(level2Data,yesterday,wlyyQuota,6,3,-1);
            //保存日志
            quartzJobLog.setJobEndTime(new Date());