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

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/role/Level1Role.java

@@ -73,18 +73,26 @@ public class Level1Role {
        Map<String, List<ETLModel>> tjCityMap = new HashMap<String, List<ETLModel>>();//市级的统计map key 是区行政区划350200
        Map<String, List<ETLModel>> tjTownMap = new HashMap<String, List<ETLModel>>();//区级的统计map key 是区行政区划350206
        Map<String, List<ETLModel>> tjOrgMap = new HashMap<String, List<ETLModel>>();//机构的统计map key 是机构的code
        for(ETLModel etlModel:models){
            //统计市市
            compute(tjCityMap, etlModel.getCity(),etlModel);
            //统计市区
            compute(tjTownMap, etlModel.getTown(),etlModel);
            //统计市机构
            compute(tjOrgMap, etlModel.getHospital(),etlModel);
        if(models.size()>0){
            for(ETLModel etlModel:models){
                //统计市市
                compute(tjCityMap, etlModel.getCity(),etlModel);
                //统计市区
                compute(tjTownMap, etlModel.getTown(),etlModel);
                //统计市机构
                compute(tjOrgMap, etlModel.getHospital(),etlModel);
            }
            returnMapsList.add(0,new HashMap<>());
            returnMapsList.add(1,tjOrgMap);
            returnMapsList.add(2,tjTownMap);
            returnMapsList.add(3,tjCityMap);
        }else{
            returnMapsList.add(0,new HashMap<>());
            returnMapsList.add(1,new HashMap<>());
            returnMapsList.add(2,new HashMap<>());
            returnMapsList.add(3,new HashMap<>());
        }
        returnMapsList.add(1,tjOrgMap);
        returnMapsList.add(2,tjTownMap);
        returnMapsList.add(3,tjCityMap);
        return returnMapsList;
    }