代码修改

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -195,15 +195,15 @@ public class StatisticsEsService {
            object.put("data", array);
            JSONArray array1 = dateTotalStatistics2(startDate, endDate, area, level, "5", "1", SaveModel.timeLevel_ZL, null);
            object.put("specialistData", array1);
            JSONArray array2 = dateTotalStatistics2(startDate, endDate, area, level, "12", "9", SaveModel.timeLevel_ZL, null);
            JSONArray array2 = dateTotalStatistics2(startDate, endDate, area, level, "5", "9", SaveModel.timeLevel_ZL, null);
            object.put("topicData", array2);
            JSONArray array3 = dateTotalStatistics2(startDate, endDate, area, level, "14", "12", SaveModel.timeLevel_ZL, null);
            JSONArray array3 = dateTotalStatistics2(startDate, endDate, area, level, "5", "12", SaveModel.timeLevel_ZL, null);
            object.put("synergyData", array3);
            JSONArray array4 = dateTotalStatistics2(startDate, endDate, area, level, "16", "16", SaveModel.timeLevel_ZL, null);
            JSONArray array4 = dateTotalStatistics2(startDate, endDate, area, level, "5", "16", SaveModel.timeLevel_ZL, null);
            object.put("vedioData", array4);
            JSONArray array5 = dateTotalStatistics2(startDate, endDate, area, level, "12", "1", SaveModel.timeLevel_ZL, null);
            JSONArray array5 = dateTotalStatistics2(startDate, endDate, area, level, "5", "1", SaveModel.timeLevel_ZL, null);
            object.put("twzxData", array5);
            JSONArray array6 = dateTotalStatistics2(startDate, endDate, area, level, "16", "17", SaveModel.timeLevel_ZL, null);
            JSONArray array6 = dateTotalStatistics2(startDate, endDate, area, level, "5", "17", SaveModel.timeLevel_ZL, null);
            object.put("spzxData", array6);
        } else if (interval == 2) {
@@ -211,30 +211,30 @@ public class StatisticsEsService {
            object.put("data", array);
            JSONArray array1 = weekTotalStatistics7(startDate, endDate, area, level, "5", "1", SaveModel.timeLevel_ZL);
            object.put("specialistData", array1);
            JSONArray array2 = weekTotalStatistics7(startDate, endDate, area, level, "12", "9", SaveModel.timeLevel_ZL);
            JSONArray array2 = weekTotalStatistics7(startDate, endDate, area, level, "5", "9", SaveModel.timeLevel_ZL);
            object.put("topicData", array2);
            JSONArray array3 = weekTotalStatistics7(startDate, endDate, area, level, "14", "12", SaveModel.timeLevel_ZL);
            JSONArray array3 = weekTotalStatistics7(startDate, endDate, area, level, "5", "12", SaveModel.timeLevel_ZL);
            object.put("synergyData", array3);
            JSONArray array4 = weekTotalStatistics7(startDate, endDate, area, level, "16", "16", SaveModel.timeLevel_ZL);
            JSONArray array4 = weekTotalStatistics7(startDate, endDate, area, level, "5", "16", SaveModel.timeLevel_ZL);
            object.put("vedioData", array4);
            JSONArray array5 = weekTotalStatistics7(startDate, endDate, area, level, "12", "1", SaveModel.timeLevel_ZL);
            JSONArray array5 = weekTotalStatistics7(startDate, endDate, area, level, "5", "1", SaveModel.timeLevel_ZL);
            object.put("twzxData", array5);
            JSONArray array6 = weekTotalStatistics7(startDate, endDate, area, level, "16", "17", SaveModel.timeLevel_ZL);
            JSONArray array6 = weekTotalStatistics7(startDate, endDate, area, level, "5", "17", SaveModel.timeLevel_ZL);
            object.put("spzxData", array6);
        } else if (interval == 3) {
            JSONArray array = monthTotalStatistics2(startDate, endDate, area, level, index, null, SaveModel.timeLevel_ZL, null);
            object.put("data", array);
            JSONArray array1 = monthTotalStatistics2(startDate, endDate, area, level, "5", "1", SaveModel.timeLevel_ZL, null);
            object.put("specialistData", array1);
            JSONArray array2 = monthTotalStatistics2(startDate, endDate, area, level, "12", "9", SaveModel.timeLevel_ZL, null);
            JSONArray array2 = monthTotalStatistics2(startDate, endDate, area, level, "5", "9", SaveModel.timeLevel_ZL, null);
            object.put("topicData", array2);
            JSONArray array3 = monthTotalStatistics2(startDate, endDate, area, level, "14", "12", SaveModel.timeLevel_ZL, null);
            JSONArray array3 = monthTotalStatistics2(startDate, endDate, area, level, "5", "12", SaveModel.timeLevel_ZL, null);
            object.put("synergyData", array3);
            JSONArray array4 = monthTotalStatistics2(startDate, endDate, area, level, "16", "16", SaveModel.timeLevel_ZL, null);
            JSONArray array4 = monthTotalStatistics2(startDate, endDate, area, level, "5", "16", SaveModel.timeLevel_ZL, null);
            object.put("vedioData", array4);
            JSONArray array5 = monthTotalStatistics2(startDate, endDate, area, level, "12", "1", SaveModel.timeLevel_ZL, null);
            JSONArray array5 = monthTotalStatistics2(startDate, endDate, area, level, "5", "1", SaveModel.timeLevel_ZL, null);
            object.put("twzxData", array5);
            JSONArray array6 = monthTotalStatistics2(startDate, endDate, area, level, "16", "17", SaveModel.timeLevel_ZL, null);
            JSONArray array6 = monthTotalStatistics2(startDate, endDate, area, level, "5", "17", SaveModel.timeLevel_ZL, null);
            object.put("spzxData", array6);
        }
        if (StringUtils.isNoneBlank(level2_type)) {
@@ -245,15 +245,15 @@ public class StatisticsEsService {
            List<SaveModel> specialistSaveModels = elasticsearchUtil.findDateQuotaLevel0(startDate, endDate, area, level, index, SaveModel.timeLevel_ZL,null,level2_type);
*/
            //协同门诊
            List<SaveModel> syngySaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "14", SaveModel.timeLevel_ZL, "12", null, level2_type);
            List<SaveModel> syngySaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "5", SaveModel.timeLevel_ZL, "12", null, level2_type);
            //图文复诊
            List<SaveModel> topicSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "5", SaveModel.timeLevel_ZL, "9", null, level2_type);
            ///视频复诊
            List<SaveModel> vedioSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "16", SaveModel.timeLevel_ZL, "16", null, level2_type);
            List<SaveModel> vedioSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "5", SaveModel.timeLevel_ZL, "16", null, level2_type);
            ///图文咨询
            List<SaveModel> twzxSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "5", SaveModel.timeLevel_ZL, "1", null, level2_type);
            ///视频咨询
            List<SaveModel> spzxSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "16", SaveModel.timeLevel_ZL, "17", null, level2_type);
            List<SaveModel> spzxSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "5", SaveModel.timeLevel_ZL, "17", null, level2_type);
            JSONArray array = new JSONArray();
            List<String> list = new ArrayList<>();

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/common/service/StatisticsService.java

