diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 62da324..fc24885 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -38,7 +38,7 @@
             AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+            AND DATE_FORMAT(hand_time,'%Y-%m-%d %H:%i:%s') <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
         ORDER BY `links` DESC

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 62da324..fc24885 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -38,7 +38,7 @@
             AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+            AND DATE_FORMAT(hand_time,'%Y-%m-%d %H:%i:%s') <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
         ORDER BY `links` DESC
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 9b8a5da..e9271f9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,7 +17,7 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -33,12 +33,13 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
     </select>
 
     <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -54,7 +55,8 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
         limit 10
 
     </select>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 62da324..fc24885 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -38,7 +38,7 @@
             AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+            AND DATE_FORMAT(hand_time,'%Y-%m-%d %H:%i:%s') <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
         ORDER BY `links` DESC
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 9b8a5da..e9271f9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,7 +17,7 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -33,12 +33,13 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
     </select>
 
     <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -54,7 +55,8 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
         limit 10
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
index b9ca4ad..2238a9d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
@@ -132,13 +132,15 @@
     }
 
     public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount,
-                        Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) {
+                        Integer firstLeaderCount, Integer sendCount, Integer feedbackCount,String startTime,String endTime) {
         this.reportedCount = reportedCount;
         this.firstJudgmentCount = firstJudgmentCount;
         this.secondLeaderCount = secondLeaderCount;
         this.firstLeaderCount = firstLeaderCount;
         this.sendCount = sendCount;
         this.feedbackCount = feedbackCount;
+        this.startTime=startTime;
+        this.endTime=endTime;
     }
 
     @Override

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 62da324..fc24885 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -38,7 +38,7 @@
             AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+            AND DATE_FORMAT(hand_time,'%Y-%m-%d %H:%i:%s') <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
         ORDER BY `links` DESC
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 9b8a5da..e9271f9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,7 +17,7 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -33,12 +33,13 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
     </select>
 
     <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -54,7 +55,8 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
         limit 10
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
index b9ca4ad..2238a9d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
@@ -132,13 +132,15 @@
     }
 
     public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount,
-                        Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) {
+                        Integer firstLeaderCount, Integer sendCount, Integer feedbackCount,String startTime,String endTime) {
         this.reportedCount = reportedCount;
         this.firstJudgmentCount = firstJudgmentCount;
         this.secondLeaderCount = secondLeaderCount;
         this.firstLeaderCount = firstLeaderCount;
         this.sendCount = sendCount;
         this.feedbackCount = feedbackCount;
+        this.startTime=startTime;
+        this.endTime=endTime;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
index cbd5751..1d9ca80 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
@@ -50,6 +50,8 @@
             commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
                     commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
                     commonRequest.getValue());
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().length() > 10 ? commonRequest.getName().substring(0, 10) : commonRequest.getName());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
         });
         return commonRequestList;
     }
@@ -57,6 +59,17 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(String begTime, String endTime) {
-        return  this.baseMapper.statisticsByTag(begTime, endTime);
+
+        List<CommonRequest> commonRequestList =  this.baseMapper.statisticsByTag(begTime, endTime);
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().contains(",") ?
+                    commonRequest.getName().substring(0, commonRequest.getName().indexOf(",")) : commonRequest.getName());
+
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
+                    commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
+                    commonRequest.getValue());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
+        });
+        return  commonRequestList;
     }
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 62da324..fc24885 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -38,7 +38,7 @@
             AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+            AND DATE_FORMAT(hand_time,'%Y-%m-%d %H:%i:%s') <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
         ORDER BY `links` DESC
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 9b8a5da..e9271f9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,7 +17,7 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -33,12 +33,13 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
     </select>
 
     <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -54,7 +55,8 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
         limit 10
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
index b9ca4ad..2238a9d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
@@ -132,13 +132,15 @@
     }
 
     public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount,
