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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsAllService.java

@@ -538,6 +538,10 @@ public class StatisticsAllService extends BaseService {
                }
            }
            if((level==4&&"1".equals(lowLevel))||(level==2)){
                translateTeamLeaderName(resultList);
            }
            Collections.sort(resultList, new Comparator<Map<String, Object>>() {
                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                    long map1value = (long) o1.get("amount");
@@ -627,6 +631,10 @@ public class StatisticsAllService extends BaseService {
                }
            }
            if((level==4&&"1".equals(lowLevel))||(level==2)){
                translateTeamLeaderName(resultList);
            }
            Collections.sort(resultList, new Comparator<Map<String, Object>>() {
                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                    long map1value = (long) o1.get("amount");
@@ -843,6 +851,10 @@ public class StatisticsAllService extends BaseService {
            }
        }
        if((level==4&&"1".equals(lowLevel))||(level==2)){
            translateTeamLeaderName(resultList);
        }
        Collections.sort(resultList, new Comparator<Map<String, Object>>() {
            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                String map1value = o1.get("rate").toString();
@@ -2564,6 +2576,9 @@ public class StatisticsAllService extends BaseService {
                }
            }
            if((level==4&&"1".equals(lowLevel))||(level==2)){
                translateTeamLeaderName(resultList);
            }
            // 排序
            resultList.sort(new Comparator<Map<String, Object>>() {
                @Override
@@ -2643,7 +2658,9 @@ public class StatisticsAllService extends BaseService {
    public String getTeamLeaderNameByTeamCode(Map<Integer,Map<String,Object>> leaders ,int teamCode){
        if(leaders!=null&&leaders.size()>0&&teamCode!=0){
            Map<String,Object> leader = leaders.get(teamCode);
            return (String)leader.get("name");
            if(leader!=null){
                return (String)leader.get("name");
            }
        }
        return "";
    }
@@ -2654,7 +2671,39 @@ public class StatisticsAllService extends BaseService {
            for(Map<String,Object> r :rs){
                String id = (String)r.get("code");
                String name = getTeamLeaderNameByTeamCode(leaders,Integer.parseInt(id));
                r.put("name",name);
                if(org.apache.commons.lang3.StringUtils.isNotBlank(name)){
                    r.put("name",name);
                }
            }
        }
        return rs;
    }
    public JSONArray translateTeamLeaderName(JSONArray rs){
        Map<Integer,Map<String,Object>> leaders = getAllTeamLeaders();
        if(rs!=null){
            for(int i=0;i<rs.length();i++){
                JSONObject r = rs.getJSONObject(i);
                Integer id = (Integer)r.get("id");
                String name = getTeamLeaderNameByTeamCode(leaders,id);
                if(org.apache.commons.lang3.StringUtils.isNotBlank(name)){
                    r.put("name",name);
                }
            }
        }
        return rs;
    }
    public JSONArray translateTeamLeaderNameByCode(JSONArray rs){
        Map<Integer,Map<String,Object>> leaders = getAllTeamLeaders();
        if(rs!=null){
            for(int i=0;i<rs.length();i++){
                JSONObject r = rs.getJSONObject(i);
                String id = (String)r.get("code");
                String name = getTeamLeaderNameByTeamCode(leaders,Integer.parseInt(id));
                if(org.apache.commons.lang3.StringUtils.isNotBlank(name)){
                    r.put("name",name);
                }
            }
        }
        return rs;

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -12,6 +12,7 @@ import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.statistics.PopulationBaseDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.MapListUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,8 @@ public class StatisticsService extends BaseService {
    PopulationBaseDao peopleNumDao;
    @Autowired
    private StringRedisTemplate redisTemplate;
    @Autowired
    private StatisticsAllService statisticsAllService;
    /**
@@ -405,6 +408,10 @@ public class StatisticsService extends BaseService {
                }
            }
            if (level==2){
                statisticsAllService.translateTeamLeaderName(resultList);
            }
            Collections.sort(resultList, new Comparator<Map<String, Object>>() {
                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                    long map1value = (long) o1.get("amount");
@@ -1438,8 +1445,9 @@ public class StatisticsService extends BaseService {
                return null;
            }
            JSONArray noRely = new JSONArray(noRelyTotal);
            result.put("resultList",getCoutList(rely,total,noRely));
            List<Map<String,Object>> rs = getCoutList(rely,total,noRely);
            statisticsAllService.translateTeamLeaderName(rs);
            result.put("resultList",rs);
        }
        return result;
    }
@@ -1702,7 +1710,13 @@ public class StatisticsService extends BaseService {
        } else if(level ==3){
            rs = redisTemplate.opsForValue().get("quota:28:"+level+":"+area+":2:"+timeKey);
        }else if(level ==2){
            rs = redisTemplate.opsForValue().get("quota:28:"+level+":"+area+":1:"+timeKey);
            String rstemp = redisTemplate.opsForValue().get("quota:28:"+level+":"+area+":1:"+timeKey);
            JSONObject jsonObject = new JSONObject(rstemp);
            JSONArray json = jsonObject.getJSONArray("data");
            statisticsAllService.translateTeamLeaderName(json);
            JSONObject rsjs = new JSONObject();
            rsjs.put("data",json);
            rs = rsjs.toString();
        }
        return rs;
    }
@@ -1790,4 +1804,6 @@ public class StatisticsService extends BaseService {
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/MapListUtils.java

@@ -10,15 +10,15 @@ import java.util.*;
 */
public class MapListUtils {
    public static List<Map<String,String>> parserJsonStringToMapList(String s) {
    public static List<Map<String,Object>> parserJsonStringToMapList(String s) {
        JSONArray ja = new JSONArray(s);
        JSONObject jo = ja.getJSONObject(0);
        Iterator it = jo.keys();
        List<Map<String, String>> l = new ArrayList<Map<String, String>>();
        List<Map<String, Object>> l = new ArrayList<Map<String, Object>>();
        while (it.hasNext()) {
            Map<String, String> map = new HashMap<String, String>();
            Map<String, Object> map = new HashMap<String, Object>();
            String key = (String) it.next();
            String value = jo.getString(key);
            Object value = jo.getString(key);
            map.put(key, value);
            l.add(map);
        }

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

@@ -283,6 +283,9 @@ public class StatisticsController extends BaseController {
                }
            }
            if(level==2){
                statisticsAllService.translateTeamLeaderNameByCode(returnJa);
            }
            result.put("index_" + indexes[0], returnJa);
            return write(200, "查询成功", "data", result);
        } catch (