diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java
index 56912aa..ed18a0d 100644
--- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java
+++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java
@@ -314,8 +314,10 @@
                         .multiply(BigDecimal.valueOf(100))
                         .setScale(2, RoundingMode.HALF_UP);
                 warnMonthAlarmsResponse.setDeviceCountProportion(percentage.doubleValue());
+
             }
-            warnMonthAlarmsResponse.setWarnDeviceCount(countDay);
+                warnMonthAlarmsResponse.setWarnDeviceCount(WarncountDay);
+
 
         return  warnMonthAlarmsResponse;
     }

diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java
index 56912aa..ed18a0d 100644
--- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java
+++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java
@@ -314,8 +314,10 @@
                         .multiply(BigDecimal.valueOf(100))
                         .setScale(2, RoundingMode.HALF_UP);
                 warnMonthAlarmsResponse.setDeviceCountProportion(percentage.doubleValue());
+
             }
-            warnMonthAlarmsResponse.setWarnDeviceCount(countDay);
+                warnMonthAlarmsResponse.setWarnDeviceCount(WarncountDay);
+
 
         return  warnMonthAlarmsResponse;
     }
diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml
index f8c78f0..0b7b71d 100644
--- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml
+++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml
@@ -105,7 +105,7 @@
                  location
             ) AS di_min
                 INNER JOIN
-            ter_monitoring_warn_record dm ON di_min.sn = dm.sn AND dm.date >= di_min.dailyFirstWarnDatetime
+            ter_monitoring_warn_record dm ON di_min.sn = dm.sn
         GROUP BY
             di_min.sn,
             di_min.location,

diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java
index 56912aa..ed18a0d 100644
--- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java
+++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/StatisticsServiceImpl.java
@@ -314,8 +314,10 @@
                         .multiply(BigDecimal.valueOf(100))
                         .setScale(2, RoundingMode.HALF_UP);
                 warnMonthAlarmsResponse.setDeviceCountProportion(percentage.doubleValue());
+
             }
-            warnMonthAlarmsResponse.setWarnDeviceCount(countDay);
+                warnMonthAlarmsResponse.setWarnDeviceCount(WarncountDay);
+
 
         return  warnMonthAlarmsResponse;
     }
diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml
index f8c78f0..0b7b71d 100644
--- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml
+++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/DeviceMonitoringDataMapper.xml
@@ -105,7 +105,7 @@
                  location
             ) AS di_min
                 INNER JOIN
-            ter_monitoring_warn_record dm ON di_min.sn = dm.sn AND dm.date >= di_min.dailyFirstWarnDatetime
+            ter_monitoring_warn_record dm ON di_min.sn = dm.sn
         GROUP BY
             di_min.sn,
             di_min.location,
diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml
index ebf7069..1dc9ba6 100644
--- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml
+++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/MonitoringWarnRecordMapper.xml
@@ -103,7 +103,7 @@
 
 
     <select id="selectListTotal" resultType="com.newfiber.termite.domain.response.statistic.MonitoringWarnResponseStatistics">
-        select tpi.project_code AS projectCode, COUNT(*) AS warnCount
+        select tpi.project_code AS projectCode, COUNT(DISTINCT t.sn) AS warnCount
         from ter_monitoring_warn_record t
         <include refid="Join_Table"/>
         where t.del_flag = 0