Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/storage/RedisStorage.java

@@ -261,8 +261,8 @@ public class RedisStorage {
                    JSONObject jo=new JSONObject();
                    jo.put("date", DateUtil.dateToStrLong(new Date()));
                    jo.put("num", num);
                    jo.put("name", level3);
                    jo.put("code", getLevel3Name(level3,type3));
                    jo.put("name", getLevel3Name(level3,type3));
                    jo.put("code", level3);
                    StringBuffer sb=new StringBuffer("quota:"+wlyyQuotaId+":"+level1+":"+adminTeamObj.getId()+":"+level2+":"+":"+level3+":"+timeKey);
                    keys.add(sb.toString());
@@ -370,8 +370,8 @@ public class RedisStorage {
                    JSONObject jo=new JSONObject();
                    jo.put("date", DateUtil.dateToStrLong(new Date()));
                    jo.put("num", num);
                    jo.put("name", level3);
                    jo.put("code", getLevel3Name(level3,type3));
                    jo.put("name", getLevel3Name(level3,type3));
                    jo.put("code", level3);
                    StringBuffer sb=new StringBuffer("quota:"+wlyyQuotaId+":"+level1+":"+":"+hospital.getCode()+":"+level2+":"+level3+":"+timeKey);
                    keys.add(sb.toString());
                    redisTemplate.opsForValue().set(sb.toString(), jo.toString());
@@ -516,8 +516,8 @@ public class RedisStorage {
                    //jo.put("code", town.getCode());
                    jo.put("level2code", level2);
                    jo.put("level2name", getLevel2Name(level2,type2));
                    jo.put("name", level3);
                    jo.put("code", getLevel3Name(level3,type3));
                    jo.put("name", getLevel3Name(level3,type3));
                    jo.put("code",level3 );
                    StringBuffer sb=new StringBuffer("quota:"+wlyyQuotaId+":"+level1+":"+town.getCode()+":"+level2+":"+level3+":"+timeKey);
                    keys.add(sb.toString());
                    redisTemplate.opsForValue().set(sb.toString(), jo.toString());
@@ -563,8 +563,8 @@ public class RedisStorage {
                    JSONObject jo=new JSONObject();
                    jo.put("date", DateUtil.dateToStrLong(new Date()));
                    jo.put("num", num);
                    jo.put("name", level3);
                    jo.put("code", getLevel3Name(level3,type3));
                    jo.put("name",getLevel3Name(level3,type3));
                    jo.put("code",level3);
                    StringBuffer sb=new StringBuffer("quota:"+wlyyQuotaId+":"+level1+":"+cityObj.getCode()+":"+level2+":"+level3+":"+timeKey);
                    keys.add(sb.toString());
@@ -682,8 +682,8 @@ public class RedisStorage {
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);
                String key=i+"";
                jo.put("name", key);
                jo.put("code",  Constant.getLevelSexName(key));
                jo.put("name", getLevel2Name(key,type));
                jo.put("code",key);
                StringBuffer sb=new StringBuffer("quota:"+wlyyQuotaId+":1:"+adminTeam.getKey().toString()+":"+key+":"+timeKey);
                keys.add(sb.toString());
@@ -731,7 +731,7 @@ public class RedisStorage {
        for(Map.Entry<String,Town> town:townsMap.entrySet()){
            Map<String, List<ETLModel>> oneELTMap= eltModel.get(town.getKey());
            JSONArray level2=new JSONArray();
            for(int i=1;i<=foreachNum;i++){
            for(int i=start;i<=foreachNum;i++){
                JSONObject jo=new JSONObject();
                int num=0;
                if(oneELTMap!=null){
@@ -743,13 +743,12 @@ public class RedisStorage {
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);
                String key=i+"";
                jo.put("name", key);
                jo.put("code", Constant.getLevelSexName(key));
                jo.put("name", getLevel2Name(key,type));
                jo.put("code",key);
                StringBuffer sb=new StringBuffer("quota:"+wlyyQuotaId+":3:"+town.getKey()+":"+key+":"+timeKey);
                keys.add(sb.toString());
                redisTemplate.opsForValue().set(sb.toString(), jo.toString());
                level2.put(jo);
            }
@@ -777,14 +776,14 @@ public class RedisStorage {
                jo.put("date", DateUtil.dateToStrLong(new Date()));
                jo.put("num", num);
                String key=i+"";
                jo.put("name", key);
                jo.put("code", Constant.getLevelSexName(key));
                jo.put("name", getLevel2Name(key,type));
                jo.put("code",key);
                addJOLeval2(townjr,hospitalObj.getTown(),key,jo);
                level2.put(jo);
                StringBuffer sb=new StringBuffer("quota:"+wlyyQuotaId+":2:"+hospital.getKey().toString()+":"+key+":"+timeKey);
                keys.add(sb.toString());
                redisTemplate.opsForValue().set(sb.toString(), level2.toString());
                redisTemplate.opsForValue().set(sb.toString(), jo.toString());
            }
            StringBuffer sb=new StringBuffer("quota:"+wlyyQuotaId+":2:"+hospital.getKey().toString()+":"+timeKey);
@@ -897,7 +896,7 @@ public class RedisStorage {
            jo.put("date", DateUtil.dateToStrLong(new Date()));
            jo.put("num", num);
            jo.put("name", adminTeamObj.getName());
            jo.put("code", adminTeamObj.getId());
            jo.put("code", adminTeamObj.getId()+"");
            String orgKey=adminTeamObj.getOrgCode();
            Hospital hospital=hospitalsMap.get(orgKey);
@@ -1183,6 +1182,10 @@ public class RedisStorage {
                //疾病
                return Constant.getlevelHealthFbName(i);
            }
            case  6:{
                //疾病
                return Constant.getLevelExpenseName(i);
            }
            default:{
                return "";
            }

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

@@ -80,7 +80,7 @@ public class CurrentDayAllQuotaJob implements Job {
    private String now = getDayString(-1)+ Constant.quota_date_last;
    private String tomorrow = DateUtil.dateToStrLong(new Date());
    private String tomorrow = getDayString(1);
    private StringBuffer allContent=new StringBuffer();//日志内容
@@ -189,7 +189,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //统计数据 二级维度
            List<Map<String, Map<String, List<ETLModel>>>> level2Data= SpringUtil.getBean(Level2Role.class).elt(returnDatas);
            //保存redis
            SpringUtil.getBean(RedisStorage.class).saveByLevel2(level2Data,null,quotaId,2,5,0);
            SpringUtil.getBean(RedisStorage.class).saveByLevel2(level2Data,null,quotaId,2,6,0);
            allContent.append(JsonUtil.objToStr(etlModels.getLogModel()));
        }catch (Exception e){
            e.printStackTrace();