diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
index b964a63..befa182 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
@@ -736,7 +736,7 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
                     vo.setLineName(lineMap.get(item.getLineId()).getName());
                 }
                 if (!Objects.isNull(item.getDeviceId())) {
-                    vo.setDeviceName(devMap.get(item.getDeviceId()).get(0).getName());
+                    vo.setDeviceName(devMap.get(item.getDeviceId()).get(0).getDeviceName());
                 }
                 vo.setEvent(item.getTag());
                 voRecords.add(vo);
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
index 9ca9347..341721c 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
@@ -154,7 +154,7 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
                                             BigDecimal.valueOf(l1.stream().mapToDouble(RStatIntegrityD::getDueTime).sum()),
                                             2, RoundingMode.HALF_UP
                                     ).doubleValue();
-                                    vo.setIntegrity(Math.max(ratio,100.0));
+                                    vo.setIntegrity(Math.min(ratio,100.0));
                                 } else {
                                     vo.setIntegrity(0.0);
                                 }
@@ -163,7 +163,7 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
                                 if (CollectionUtil.isNotEmpty(l2)) {
                                     int onlineMin = l2.stream().mapToInt(RStatOnlineRateD::getOnlineMin).sum();
                                     double ratio = new BigDecimal(onlineMin * 100.0 / (1440 * l2.size())).setScale(2,RoundingMode.HALF_UP).doubleValue();
-                                    vo.setOnlineRate(Math.max(ratio,100.0));
+                                    vo.setOnlineRate(Math.min(ratio,100.0));
                                 } else {
                                     vo.setOnlineRate(0.0);
                                 }