diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java
index 7b8682149..7ccb35dca 100644
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java
@@ -47,4 +47,7 @@ public class DeptGetLineParam {
     @ApiModelProperty("监测点运行状态")
     @Range(min = 0, max = 2, message = "监测点运行状态" + ValidMessage.PARAM_FORMAT_ERROR)
     private Integer lineRunFlag;
+
+    @ApiModelProperty("搜索值")
+    private String searchValue;
 }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
index 1c31fcb66..3781700f7 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
@@ -264,7 +264,11 @@ public class CommTerminalServiceImpl implements CommTerminalService {
     public List<DeptGetSubStationDTO.Info> deptSubStationInfo(DeptGetLineParam deptGetLineParam) {
         List<DeptGetSubStationDTO.Info> result = new ArrayList<>();
         List<DeptGetBase> temDept = getDeptChildrenByParent(deptGetLineParam);
-        List<TerminalGetBase.Extend> anExtends = deptLineService.orgSubStationInfoGet(filterDataTypeNew(deptGetLineParam.getServerName()), deptGetLineParam.getPowerFlag(), deptGetLineParam.getLineRunFlag(), deptGetLineParam.getIsUpToGrid());
+        List<TerminalGetBase.Extend> anExtends = deptLineService.orgSubStationInfoGet(filterDataTypeNew(deptGetLineParam.getServerName()),
+                                                                                        deptGetLineParam.getPowerFlag(),
+                                                                                        deptGetLineParam.getLineRunFlag(),
+                                                                                        deptGetLineParam.getIsUpToGrid(),
+                                                                                        deptGetLineParam.getSearchValue());
         Map<String, List<TerminalGetBase.Extend>> orgSub = anExtends.stream().collect(Collectors.groupingBy(TerminalGetBase::getUnitId));
         Map<String, String> deptNameMap = temDept.stream().collect(Collectors.toMap(DeptGetBase::getUnitId, DeptGetBase::getUnitName));
         temDept.forEach(item -> {
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java
index 136a3f8e5..d0d566c25 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java
@@ -350,8 +350,10 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
         Map<String, String> deptMap = deptList.stream().collect(Collectors.toMap(Dept::getId, Dept::getName));
 
         List<DeviceRunEvaluateVO.Detail> info = new ArrayList<>();
+        List<Integer> devRun=ObjectUtil.isNull(param.getLineRunFlag()) ? null : Arrays.asList(param.getLineRunFlag());
+        param.setLineRunFlag(null);
         //获取终端台账类信息
-        List<GeneralDeviceDTO> deviceInfo = deviceService.getDeviceInfo(param, ObjectUtil.isNull(param.getLineRunFlag()) ? null : Arrays.asList(param.getLineRunFlag()), Arrays.asList(1));
+        List<GeneralDeviceDTO> deviceInfo = deviceService.getDeviceInfo(param, devRun, Arrays.asList(1));
         if (CollUtil.isNotEmpty(deviceInfo)) {
             List<String> deviceIds = deviceInfo.stream()
                     .flatMap(x -> x.getDeviceIndexes().stream()).collect(Collectors.toList())
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
index 26fcbbf23..696771e3c 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
@@ -82,7 +82,7 @@ public class RunManageServiceImpl implements RunManageService {
             DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
             BeanUtil.copyProperties(runManageParam, deviceInfoParam);
             deviceInfoParam.setServerName("pqs-common");
-            List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0,1,2).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
+            List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, null, Stream.of(1).collect(Collectors.toList()));
             lineIndexes = generalDeviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList());
         }
         if (!CollectionUtils.isEmpty(lineIndexes)) {
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml
index caec3a7c7..cb521390f 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml
@@ -339,10 +339,10 @@
         </if>
         <if test="searchValue != '' and searchValue != null ">
             <bind name="searchValueLike" value="'%'+searchValue+'%'"/>
-            AND sub.NAME LIKE #{searchValueLike}
+            AND (sub.NAME LIKE #{searchValueLike}
             OR dev.NAME LIKE #{searchValueLike}
             OR devT.Name LIKE #{searchValueLike}
-            OR device.IP LIKE #{searchValueLike}
+            OR device.IP LIKE #{searchValueLike})
         </if>
         ORDER BY
         gdName,
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/OnLineRateServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/OnLineRateServiceImpl.java
index dc3dbbe59..5627e57c7 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/OnLineRateServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/service/impl/OnLineRateServiceImpl.java
@@ -36,8 +36,10 @@ public class OnLineRateServiceImpl extends ServiceImpl<OnLineRateMapper, RStatOn
     @Override
     public DeviceOnlineRate deviceOnlineRateInfo(DeviceInfoParam.BusinessParam param) {
         DeviceOnlineRate rate = new DeviceOnlineRate();
+        List<Integer> devRun = ObjectUtil.isNull(param.getLineRunFlag()) ? null : Arrays.asList(param.getLineRunFlag());
+        param.setLineRunFlag(null);
         //获取终端台账类信息
-        List<GeneralDeviceDTO> deviceInfo = deviceService.getDeviceInfo(param, ObjectUtil.isNull(param.getLineRunFlag()) ? null : Arrays.asList(param.getLineRunFlag()), Arrays.asList(1));
+        List<GeneralDeviceDTO> deviceInfo = deviceService.getDeviceInfo(param, devRun, Arrays.asList(1));
         if (CollUtil.isNotEmpty(deviceInfo)) {
             List<String> deviceIds = deviceInfo.stream()
                     .flatMap(x -> x.getDeviceIndexes().stream()).collect(Collectors.toList())
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/DeptLineMapper.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/DeptLineMapper.java
index fe7a50ccb..9a50f5355 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/DeptLineMapper.java
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/DeptLineMapper.java
@@ -81,7 +81,8 @@ public interface DeptLineMapper extends BaseMapper<DeptLine> {
     List<TerminalGetBase.Extend> orgSubStationInfoGet(@Param("list")List<Integer> devType,
                                                       @Param("powerFlag")Integer powerFlag,
                                                       @Param("lineRunFlag") Integer lineRunFlag,
-                                                      @Param("monitorFlag") Integer monitorFlag
+                                                      @Param("monitorFlag") Integer monitorFlag,
+                                                      @Param("searchValue") String searchValue
     );
 
     List<String> getLineIdByDeptIds(@Param("deptIds")List<String> deptIds,
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml
index 85619f42d..e1e2e7bb2 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml
@@ -194,6 +194,12 @@
         <if test="monitorFlag!=null ">
             and lineDetail.Monitor_Flag = #{monitorFlag}
         </if>
+        <if test="searchValue != '' and searchValue != null ">
+            <bind name="searchValueLike" value="'%'+searchValue+'%'"/>
+            AND (substation.name LIKE #{searchValueLike}
+            OR point.NAME LIKE #{searchValueLike}
+            )
+        </if>
     </select>
     <select id="getLineIdByDeptIds" resultType="string">
         select
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
index 50ec84194..1ca1f76d4 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
@@ -294,7 +294,7 @@
                 #{item.id}
             </foreach>
         </if>
-        <if test="deviceInfoParam.searchValue!=null  and deviceInfoParam.lineOrDevice==0">
+        <if test="deviceInfoParam.searchValue!=null and  deviceInfoParam.searchValue!='' and deviceInfoParam.lineOrDevice==0">
             AND t1.name like CONCAT(CONCAT('%', #{deviceInfoParam.searchValue}), '%')
         </if>
         <!-- xy -->
@@ -344,7 +344,7 @@
                     #{item.id}
                 </foreach>
             </if>
-            <if test="deviceInfoParam.searchValue!=null  and deviceInfoParam.lineOrDevice==1">
+            <if test="deviceInfoParam.searchValue!=null and deviceInfoParam.searchValue!='' and deviceInfoParam.lineOrDevice==1">
                 AND t1.name like CONCAT(CONCAT('%', #{deviceInfoParam.searchValue}), '%')
             </if>
             <if test="devIds!=null and devIds.size()!=0">
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/DeptLineService.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/DeptLineService.java
index c846d3ea6..8164d6b22 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/DeptLineService.java
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/DeptLineService.java
@@ -115,7 +115,7 @@ public interface DeptLineService extends IService<DeptLine> {
     Map<String, List<TerminalGetBase>> orgSubStationGet(List<Integer> devType);
 
 
-    List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType,Integer powerFlag,Integer lineRunFlag,Integer monitorFlag);
+    List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType,Integer powerFlag,Integer lineRunFlag,Integer monitorFlag,String searchValue);
 
     List<SubGetBase> getSubStationList(SubstationParam substationParam);
 
diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/DeptLineServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/DeptLineServiceImpl.java
index 1f73e9979..7dd1ae8f6 100644
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/DeptLineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/DeptLineServiceImpl.java
@@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -81,6 +82,15 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
                 detailMapper.update(null, new LambdaUpdateWrapper<LineDetail>()
                         .set(LineDetail::getActualArea, data.getArea())
                         .in(LineDetail::getId, lineIds));
+            } else {
+                List<String> deptList = Arrays.asList("130700000000", "130300000000", "130800000000", "130200000000", "131000000000");
+                Dept data = deptFeignClient.getDeptById(deptLineParam.getId()).getData();
+                if (deptList.contains(data.getArea())) {
+                    List<String> lineIds = list.stream().map(LineDetail::getId).collect(Collectors.toList());
+                    detailMapper.update(null, new LambdaUpdateWrapper<LineDetail>()
+                            .set(LineDetail::getActualArea, data.getArea())
+                            .in(LineDetail::getId, lineIds));
+                }
             }
         }
         this.saveBatch(deptLines);
@@ -182,8 +192,13 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
     }
 
     @Override
-    public List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType, Integer powerFlag, Integer lineRunFlag,Integer monitorFlag) {
-        return deptLineMapper.orgSubStationInfoGet(devType, powerFlag, lineRunFlag,monitorFlag);
+    public List<TerminalGetBase.Extend> orgSubStationInfoGet(List<Integer> devType,
+                                                             Integer powerFlag,
+                                                             Integer lineRunFlag,
+                                                             Integer monitorFlag,
+                                                             String searchValue
+    ) {
+        return deptLineMapper.orgSubStationInfoGet(devType, powerFlag, lineRunFlag,monitorFlag,searchValue);
     }
 
     @Override
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java
index 82de60808..34e02eec4 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java
@@ -55,10 +55,10 @@ public class AreaAnalysisServiceImpl implements AreaAnalysisService {
     @Override
     public AreaAnalysisVO getEventReason(DeviceInfoParam.BusinessParam deviceInfoParam) {
         //获取暂降字典信息
-//        DictData voltageData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
-//        if(ObjectUtil.isNull(voltageData)){
-//            throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
-//        }
+        DictData voltageData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+        if(ObjectUtil.isNull(voltageData)){
+            throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
+        }
         AreaAnalysisVO areaAnalysisVO = new AreaAnalysisVO();
         List<DictData> dicReasonList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData();
         List<DictData> dicTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName()).getData();
@@ -67,11 +67,11 @@ public class AreaAnalysisServiceImpl implements AreaAnalysisService {
         List<String> lineIds = getAllLineIdList(generalDeviceDTOList);
 
         //查询数据
-//        List<AreaAnalysisVO.Children> reasonList = assData(dicReasonList, lineIds, deviceInfoParam.getSearchBeginTime(), deviceInfoParam.getSearchEndTime(), "event_reason");
+      //  List<AreaAnalysisVO.Children> reasonList = assData(dicReasonList, lineIds, deviceInfoParam.getSearchBeginTime(), deviceInfoParam.getSearchEndTime(), "event_reason");
         List<RmpEventDetailPO> info = eventDetailService.list(new QueryWrapper<RmpEventDetailPO>()
                 .select("advance_reason,advance_type,count(event_id) as count")
                 .in("measurement_point_id", lineIds)
-//                .eq("event_type", voltageData.getId())
+                .eq("event_type", voltageData.getId())
                 .in("advance_reason", dicReasonList.stream().map(DictData::getId).collect(Collectors.toList()))
                 .in("advance_type", dicTypeList.stream().map(DictData::getId).collect(Collectors.toList()))
                 .ge(StrUtil.isNotBlank(deviceInfoParam.getSearchBeginTime()),"start_time" ,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java
index d7b6d9913..ae46bf9e0 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java
@@ -123,7 +123,8 @@ public class PollutionSubstationController extends BaseController {
     public HttpResult<List<SubstationVo>> getSubstationInfo(@RequestParam(value = "deptIndex") String deptIndex,
                                                             @RequestParam(value = "searchValue",required=false) String searchValue,
                                                             @RequestParam(value = "startTime") String startTime,
-                                                            @RequestParam(value = "endTime") String endTime) {
+                                                            @RequestParam(value = "endTime") String endTime
+                                                            ) {
         String methodDescribe = getMethodDescribe("getSubstationInfo");
         LogUtil.njcnDebug(log, "{}，实体参数：{},{}", methodDescribe, deptIndex, searchValue);
         List<SubstationVo> list = pollutionSubstationService.getSubstationInfo(deptIndex,searchValue,startTime,endTime);
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
index b86c4a14a..d2dd70441 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
@@ -948,6 +948,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(deptIndex);
         deptGetLineParam.setMonitorStateRunning(false);
+        deptGetLineParam.setSearchValue(searchValue);
         List<DeptGetSubStationDTO.Info> deptGetChildrenMoreDTOS = commTerminalGeneralClient.deptGetSubStationInfo(deptGetLineParam).getData();
         List<String> lineIds = deptGetChildrenMoreDTOS.stream().flatMap(x -> x.getStationIds().stream()).flatMap(x -> x.getUnitChildrenList().stream()).distinct().collect(Collectors.toList());
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java
index 3540e5ad2..4fa579bdf 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpTargetWarnDServiceImpl.java
@@ -72,10 +72,12 @@ public class RMpTargetWarnDServiceImpl extends ServiceImpl<RMpTargetWarnDMapper,
         List<Dept> data = deptFeignClient.getDirectSonSelf(param.getId()).getData();
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
         deptGetLineParam.setDeptId(param.getId());
+        deptGetLineParam.setMonitorStateRunning(false);
         List<DeptGetSubStationDTO.Info> deptGetChildrenMoreDTOS = commTerminalGeneralClient.deptGetSubStationInfo(deptGetLineParam).getData();
 
         List<String> lineIDS = deptGetChildrenMoreDTOS.stream()
                 .flatMap(x -> x.getStationIds().stream().flatMap(l -> l.getUnitChildrenList().stream()))
+                .distinct()
                 .collect(Collectors.toList());
         //根据r_stat_limit_target_d来判断是否告警allTime flicker_overtime