diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java
index b3f670d..bb82e3b 100644
--- a/src/main/java/com/whdc/controller/QXWarnController.java
+++ b/src/main/java/com/whdc/controller/QXWarnController.java
@@ -28,6 +28,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -715,14 +717,22 @@ public class QXWarnController {
         return zerofill(year)+"-"+zerofill(month)+"-"+zerofill(day)+" "+
                 "00"+":"+"00"+":"+"00";
     }
+    //统计函数
     private int getCount2(List<WarningData> data){
         int sum = 0;
+        DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         List<WarningData.Warning> warnList = Lists.newArrayList();//汇总
         for (WarningData datum : data) {
             for (WarningData.TypeList typeList : datum.getTypeList()) {
                 warnList.addAll(typeList.getWarnList());
             }
         }
+        warnList = warnList.stream().filter(o -> {
+            LocalDate date = LocalDate.parse(o.getPublishTime(), format);
+            return date.isAfter(LocalDate.parse("2024-04-28 08:00:00", format));
+        }).collect(Collectors.toList());
+        warnList = warnList.stream().filter(o -> "暴雨".equals(o.getWarnSignalType())||"雷雨大风".equals(o.getWarnSignalType())).collect(Collectors.toList());
+        warnList = warnList.stream().filter(o -> "红色".equals(o.getWarnSignalLevel())||"橙色".equals(o.getWarnSignalLevel())).collect(Collectors.toList());
         return warnList.size();
     }
 }