-                        Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) {
+                        Integer firstLeaderCount, Integer sendCount, Integer feedbackCount,String startTime,String endTime) {
         this.reportedCount = reportedCount;
         this.firstJudgmentCount = firstJudgmentCount;
         this.secondLeaderCount = secondLeaderCount;
         this.firstLeaderCount = firstLeaderCount;
         this.sendCount = sendCount;
         this.feedbackCount = feedbackCount;
+        this.startTime=startTime;
+        this.endTime=endTime;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
index cbd5751..1d9ca80 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
@@ -50,6 +50,8 @@
             commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
                     commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
                     commonRequest.getValue());
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().length() > 10 ? commonRequest.getName().substring(0, 10) : commonRequest.getName());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
         });
         return commonRequestList;
     }
@@ -57,6 +59,17 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(String begTime, String endTime) {
-        return  this.baseMapper.statisticsByTag(begTime, endTime);
+
+        List<CommonRequest> commonRequestList =  this.baseMapper.statisticsByTag(begTime, endTime);
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().contains(",") ?
+                    commonRequest.getName().substring(0, commonRequest.getName().indexOf(",")) : commonRequest.getName());
+
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
+                    commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
+                    commonRequest.getValue());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
+        });
+        return  commonRequestList;
     }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
index afea624..3706d4d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
@@ -136,12 +136,17 @@
                 if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
                     if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
                         String tagId = tagResponse.getTagId();
-                        if (firstTags.contains(tagId)) {
-                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
-                        } else if (secondTags.contains(tagId)) {
-                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
-                        } else if (thirdTags.contains(tagId)) {
-                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        int count1 =Collections.frequency(firstTags, tagId);
+                        if (count1>0) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue()*count1);
+                        }
+                        int count2 =Collections.frequency(secondTags, tagId);
+                        if (count2>0) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue()*count2);
+                        }
+                        int count3 =Collections.frequency(thirdTags, tagId);
+                        if (count3>0) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue()*count3);
                         }
                     }
                 }
@@ -431,6 +436,19 @@
                 }
             }
         }
+
+        for(CommonRequest commonRequest:list){
+            //特殊处理
+            if("其他".equals(commonRequest.getName())){
+                int count=0;
+                for(CommonRequest commonRequest1:commonRequestList){
+                    if(ObjectUtil.isEmpty(commonRequest1.getName())){
+                        count = count+ Float.valueOf(commonRequest1.getValue()).intValue();
+                    }
+                }
+                commonRequest.setValue(count+"");
+            }
+        }
         return list;
     }
 
@@ -660,6 +678,15 @@
                 return apiMap;
             }).collect(Collectors.toList());
         }
+
+
+        //逆序
+        Collections.sort(resultList, new Comparator<Map<String, Object>>() {
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                Long s1 = Long.valueOf( o1.get("value").toString());
+                Long s2 = Long.valueOf( o2.get("value").toString());
+                return s2.compareTo(s1);
+            }});
         return resultList;
     }
 
@@ -676,7 +703,7 @@
             for(CommonRequest commonRequest:list){
                 commonRequest.setValue("0");
                 String time = commonRequest.getTime();
-                if(ObjectUtil.isNotEmpty(time)){
+                if(ObjectUtil.isNotEmpty(time)&&(!"[]".equals(time))){
                     List<String> timeList = JSONObject.parseArray(time,String.class);
                     for(String timeStr:timeList){
                        for(CommonRequest commonRequest1:commonRequestList){
@@ -721,8 +748,6 @@
     @Override
     public List<Map<String, Object>> statisticsByTag(JudgmentRequest judgmentRequest) {
 
-
-
         return  iBusinessAccessService.getAccessStatus("2-bq") &&
                 (ToolUtils.pageArr[1] == judgmentRequest.getPage()) &&
                 (!(judgmentRequest.getIsReal() != null && judgmentRequest.getIsReal())) ?

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 62da324..fc24885 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -38,7 +38,7 @@
             AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+            AND DATE_FORMAT(hand_time,'%Y-%m-%d %H:%i:%s') <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
         ORDER BY `links` DESC
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 9b8a5da..e9271f9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,7 +17,7 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -33,12 +33,13 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
     </select>
 
     <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -54,7 +55,8 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
         limit 10
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
index b9ca4ad..2238a9d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
@@ -132,13 +132,15 @@
     }
 
     public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount,
-                        Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) {
+                        Integer firstLeaderCount, Integer sendCount, Integer feedbackCount,String startTime,String endTime) {
         this.reportedCount = reportedCount;
         this.firstJudgmentCount = firstJudgmentCount;
         this.secondLeaderCount = secondLeaderCount;
         this.firstLeaderCount = firstLeaderCount;
         this.sendCount = sendCount;
         this.feedbackCount = feedbackCount;
+        this.startTime=startTime;
+        this.endTime=endTime;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
index cbd5751..1d9ca80 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
@@ -50,6 +50,8 @@
             commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
                     commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
                     commonRequest.getValue());
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().length() > 10 ? commonRequest.getName().substring(0, 10) : commonRequest.getName());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
         });
         return commonRequestList;
     }
