diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java
index 97f3c9a..8b39cc7 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java
@@ -50,8 +50,8 @@ public class CsEdDataAuditParm {
      * 版本日期
      */
     @ApiModelProperty(value = "版本日期")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date versionDate;
 
     /**
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
index 1fc77c9..b3c5f4f 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
@@ -2,6 +2,7 @@ package com.njcn.csdevice.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -127,7 +128,10 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
             }
 
             csLedger1.setState(0);
-
+            //删除配置工程
+            QueryWrapper<CsMarketData> csMarketData = new QueryWrapper<>();
+            csMarketData.lambda().eq(CsMarketData::getEngineerId,csEngineeringAuditParm.getId());
+            csMarketDataMapper.delete(csMarketData);
 
         }
         if(StringUtils.isNotBlank(csEngineeringAuditParm.getName())){
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
index b35de94..0b370d4 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
@@ -221,6 +221,13 @@ public class StableDataServiceImpl implements StableDataService {
 
         String frequency = Optional.ofNullable(commonStatisticalQueryParam.getFrequency()).orElse("");
         List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(collect, data.getClassId(), data.getName()+frequency, data.getPhase(), commonStatisticalQueryParam.getValueType(),commonStatisticalQueryParam.getStartTime(),commonStatisticalQueryParam.getEndTime());
+        //获取对应的治理后的指标
+        if(data.getName().equals("Pq_ThdI")){
+            EleEpdPqd data1 = epdFeignClient.selectById("1a4c5741bd57bd815b361c53d627a891").getData();
+            List<StatisticalDataDTO> deviceRtData2 = commonService.getDeviceRtDataByTime(collect, data1.getClassId(), data1.getName()+frequency, data.getPhase(), commonStatisticalQueryParam.getValueType(),commonStatisticalQueryParam.getStartTime(),commonStatisticalQueryParam.getEndTime());
+            deviceRtData.addAll(deviceRtData2);
+        }
+
         List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
             ThdDataVO vo = new ThdDataVO();
             vo.setLineId(temp.getLineId());
@@ -255,6 +262,13 @@ public class StableDataServiceImpl implements StableDataService {
 
         String frequency = Optional.ofNullable(commonStatisticalQueryParam.getFrequency()).orElse("");
         List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(collect, data.getClassId(), data.getName()+frequency, data.getPhase(), commonStatisticalQueryParam.getValueType(),commonStatisticalQueryParam.getStartTime(),commonStatisticalQueryParam.getEndTime());
+        //获取对应的治理后的指标
+        if(data.getName().equals("Pq_ThdI")){
+            EleEpdPqd data1 = epdFeignClient.selectById("1a4c5741bd57bd815b361c53d627a891").getData();
+            List<StatisticalDataDTO> deviceRtData2 = commonService.getDeviceRtDataByTime(collect, data1.getClassId(), data1.getName()+frequency, data.getPhase(), commonStatisticalQueryParam.getValueType(),commonStatisticalQueryParam.getStartTime(),commonStatisticalQueryParam.getEndTime());
+            deviceRtData.addAll(deviceRtData2);
+        }
+
         List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
             ThdDataVO vo = new ThdDataVO();
             vo.setLineId(temp.getLineId());
@@ -270,7 +284,7 @@ public class StableDataServiceImpl implements StableDataService {
             vo.setStatisticalIndex(data.getId());
             return vo;
         }).collect(Collectors.toList());
-
+         collect1 = collect1.stream().distinct().collect(Collectors.toList());
         return collect1;
     }