diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java
index c2fa663e7..972606801 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java
@@ -27,4 +27,10 @@ public class MonitoringPointScaleParam {
     @ApiModelProperty("监测点个数")
     private int count;
 
+    /**
+     * 次数
+     */
+    @ApiModelProperty("次数")
+    private int size;
+
 }
diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/BaseVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/BaseVO.java
index d12926f96..e5b00ee94 100644
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/BaseVO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/BaseVO.java
@@ -22,4 +22,8 @@ public class BaseVO {
      */
     @ApiModelProperty("综合评估")
     private String data;
+
+    private int count;
+
+    private int size;
 }
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
index 3e66e06f0..9f9c113b9 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
@@ -12,10 +12,10 @@
             #{item}
         </foreach>
         <if test="startTime != null and startTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
         </if>
         <if test="endTime != null and endTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
         </if>
     </select>
 
@@ -30,26 +30,26 @@
             #{item}
         </foreach>
         <if test="startTime != null and startTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
         </if>
         <if test="endTime != null and endTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
         </if>
         group by ed.measurement_point_id
     </select>
 
     <select id="getTimeCount" resultType="java.util.Map">
         select
-        date(ed.create_time) "day", count(*) "count"
+        date(ed.start_time) "day", count(*) "count"
         from r_mp_event_detail ed where ed.measurement_point_id in
         <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
         <if test="startTime != null and startTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
         </if>
         <if test="endTime != null and endTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
         </if>
         group by day
     </select>
@@ -81,16 +81,16 @@
             #{item}
         </foreach>
         <if test="startTime != null and startTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
         </if>
         <if test="endTime != null and endTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
         </if>
     </select>
 
     <select id="getMiddleDown" resultType="com.njcn.device.pq.pojo.vo.EventVO">
         SELECT
-        ed.create_time  "time",
+        ed.start_time  "time",
         pl.`Name` "name",
         ed.advance_reason reason,
         ed.advance_type "type",
@@ -104,12 +104,12 @@
             #{item}
         </foreach>
         <if test="startTime != null and startTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
         </if>
         <if test="endTime != null and endTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
         </if>
-        order by ed.create_time desc
+        order by ed.start_time desc
     </select>
 
     <select id="getMiddleTerminal" resultType="com.njcn.device.pq.pojo.vo.MiddleChildVO">
@@ -255,7 +255,7 @@
 
     <select id="getMiddleDownChind" resultType="com.njcn.device.pq.pojo.vo.EventVO">
         SELECT
-        ed.create_time  "time",
+        ed.start_time  "time",
                pl.`Name` "name",
                ed.advance_reason reason,
                ed.advance_type "type",
@@ -269,12 +269,12 @@
             #{item}
         </foreach>
         <if test="startTime != null and startTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
         </if>
         <if test="endTime != null and endTime != ''">
-            and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
         </if>
-        order by ed.create_time desc
+        order by ed.start_time desc
     </select>
 
     <select id="getMiddleLimitRateChild" resultType="com.njcn.device.pq.pojo.vo.MiddleLimitRateVO">
@@ -347,15 +347,15 @@
 
     <select id="eventLists" resultType="com.njcn.device.pq.pojo.vo.EventVO">
             SELECT
-            ed.create_time  "time",pl.`Name` "name",ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration
+            ed.start_time  "time",pl.`Name` "name",ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration
             from r_mp_event_detail ed
             left join pq_line pl on pl.id = ed.measurement_point_id
             <where>
                 <if test="startTime != null and startTime != ''">
-                    and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+                    and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
                 </if>
                 <if test="endTime != null and endTime != ''">
-                    and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+                    and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
                 </if>
             </where>
             order by time desc
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java
index 4ea4ff7d5..9897d17b0 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java
@@ -190,7 +190,7 @@ public class AreaLineServiceImpl implements AreaLineService {
                     List<String> lineIds = eventdetailList.stream().map(EventHeatDeatilVO::getLineId).collect(Collectors.toList());
                     List<AreaLineInfoVO> areaAnalysisVOList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData();
 
-                    for (EventHeatDeatilVO eventHeat : eventdetailList) {
+                  /*  for (EventHeatDeatilVO eventHeat : eventdetailList) {
                         for (AreaLineInfoVO areaLineInfoVO : areaAnalysisVOList) {
                             if (eventHeat.getLineId().equals(areaLineInfoVO.getLineId())) {
                                 List<AreaLineInfoVO> ev = new ArrayList<>();
@@ -201,6 +201,16 @@ public class AreaLineServiceImpl implements AreaLineService {
                                 break;
                             }
                         }
+                    }*/
+                    for (AreaLineInfoVO areaLineInfoVO : areaAnalysisVOList) {
+                        List<AreaLineInfoVO> ev = new ArrayList<>();
+                        long count = eventdetailList.stream()
+                                .filter(obj -> obj.getLineId().equals( areaLineInfoVO.getLineId()))
+                                .count();
+                        int c = (int) count;
+                        areaLineInfoVO.setTail(c);
+                        ev.add(areaLineInfoVO);
+                        eventHeatMapDetailList.add(ev);
                     }
                     //获取综合评估
                     List<PQSComAssesPO> comAccessData = largeScreenService.getComAccessData(lineIndexs, deviceInfoParam.getSearchBeginTime(), deviceInfoParam.getSearchEndTime());
@@ -211,6 +221,8 @@ public class AreaLineServiceImpl implements AreaLineService {
                     baseVO.setName(generalDeviceDTO.getName());
                     baseVO.setValue(BigDecimal.valueOf(lineIndexs.size()));
                     baseVO.setData(String.valueOf(allComAss));
+                    baseVO.setCount(eventdetailList.size());
+                    baseVO.setSize(lineIndexs.size());
                     listObject.add(baseVO);
                 }
             } else {
@@ -218,6 +230,8 @@ public class AreaLineServiceImpl implements AreaLineService {
                 baseVO.setName(generalDeviceDTO.getName());
                 baseVO.setValue(BigDecimal.valueOf(3.141592));
                 baseVO.setData("-1");
+                baseVO.setCount(0);
+                baseVO.setSize(0);
                 listObject.add(baseVO);
             }
             i++;
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
index d8430d74f..876ad2a20 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
@@ -76,6 +76,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
                 param.setName(generalDeviceDTO.getName());
                 param.setIndex(generalDeviceDTO.getIndex());
                 param.setCount(0);
+                param.setSize(0);
                 list.add(param);
             } else {
                 Map<String, Object> map = largeScreenMapper.selectDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
@@ -85,6 +86,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
                 String s = map.get("count").toString();
                 int count = Integer.parseInt(s);
                 param.setCount(count);
+                param.setSize(generalDeviceDTO.getLineIndexes().size());
                 list.add(param);
             }
         }