@@ -57,6 +59,17 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(String begTime, String endTime) {
-        return  this.baseMapper.statisticsByTag(begTime, endTime);
+
+        List<CommonRequest> commonRequestList =  this.baseMapper.statisticsByTag(begTime, endTime);
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().contains(",") ?
+                    commonRequest.getName().substring(0, commonRequest.getName().indexOf(",")) : commonRequest.getName());
+
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
+                    commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
+                    commonRequest.getValue());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
+        });
+        return  commonRequestList;
     }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
index afea624..3706d4d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
@@ -136,12 +136,17 @@
                 if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
                     if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
                         String tagId = tagResponse.getTagId();
-                        if (firstTags.contains(tagId)) {
-                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
-                        } else if (secondTags.contains(tagId)) {
-                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
-                        } else if (thirdTags.contains(tagId)) {
-                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        int count1 =Collections.frequency(firstTags, tagId);
+                        if (count1>0) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue()*count1);
+                        }
+                        int count2 =Collections.frequency(secondTags, tagId);
+                        if (count2>0) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue()*count2);
+                        }
+                        int count3 =Collections.frequency(thirdTags, tagId);
+                        if (count3>0) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue()*count3);
                         }
                     }
                 }
@@ -431,6 +436,19 @@
                 }
             }
         }
+
+        for(CommonRequest commonRequest:list){
+            //特殊处理
+            if("其他".equals(commonRequest.getName())){
+                int count=0;
+                for(CommonRequest commonRequest1:commonRequestList){
+                    if(ObjectUtil.isEmpty(commonRequest1.getName())){
+                        count = count+ Float.valueOf(commonRequest1.getValue()).intValue();
+                    }
+                }
+                commonRequest.setValue(count+"");
+            }
+        }
         return list;
     }
 
@@ -660,6 +678,15 @@
                 return apiMap;
             }).collect(Collectors.toList());
         }
+
+
+        //逆序
+        Collections.sort(resultList, new Comparator<Map<String, Object>>() {
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                Long s1 = Long.valueOf( o1.get("value").toString());
+                Long s2 = Long.valueOf( o2.get("value").toString());
+                return s2.compareTo(s1);
+            }});
         return resultList;
     }
 
@@ -676,7 +703,7 @@
             for(CommonRequest commonRequest:list){
                 commonRequest.setValue("0");
                 String time = commonRequest.getTime();
-                if(ObjectUtil.isNotEmpty(time)){
+                if(ObjectUtil.isNotEmpty(time)&&(!"[]".equals(time))){
                     List<String> timeList = JSONObject.parseArray(time,String.class);
                     for(String timeStr:timeList){
                        for(CommonRequest commonRequest1:commonRequestList){
@@ -721,8 +748,6 @@
     @Override
     public List<Map<String, Object>> statisticsByTag(JudgmentRequest judgmentRequest) {
 
-
-
         return  iBusinessAccessService.getAccessStatus("2-bq") &&
                 (ToolUtils.pageArr[1] == judgmentRequest.getPage()) &&
                 (!(judgmentRequest.getIsReal() != null && judgmentRequest.getIsReal())) ?
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
index 9e92bed..135f53b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
@@ -196,7 +196,8 @@
             }
         }
 
-        return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount);
+        return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount,businessReportInfoRequest.getBeginTime(),
+                businessReportInfoRequest.getEndTime());
 
     }
 
@@ -399,13 +400,23 @@
         });
         resultMapList.add(resultMap);
         resultMapList.removeIf(objMap->Long.valueOf(objMap.get("value").toString()).intValue()==0);
