diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/PqSensitiveUserVo.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/PqSensitiveUserVo.java
index b54d5b5..17b6358 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/PqSensitiveUserVo.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/PqSensitiveUserVo.java
@@ -46,4 +46,19 @@ public class PqSensitiveUserVo implements Serializable{
      * 是否治理
      */
     private String isGovern;
+
+    /**
+     * 用户协议容量
+     */
+    private Double userAgreementCapacity;
+
+    /**
+     * 装机容量
+     */
+    private Double installedCapacity;
+
+    /**
+     * 所属厂站名称
+     */
+    private String substationName;
 }
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java
index 7d15f8d..c888d77 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java
@@ -7,6 +7,7 @@ import cn.hutool.core.date.TimeInterval;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.*;
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -343,13 +344,13 @@ public class CustomReportServiceImpl implements CustomReportService {
                                     if (afterData != null && beforeData != null) {
                                         String beforeDataValue = beforeData.getValue();
                                         String afterDataValue = afterData.getValue();
-                                        if (StrUtil.isNotEmpty(beforeDataValue) && StrUtil.isNotEmpty(afterDataValue)) {
+                                        if (NumberUtil.isNumber(beforeDataValue) && NumberUtil.isNumber(afterDataValue)) {
                                             // (治理前 - 治理后) / 治理前 * 100
-                                            BigDecimal before = new BigDecimal(beforeData.getValue());
+                                            BigDecimal before = new BigDecimal(beforeDataValue);
                                             if (before.compareTo(BigDecimal.ZERO) == 0) {
                                                 value = "0.00";
                                             } else {
-                                                BigDecimal after = new BigDecimal(afterData.getValue());
+                                                BigDecimal after = new BigDecimal(afterDataValue);
                                                 BigDecimal result = before.subtract(after)
                                                         .divide(before, 4, RoundingMode.HALF_UP)
                                                         .multiply(BigDecimal.valueOf(100))
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/PqSensitiveUserServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/PqSensitiveUserServiceImpl.java
index afc35a1..c27800c 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/PqSensitiveUserServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/PqSensitiveUserServiceImpl.java
@@ -92,8 +92,7 @@ public class PqSensitiveUserServiceImpl extends ServiceImpl<PqSensitiveUserMappe
 
         PqSensitiveUser pqSensitiveUser = new PqSensitiveUser();
         BeanUtil.copyProperties(pqSensitiveUserParam,pqSensitiveUser);
-        this.save(pqSensitiveUser);
-        return true;
+        return this.save(pqSensitiveUser);
     }
 
     @Override
@@ -101,8 +100,7 @@ public class PqSensitiveUserServiceImpl extends ServiceImpl<PqSensitiveUserMappe
         checkParam(pqSensitiveUserParam,true);
         PqSensitiveUser pqSensitiveUser = new PqSensitiveUser();
         BeanUtil.copyProperties(pqSensitiveUserParam,pqSensitiveUser);
-        this.save(pqSensitiveUser);
-        return true;
+        return this.updateById(pqSensitiveUser);
     }
 
 
@@ -116,7 +114,7 @@ public class PqSensitiveUserServiceImpl extends ServiceImpl<PqSensitiveUserMappe
         lambdaQueryWrapper.eq(PqSensitiveUser::getName,param.getName());
         if(update){
             if(param instanceof PqSensitiveUserParam.UpdatePqSensitiveUserParam){
-                lambdaQueryWrapper.ne(PqSensitiveUser::getId,param);
+                lambdaQueryWrapper.ne(PqSensitiveUser::getId,((PqSensitiveUserParam.UpdatePqSensitiveUserParam) param).getId());
             }
         }
         int count = this.count(lambdaQueryWrapper);