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

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

@@ -2584,19 +2584,19 @@ public class StatisticsAllService extends BaseService {
            if ((level == 4 && "1".equals(lowLevel)) || (level == 2)) {
                translateTeamLeaderName(resultList);
            }
            // 排序
            resultList.sort(new Comparator<Map<String, Object>>() {
                @Override
                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                    if ((double) o1.get("bindDoubleRate") >= (double) o2.get("bindDoubleRate")) {
                        return -1;
                    } else if ((double) o1.get("bindDoubleRate") < (double) o2.get("bindDoubleRate")) {
                        return 1;
                    } else {
                        return 0;
                    }
                }
            });
            // 排序 按绑定率来排序
//            resultList.sort(new Comparator<Map<String, Object>>() {
//                @Override
//                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
//                    if ((double) o1.get("bindDoubleRate") >= (double) o2.get("bindDoubleRate")) {
//                        return -1;
//                    } else if ((double) o1.get("bindDoubleRate") < (double) o2.get("bindDoubleRate")) {
//                        return 1;
//                    } else {
//                        return 0;
//                    }
//                }
//            });
            return new JSONArray(resultList);
        } else {

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

@@ -259,7 +259,7 @@ public class StatisticsController extends BaseController {
            if (Constant.getNowYearByDate(endDate).equals(year)) {
                jsonArray2 = statisticsService.getLowLevelIncrementDetail(endDate, endDate, area, level, indexes[1], sort, lowLevel);
            }else{
                String date=Integer.valueOf(year)+"-06-30";
                String date=Integer.valueOf(year)+1+"-06-30";
                jsonArray2 = statisticsService.getLowLevelIncrementDetail(date, date, area, level, indexes[1], sort, lowLevel);
            }
            jsonArrays.add(jsonArray2);