+
+
+        //逆序
+        Collections.sort(resultMapList, new Comparator<Map<String, Object>>() {
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                Long s1 = (Long) o1.get("value");
+                Long s2 = (Long) o2.get("value");
+                return s2.compareTo(s1);
+            }});
         return resultMapList;
     }
 
     @Override
     public List<HashMap<String, Object>> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
         return iBusinessAccessService.getAccessStatus("3-pt") &&
-                (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())
+                (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())&&
+                (!(businessReportInfoRequest.getIsReal() != null && businessReportInfoRequest.getIsReal()))
                 ? statisticsByLocalPlate(businessReportInfoRequest.getThirdId()) :
                 statisticsByOtherPlate(businessReportInfoRequest);
     }
@@ -526,12 +537,8 @@
 
     //从第三方获取标签统计结果
     public List<CommonRequest> statisticsByOtherTag(BusinessReportInfoRequest request) {
-        List<CommonRequest> commonRequestList = iCmdBodyTagService.statisticsByTag(request);
-        commonRequestList.forEach(commonRequest -> {
-            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().length() > 6 ? commonRequest.getName().substring(0, 6) : commonRequest.getName());
-            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ? commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) : commonRequest.getValue());
+        List<CommonRequest> commonRequestList = null!=request.getIsReal()&&request.getIsReal()?iCmdBodyTagService.selectListTen(request):iCmdBodyTagService.statisticsByTag(request);
 
-        });
         return commonRequestList;
     }
 
@@ -623,7 +630,14 @@
             });
             resultList.add(commonResponse);
         });
-        resultList.sort(Comparator.comparing(CommonResponse::getValue).reversed());
+
+        //逆序
+        Collections.sort(resultList, new Comparator<CommonResponse>() {
+            public int compare(CommonResponse o1, CommonResponse o2) {
+                Integer s1 = Integer.valueOf(o1.getValue());
+                Integer s2 = Integer.valueOf(o2.getValue());
+                return s2.compareTo(s1);
+            }});
         return resultList;
     }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
index 62da324..fc24885 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyRoamMapper.xml
@@ -38,7 +38,7 @@
             AND hand_time <![CDATA[  >=  ]]> #{begTime}
         </if>
         <if test="endTime!='' and endTime!=null">
-            AND hand_time <![CDATA[  <=  ]]> #{endTime}
+            AND DATE_FORMAT(hand_time,'%Y-%m-%d %H:%i:%s') <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id,DATE_FORMAT(hand_time,'%Y-%m-%d')
         ORDER BY `links` DESC
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
index 9b8a5da..e9271f9 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/CmdBodyTagMapper.xml
@@ -17,7 +17,7 @@
 
     <select id="statisticsByTag" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -33,12 +33,13 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
     </select>
 
     <select id="statisticsByTagTen" resultType="com.casic.missiles.modular.system.dto.CommonRequest">
 
-        SELECT
+        select t.tag_name as `name`, IFNULL(a.value,0) as `value` from cmd_body_tag t left join (SELECT
         SUM( CASE WHEN body_remark IS NULL THEN 1 WHEN body_remark = 0 THEN 1 WHEN body_remark = '' THEN 1 ELSE body_remark END ) AS `value`,
         ( SELECT GROUP_CONCAT( tag_name ) FROM cmd_body_tag tag WHERE FIND_IN_SET( tag.tag_id, c.tag_id ) > 0 ) AS `name`
         FROM
@@ -54,7 +55,8 @@
             AND body.hand_time <![CDATA[  <=  ]]> #{endTime}
         </if>
         GROUP BY c.tag_id
-        ORDER BY value DESC
+        ORDER BY value DESC) a on t.tag_name=a.name
+        where t.hide=1
         limit 10
 
     </select>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
