diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java
index dcd8a35d..e4a98920 100644
--- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java
+++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java
@@ -1,10 +1,12 @@
 package com.njcn.gather.event.transientes.pojo.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * Description:
@@ -43,4 +45,5 @@ public class EventDetailVO {
     private String objName;
 
     private Integer needDealFlag;
+    private List<MsgEventInfo> msgEventInfoList;
 }
diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
index 1aae5be4..c18f8fb5 100644
--- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
+++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
@@ -246,12 +246,12 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         alarmAnalysisVO.setLookNoticeCount(lookNoticeCount);
 
 
-        alarmAnalysisVO.setEventdetails(change(eventdetails));
-        alarmAnalysisVO.setALarmEvent(change(aLarmEvent));
-        alarmAnalysisVO.setWarnEvent(change(warnEvent));
+        alarmAnalysisVO.setEventdetails(change(eventdetails,handleMsg));
+        alarmAnalysisVO.setALarmEvent(change(aLarmEvent,handleMsg));
+        alarmAnalysisVO.setWarnEvent(change(warnEvent,handleMsg));
         alarmAnalysisVO.setNoticeEvent(msgEventInfoList);
-        alarmAnalysisVO.setLookALarmEvent(change(lookALarmEvent));
-        alarmAnalysisVO.setLookWarnEvent(change(lookWarnEvent));
+        alarmAnalysisVO.setLookALarmEvent(change(lookALarmEvent,handleMsg));
+        alarmAnalysisVO.setLookWarnEvent(change(lookWarnEvent,handleMsg));
         alarmAnalysisVO.setLookNoticeEvent(handleMsg);
 
 
@@ -428,6 +428,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         }
 
 
+
         IPage<PqsEventdetail> list = pqsEventdetailService.getBaseMapper().selectPage(pqsEventdetailPage,queryWrapper);
         List<Integer> finalNoticeLineIds = noticeLineIds;
         List<EventDetailVO> collect = list.getRecords().stream().map(temp -> {
@@ -596,15 +597,15 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
                     .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType())
                     .in(PqsEventdetail::getLineid, deptslineIds).list();
             mapCountVO.setEventCount(eventdetails.size());
-            List<EventDetailVO> change = change(eventdetails);
 
-            mapCountVO.setEventList(change);
             List<String> eveIdndex = eventdetails.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList());
             List<MsgEventInfo> temp = new ArrayList<>();
             if(!CollectionUtils.isEmpty(eveIdndex)){
                 temp = msgEventInfoService.lambdaQuery().in(MsgEventInfo::getEventIndex,eveIdndex).list();
             }
+            List<EventDetailVO> change = change(eventdetails,temp);
 
+            mapCountVO.setEventList(change);
             mapCountVO.setNoticeCount(temp.size());
             mapCountVO.setNoticeList(temp);
             result.add(mapCountVO);
@@ -700,7 +701,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         return true;
     }
 
-    private List<EventDetailVO> change(List<PqsEventdetail> list){
+    private List<EventDetailVO> change(List<PqsEventdetail> list,List<MsgEventInfo> handleMsg){
         List<EventDetailVO> result = new ArrayList<>();
         if(CollectionUtils.isEmpty(list)){
             return result;
@@ -720,6 +721,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
             eventDetailVO.setEventvalue(temp.getEventvalue());
             eventDetailVO.setLookFlag(temp.getLookFlag());
             eventDetailVO.setNoticeFlag(temp.getNoticeFlag());
+             eventDetailVO.setMsgEventInfoList(handleMsg.stream().filter(msg->Objects.equals(msg.getEventIndex(),temp.getEventdetailIndex())).collect(Collectors.toList()));
             if(ledgerBaseInfoDTOMap.containsKey(temp.getLineid())){
                 LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(temp.getLineid());
                 eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId());