ETLbug修改

src/main/java/com/yihu/wlyy/job/CurrentDayAllQuotaJob.java

@@ -129,6 +129,7 @@ public class CurrentDayAllQuotaJob implements Job {
            computequota();
        }catch (Exception e){
            e.printStackTrace();
            e.printStackTrace();
        }
    }
@@ -520,6 +521,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,"1");
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent("1",signFamilys.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);
@@ -622,6 +624,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent(quotaId,signFamilys.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);
@@ -711,6 +714,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent(quotaId,consultTeams.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);
@@ -814,6 +818,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
@@ -911,6 +916,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
@@ -1013,6 +1019,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel2(patientSexRoleData,quotaId,3,1);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
@@ -1541,6 +1548,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel2(patientAgeRoleData,quotaId,6,2);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent(quotaId,signFamilys.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);
@@ -1642,6 +1650,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent(quotaId,signFamilys.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);
@@ -1761,6 +1770,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //保存数据
            redisStorage.saveByLevel1(returnDatas,quotaId);
        }catch (Exception e){
            e.printStackTrace();
            errorContent.append("统计失败:"+e.getMessage());
        }
        saveContent(quotaId,signFamilys.size(),adminCount,orgCount,townCount,cityCount,isAll,errorContent,errorCount);

src/main/java/com/yihu/wlyy/job/elt/storage/RedisStorage.java

@@ -138,10 +138,12 @@ public class RedisStorage {
                AdminTeam adminTeamObj=adminTeam.getValue();
                if(adminTeamObj==null)continue;
                JSONObject jo=new JSONObject();
                Integer num=0;
                List<ETLModel> etlList=oneELTMap.get(adminTeam.getKey());
                if(etlList!=null&&etlList.size()>0){
                    num=etlList.size();
                int num=0;
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);
@@ -161,10 +163,12 @@ public class RedisStorage {
                Hospital hospitalObj=hospital.getValue();
                if(hospitalObj==null)continue;
                JSONObject jo=new JSONObject();
                Integer num=0;
                List<ETLModel> etlList=oneELTMap.get(hospital.getKey());
                if(etlList!=null&&etlList.size()>0){
                    num=etlList.size();
                int num=0;
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);
@@ -182,10 +186,12 @@ public class RedisStorage {
            Map<String, List<ETLModel>> oneELTMap= eltModel.get(town.getKey());
            for(int i=1;i<=foreachNum;i++){
                JSONObject jo=new JSONObject();
                Integer num=0;
                List<ETLModel> etlList=oneELTMap.get(town.getKey());
                if(etlList!=null&&etlList.size()>0){
                    num=etlList.size();
                int num=0;
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);
@@ -203,10 +209,12 @@ public class RedisStorage {
            Map<String, List<ETLModel>> oneELTMap= eltModel.get(city.getKey());
            for(int i=1;i<=foreachNum;i++){
                JSONObject jo=new JSONObject();
                Integer num=0;
                List<ETLModel> etlList=oneELTMap.get(city.getKey());
                if(etlList!=null&&etlList.size()>0){
                    num=etlList.size();
                int num=0;
                if(oneELTMap!=null){
                    List<ETLModel> etlModel= oneELTMap.get(i+"");
                    if(etlModel!=null&&etlModel.size()>0){
                        num=etlModel.size();
                    }
                }
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);