index b9ca4ad..2238a9d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/RealtimeWork.java
@@ -132,13 +132,15 @@
     }
 
     public RealtimeWork(Integer reportedCount, Integer firstJudgmentCount, Integer secondLeaderCount,
-                        Integer firstLeaderCount, Integer sendCount, Integer feedbackCount) {
+                        Integer firstLeaderCount, Integer sendCount, Integer feedbackCount,String startTime,String endTime) {
         this.reportedCount = reportedCount;
         this.firstJudgmentCount = firstJudgmentCount;
         this.secondLeaderCount = secondLeaderCount;
         this.firstLeaderCount = firstLeaderCount;
         this.sendCount = sendCount;
         this.feedbackCount = feedbackCount;
+        this.startTime=startTime;
+        this.endTime=endTime;
     }
 
     @Override
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
index cbd5751..1d9ca80 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/CmdBodyTagServiceImpl.java
@@ -50,6 +50,8 @@
             commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
                     commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
                     commonRequest.getValue());
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().length() > 10 ? commonRequest.getName().substring(0, 10) : commonRequest.getName());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
         });
         return commonRequestList;
     }
@@ -57,6 +59,17 @@
 
     @Override
     public List<CommonRequest> statisticsByTag(String begTime, String endTime) {
-        return  this.baseMapper.statisticsByTag(begTime, endTime);
+
+        List<CommonRequest> commonRequestList =  this.baseMapper.statisticsByTag(begTime, endTime);
+        commonRequestList.forEach(commonRequest -> {
+            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().contains(",") ?
+                    commonRequest.getName().substring(0, commonRequest.getName().indexOf(",")) : commonRequest.getName());
+
+            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ?
+                    commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) :
+                    commonRequest.getValue());
+            if(ObjectUtil.isEmpty(commonRequest.getName())) commonRequest.setName("其他");
+        });
+        return  commonRequestList;
     }
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
index afea624..3706d4d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/JudgmentServiceImpl.java
@@ -136,12 +136,17 @@
                 if (ObjectUtil.isNotEmpty(tagResponse.getRoamTime()) && DateUtil.isSameDay(tagResponse.getRoamTime(), dateTime)) {
                     if (ObjectUtil.isNotEmpty(tagResponse.getTagId())) {
                         String tagId = tagResponse.getTagId();
-                        if (firstTags.contains(tagId)) {
-                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
-                        } else if (secondTags.contains(tagId)) {
-                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
-                        } else if (thirdTags.contains(tagId)) {
-                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue());
+                        int count1 =Collections.frequency(firstTags, tagId);
+                        if (count1>0) {
+                            firstMap.put("value", Integer.valueOf(firstMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue()*count1);
+                        }
+                        int count2 =Collections.frequency(secondTags, tagId);
+                        if (count2>0) {
+                            secondMap.put("value", Integer.valueOf(secondMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue()*count2);
+                        }
+                        int count3 =Collections.frequency(thirdTags, tagId);
+                        if (count3>0) {
+                            thirdMap.put("value", Integer.valueOf(thirdMap.get("value") + "").intValue() + Double.valueOf(tagResponse.getLinks()).intValue()*count3);
                         }
                     }
                 }
@@ -431,6 +436,19 @@
                 }
             }
         }
+
+        for(CommonRequest commonRequest:list){
+            //特殊处理
+            if("其他".equals(commonRequest.getName())){
+                int count=0;
+                for(CommonRequest commonRequest1:commonRequestList){
+                    if(ObjectUtil.isEmpty(commonRequest1.getName())){
+                        count = count+ Float.valueOf(commonRequest1.getValue()).intValue();
+                    }
+                }
+                commonRequest.setValue(count+"");
+            }
+        }
         return list;
     }
 
@@ -660,6 +678,15 @@
                 return apiMap;
             }).collect(Collectors.toList());
         }
+
+
+        //逆序
+        Collections.sort(resultList, new Comparator<Map<String, Object>>() {
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                Long s1 = Long.valueOf( o1.get("value").toString());
+                Long s2 = Long.valueOf( o2.get("value").toString());
+                return s2.compareTo(s1);
+            }});
         return resultList;
     }
 
