diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsLineWeightController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsLineWeightController.java
index 88aa2a61f..ee1808f07 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsLineWeightController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsLineWeightController.java
@@ -70,7 +70,7 @@ public class PqsLineWeightController extends BaseController {
     @PostMapping(value = "/batchWeight")
     @ApiOperation("批量导入监测点评分权重")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
-    public HttpResult<String> batchTerminal(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
+    public HttpResult<String> batchWeight(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("batchWeight");
         iPqsLineWeightService.batchWeight(file, response);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTransformerController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTransformerController.java
index eac69f4ae..451120615 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTransformerController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTransformerController.java
@@ -108,7 +108,7 @@ public class PqsTransformerController extends BaseController {
     @GetMapping("/getTransformerTree")
     @ApiOperation(value = "获取变压器台账")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    public HttpResult<List<TerminalTree>> getTerminalTree() {
+    public HttpResult<List<TerminalTree>> getTransformerTree() {
         String methodDescribe = getMethodDescribe("getTransformerTree");
         List<TerminalTree> terminalTree = iPqsTransformerService.getTransformerTree();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, terminalTree, methodDescribe);
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 bfd447fac..7225ef669 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
@@ -811,7 +811,10 @@ public class HistoryResultServiceImpl implements HistoryResultService {
             if (Integer.parseInt(normHistoryParam.getTargetCode()) != 60 || Integer.parseInt(normHistoryParam.getTargetCode()) != 61 || Integer.parseInt(normHistoryParam.getTargetCode()) != 62) {
                 stringBuilder.append(" and ").append(InfluxDBTableConstant.VALUE_TYPE + "='").append(valueTypeName).append("'");
             }
-            stringBuilder.append(" and ").append("phasic_type ='").append(phasicType).append("'");
+            if(StrUtil.isNotBlank(phasicType)){
+                stringBuilder.append(" and ").append("phasic_type ='").append(phasicType).append("'");
+
+            }
             String sql = "";
             List<String> unit = new ArrayList<>();
             Integer number = normHistoryParam.getNumber();