@@ -195,8 +195,14 @@ public class StatisticsService {
        int replyNumTotal = 0;
        int turnUpNumTotal = 0;
        int turnDownNumTotal = 0;
        int collaborateNumOther = 0;
        int inviteNumOther = 0;
        int replyNumOther = 0;
        int turnUpNumOther = 0;
        int turnDownNumOther = 0;
        List<Map<String,Object>> other = new ArrayList<>();
        List<Map<String,Object>> listTmp = new ArrayList<>();
        Map<String, List<Map<String,Object>>> deptMap = new HashMap<>();
        Map<String, String> idcardMap = new HashMap<>();
        if(jsonObject!=null&&jsonObject.getInteger("status")==200){
            jsonArray = jsonObject.getJSONArray("list");
            for (Map<String,Object> map:list){
@@ -211,16 +217,16 @@ public class StatisticsService {
                    int turnDownNum = json.getInteger("turnDownNum");
                    int total = collaborateNum + inviteNum + replyNum + turnUpNum + turnDownNum;
                    if(total==0){
                        jsonArray.remove(i);
                        break;
                    }
                    collaborateNumTotal += collaborateNum;
                    inviteNumTotal += inviteNum;
                    replyNumTotal += replyNum;
                    turnUpNumTotal += turnUpNum;
                    turnDownNumTotal += turnDownNum;
                    if(idcard1.equals(idcard)){
                        String dept = map.get("dept")+"";
                        collaborateNumTotal += collaborateNum;
                        inviteNumTotal += inviteNum;
                        replyNumTotal += replyNum;
                        turnUpNumTotal += turnUpNum;
                        turnDownNumTotal += turnDownNum;
                        map.put("code", idcard1);
                        map.put("collaborateNum",collaborateNum);
                        map.put("inviteNum",inviteNum);
                        map.put("replyNum",replyNum);
@@ -228,8 +234,34 @@ public class StatisticsService {
                        map.put("turnDownNum",turnDownNum);
                        map.put("replyRate",getRange(replyNum, inviteNum));
                        listTmp.add(map);
                        jsonArray.remove(i);
                        break;
                    }else{
                        if(!idcardMap.containsKey(idcard)){
                            collaborateNumTotal += collaborateNum;
                            inviteNumTotal += inviteNum;
                            replyNumTotal += replyNum;
                            turnUpNumTotal += turnUpNum;
                            turnDownNumTotal += turnDownNum;
                            idcardMap.put(idcard,"1");
                            String name = json.getString("name");
                            Map<String,Object> mapOther = new HashMap<>();
                            mapOther.put("code",idcard);
                            mapOther.put("name",name);
                            mapOther.put("collaborateNum",collaborateNum);
                            mapOther.put("inviteNum",inviteNum);
                            mapOther.put("replyNum",replyNum);
                            mapOther.put("turnUpNum",turnUpNum);
                            mapOther.put("turnDownNum",turnDownNum);
                            mapOther.put("replyRate",getRange(replyNum, inviteNum));
                            other.add(mapOther);
                            collaborateNumOther += collaborateNum;
                            inviteNumOther += inviteNum;
                            replyNumOther += replyNum;
                            turnUpNumOther += turnUpNum;
                            turnDownNumOther += turnDownNum;
                        }
                    }
                }
            }
@@ -290,41 +322,7 @@ public class StatisticsService {
            }
            result.add(deptTmp);
        }
        List<Map<String,Object>> other = new ArrayList<>();
        if(jsonArray!=null&&jsonArray.size()>0){
            int collaborateNumOther = 0;
            int inviteNumOther = 0;
            int replyNumOther = 0;
            int turnUpNumOther = 0;
            int turnDownNumOther = 0;
            for (int i=0;i<jsonArray.size();i++){
                Map<String,Object> map = new HashMap<>();
                JSONObject json = jsonArray.getJSONObject(i);
                String idcard = json.getString("code");
                String name = json.getString("name");
                int collaborateNum = json.getInteger("collaborateNum");
                int inviteNum = json.getInteger("inviteNum");
                int replyNum = json.getInteger("replyNum");
                int turnUpNum = json.getInteger("turnUpNum");
                int turnDownNum = json.getInteger("turnDownNum");
                map.put("code",idcard);
                map.put("name",name);
                map.put("collaborateNum",collaborateNum);
                map.put("inviteNum",inviteNum);
                map.put("replyNum",replyNum);
                map.put("turnUpNum",turnUpNum);
                map.put("turnDownNum",turnDownNum);
                map.put("replyRate",getRange(replyNum, inviteNum));
                other.add(map);
                collaborateNumOther += collaborateNum;
                inviteNumOther += inviteNum;
                replyNumOther += replyNum;
                turnUpNumOther += turnUpNum;
                turnDownNumOther += turnDownNum;
            }
        if(other.size()>0){
            Map<String,Object> otherMap = new HashMap<>();
            otherMap.put("code","-");
            otherMap.put("name","其他");
@@ -342,7 +340,6 @@ public class StatisticsService {
            }
            result.add(otherMap);
        }
        return result;
    }
@@ -358,8 +355,14 @@ public class StatisticsService {
        int replyNumTotal = 0;
        int turnUpNumTotal = 0;
        int turnDownNumTotal = 0;
        int collaborateNumOther = 0;
        int inviteNumOther = 0;
        int replyNumOther = 0;
        int turnUpNumOther = 0;
        int turnDownNumOther = 0;
        List<Map<String,Object>> other = new ArrayList<>();
        List<Map<String,Object>> listTmp = new ArrayList<>();
        Map<String, List<Map<String,Object>>> deptMap = new HashMap<>();
        Map<String, String> idcardMap = new HashMap<>();
        if(jsonObject!=null&&jsonObject.getInteger("status")==200){
            jsonArray = jsonObject.getJSONArray("list");
            for (Map<String,Object> map:list){
@@ -374,15 +377,14 @@ public class StatisticsService {
                    int turnDownNum = json.getInteger("turnDownNum");
                    int total = collaborateNum + inviteNum + replyNum + turnUpNum + turnDownNum;
                    if(total==0){
                        jsonArray.remove(i);
                        break;
                    }
                    collaborateNumTotal += collaborateNum;
                    inviteNumTotal += inviteNum;
                    replyNumTotal += replyNum;
                    turnUpNumTotal += turnUpNum;
                    turnDownNumTotal += turnDownNum;
                    if(idcard1.equals(idcard)){
                        collaborateNumTotal += collaborateNum;
                        inviteNumTotal += inviteNum;
                        replyNumTotal += replyNum;
                        turnUpNumTotal += turnUpNum;
                        turnDownNumTotal += turnDownNum;
                        map.put("collaborateNum",collaborateNum);
                        map.put("inviteNum",inviteNum);
                        map.put("replyNum",replyNum);
@@ -390,8 +392,35 @@ public class StatisticsService {
                        map.put("turnDownNum",turnDownNum);
                        map.put("replyRate",getRange(replyNum, inviteNum));
                        listTmp.add(map);
                        jsonArray.remove(i);
                        break;
                    }else{
                        if(!idcardMap.containsKey(idcard)){
                            collaborateNumTotal += collaborateNum;
                            inviteNumTotal += inviteNum;
                            replyNumTotal += replyNum;
                            turnUpNumTotal += turnUpNum;
                            turnDownNumTotal += turnDownNum;
                            idcardMap.put(idcard,"1");
                            String name = json.getString("name");
                            Map<String,Object> mapOther = new HashMap<>();
                            mapOther.put("dept","其他");
                            mapOther.put("code",idcard);
                            mapOther.put("name",name);
                            mapOther.put("collaborateNum",collaborateNum);
                            mapOther.put("inviteNum",inviteNum);
                            mapOther.put("replyNum",replyNum);
                            mapOther.put("turnUpNum",turnUpNum);
                            mapOther.put("turnDownNum",turnDownNum);
                            mapOther.put("replyRate",getRange(replyNum, inviteNum));
                            other.add(mapOther);
                            collaborateNumOther += collaborateNum;
                            inviteNumOther += inviteNum;
                            replyNumOther += replyNum;
                            turnUpNumOther += turnUpNum;
                            turnDownNumOther += turnDownNum;
                        }
                    }
                }
            }
@@ -447,40 +476,7 @@ public class StatisticsService {
            result.add(deptTmp);
            result.addAll(value);
        }
        List<Map<String,Object>> other = new ArrayList<>();
        if(jsonArray!=null&&jsonArray.size()>0){
            int collaborateNumOther = 0;
            int inviteNumOther = 0;
            int replyNumOther = 0;
            int turnUpNumOther = 0;
            int turnDownNumOther = 0;
            for (int i=0;i<jsonArray.size();i++){
                Map<String,Object> map = new HashMap<>();
                JSONObject json = jsonArray.getJSONObject(i);
                String name = json.getString("name");
                int collaborateNum = json.getInteger("collaborateNum");
                int inviteNum = json.getInteger("inviteNum");
                int replyNum = json.getInteger("replyNum");
                int turnUpNum = json.getInteger("turnUpNum");
                int turnDownNum = json.getInteger("turnDownNum");
                map.put("dept","其他");
                map.put("name",name);
                map.put("collaborateNum",collaborateNum);
                map.put("inviteNum",inviteNum);
                map.put("replyNum",replyNum);
                map.put("turnUpNum",turnUpNum);
                map.put("turnDownNum",turnDownNum);
                map.put("replyRate",getRange(replyNum, inviteNum));
                other.add(map);
                collaborateNumOther += collaborateNum;
                inviteNumOther += inviteNum;
                replyNumOther += replyNum;
                turnUpNumOther += turnUpNum;
                turnDownNumOther += turnDownNum;
            }
        if(other.size()>0){
            Map<String,Object> otherMap = new HashMap<>();
            otherMap.put("dept","其他");
            otherMap.put("name","-");