diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataServiceImpl.java
index b3290f472..7b50c721b 100644
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataServiceImpl.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/responsibility/impl/RespDataServiceImpl.java
@@ -153,7 +153,11 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
         int lineInterval = pNumAndInterval.getLineInterval();
         //第三个参数win,根据起始时间和截止时间的间隔
         if (dateStr.size() > 1) {
-            win = 96;
+            if(userIntervalTime == 15){
+                win = 96;
+            }else{
+                win = 48;
+            }
         } else {
             win = 4;
         }
@@ -171,7 +175,7 @@ public class RespDataServiceImpl extends ServiceImpl<RespDataMapper, RespData> i
         Set<String> userNamesFinal = finalData.keySet();
         for (String userName : userNamesFinal) {
             List<UserDataExcel> tempData = new ArrayList<>();
-            //根据日期将日期数据全部获取出来
+            //根据日期将日期数据全部获取出来z
             Map<String, List<UserDataExcel>> tempResult = finalData.get(userName);
             for (String date : dateStr) {
                 tempData.addAll(tempResult.get(date));
diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/ResponsibilityAlgorithm.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/ResponsibilityAlgorithm.java
index 9f7d0d05a..3ef037501 100644
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/ResponsibilityAlgorithm.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/ResponsibilityAlgorithm.java
@@ -383,10 +383,11 @@ public class ResponsibilityAlgorithm {
 //            System.out.printf("窗宽超限...\r\n");
             throw new BusinessException(AdvanceResponseEnum.EVENT_DATA_MISS);
         }
-//        if (TL < (2 * wdith)) {
-//            System.out.printf("窗宽和数据长度不匹配...\r\n");
-//            return -1;
-//        }
+
+        if (TL < (2 * wdith)) {
+            System.out.printf("窗宽和数据长度不匹配...\r\n");
+            return -1;
+        }
 
         if ((P > QvvrDataEntity.MAX_P_NODE) || (TL > QvvrDataEntity.MAX_P_NUM) || (LL > QvvrDataEntity.MAX_HARM_NUM)) {
             System.out.printf("数据长度超限...\r\n");
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
index 743c69672..fd748a580 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
@@ -1200,6 +1200,7 @@ public class HistoryResultServiceImpl implements HistoryResultService {
             //如果数据为空，则提示给用户暂无数据
             throw new BusinessException(HarmonicResponseEnum.NO_DATA);
         }
+        historyData = historyData.stream().filter(Objects::nonNull).collect(Collectors.toList());
         int lineInterval = getInterval(lineDetailData.getInterval(), PubUtils.instantToDate(historyData.get(historyData.size() - 1).getTime()), PubUtils.instantToDate(historyData.get(historyData.size() - 2).getTime()));
         //最新两条数据的间隔与监测点查出的间隔做对比，返回一个合理的间隔
         historyData = dealHistoryData(historyData, lineInterval);