@@ -676,7 +703,7 @@
             for(CommonRequest commonRequest:list){
                 commonRequest.setValue("0");
                 String time = commonRequest.getTime();
-                if(ObjectUtil.isNotEmpty(time)){
+                if(ObjectUtil.isNotEmpty(time)&&(!"[]".equals(time))){
                     List<String> timeList = JSONObject.parseArray(time,String.class);
                     for(String timeStr:timeList){
                        for(CommonRequest commonRequest1:commonRequestList){
@@ -721,8 +748,6 @@
     @Override
     public List<Map<String, Object>> statisticsByTag(JudgmentRequest judgmentRequest) {
 
-
-
         return  iBusinessAccessService.getAccessStatus("2-bq") &&
                 (ToolUtils.pageArr[1] == judgmentRequest.getPage()) &&
                 (!(judgmentRequest.getIsReal() != null && judgmentRequest.getIsReal())) ?
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
index 9e92bed..135f53b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
@@ -196,7 +196,8 @@
             }
         }
 
-        return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount);
+        return new RealtimeWork(reportedCount, firstJudgmentCount, secondLeaderCount, firstLeaderCount, sendCount, feedbackCount,businessReportInfoRequest.getBeginTime(),
+                businessReportInfoRequest.getEndTime());
 
     }
 
@@ -399,13 +400,23 @@
         });
         resultMapList.add(resultMap);
         resultMapList.removeIf(objMap->Long.valueOf(objMap.get("value").toString()).intValue()==0);
+
+
+        //逆序
+        Collections.sort(resultMapList, new Comparator<Map<String, Object>>() {
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                Long s1 = (Long) o1.get("value");
+                Long s2 = (Long) o2.get("value");
+                return s2.compareTo(s1);
+            }});
         return resultMapList;
     }
 
     @Override
     public List<HashMap<String, Object>> statisticsByPlate(BusinessReportInfoRequest businessReportInfoRequest) {
         return iBusinessAccessService.getAccessStatus("3-pt") &&
-                (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())
+                (ToolUtils.pageArr[2] == businessReportInfoRequest.getPage())&&
+                (!(businessReportInfoRequest.getIsReal() != null && businessReportInfoRequest.getIsReal()))
                 ? statisticsByLocalPlate(businessReportInfoRequest.getThirdId()) :
                 statisticsByOtherPlate(businessReportInfoRequest);
     }
@@ -526,12 +537,8 @@
 
     //从第三方获取标签统计结果
     public List<CommonRequest> statisticsByOtherTag(BusinessReportInfoRequest request) {
-        List<CommonRequest> commonRequestList = iCmdBodyTagService.statisticsByTag(request);
-        commonRequestList.forEach(commonRequest -> {
-            commonRequest.setName(ObjectUtil.isNotEmpty(commonRequest.getName()) && commonRequest.getName().length() > 6 ? commonRequest.getName().substring(0, 6) : commonRequest.getName());
-            commonRequest.setValue(ObjectUtil.isNotEmpty(commonRequest.getValue()) && commonRequest.getValue().contains(".") ? commonRequest.getValue().substring(0, commonRequest.getValue().indexOf(".")) : commonRequest.getValue());
+        List<CommonRequest> commonRequestList = null!=request.getIsReal()&&request.getIsReal()?iCmdBodyTagService.selectListTen(request):iCmdBodyTagService.statisticsByTag(request);
 
-        });
         return commonRequestList;
     }
 
@@ -623,7 +630,14 @@
             });
             resultList.add(commonResponse);
         });
-        resultList.sort(Comparator.comparing(CommonResponse::getValue).reversed());
+
+        //逆序
+        Collections.sort(resultList, new Comparator<CommonResponse>() {
+            public int compare(CommonResponse o1, CommonResponse o2) {
+                Integer s1 = Integer.valueOf(o1.getValue());
+                Integer s2 = Integer.valueOf(o2.getValue());
+                return s2.compareTo(s1);
+            }});
         return resultList;
     }
 
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index bd63375..c9b4018 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,8 @@
 spring:
   datasource:
     driver-class-name: dm.jdbc.driver.DmDriver
-    url: jdbc:dm://127.0.0.1:5236/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+#    url: jdbc:dm://127.0.0.1:5236/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:dm://111.198.10.15:11211/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
     username: CASIC_XINJIANG
     password: Casic203!
     dynamic:
@@ -12,7 +13,7 @@
       strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
       datasource:
         master:
-          url: jdbc:dm://127.0.0.1:5236/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+          url: jdbc:dm://111.198.10.15:11211/CASIC_XINJIANG?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
           driver-class-name: dm.jdbc.driver.DmDriver
           username: CASIC_XINJIANG
           password: Casic203!