diff --git a/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java
index c81f48de..43ad26f8 100644
--- a/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java
+++ b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java
@@ -92,6 +92,18 @@ public class PqScriptDtls implements Serializable {
     @TableField("RetainTime")
     private Double retainTime;
 
+    /**
+     * 暂态前延时间（S）
+     */
+    @TableField("FPreTime")
+    private Double fPreTime;
+
+    /**
+     * 暂态后延时间（S）
+     */
+    @TableField("FAfterTime")
+    private Double fAfterTime;
+
     /**
      * 变动频度（次/min）
      */
diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
index c8b194cf..87e1069c 100644
--- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
@@ -68,14 +68,14 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
     private final static String INHARM_I = "InHarm_I";
     private final static String DIP = "Dip";
     private final static String FLICKER = "Flicker";
-    @Value("${Dip.fPreTime}")
-    private Double fPreTime;
+//    @Value("${Dip.fPreTime}")
+//    private Double fPreTime;
     @Value("${Dip.fRampIn}")
     private Double fRampIn;
     @Value("${Dip.fRampOut}")
     private Double fRampOut;
-    @Value("${Dip.fAfterTime}")
-    private Double fAfterTime;
+//    @Value("${Dip.fAfterTime}")
+//    private Double fAfterTime;
     @Value("${Flicker.waveFluType}")
     private String waveFluType;
     @Value("${Flicker.waveType}")
@@ -385,6 +385,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                             dip.setPhase(phase);
                             dip.setTransValue(dipData.getFTransValue());
                             dip.setRetainTime(dipData.getRetainTime());
+                            dip.setFPreTime(dipData.getFPreTime());
+                            dip.setFAfterTime(dipData.getFAfterTime());
                             info.add(dip);
                         }
                     }
@@ -1054,10 +1056,10 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             dipDataDTO.setFTransValue(0.0);
             dipDataDTO.setFRetainTime(0.0);
 
-            dipDataDTO.setFPreTime(fPreTime);
+//            dipDataDTO.setFPreTime(fPreTime);
             dipDataDTO.setFRampIn(fRampIn);
             dipDataDTO.setFRampOut(fRampOut);
-            dipDataDTO.setFAfterTime(fAfterTime);
+//            dipDataDTO.setFAfterTime(fAfterTime);
 
 
             channelListDTO.setDipData(dipDataDTO);
@@ -1104,6 +1106,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                         if (CollUtil.isNotEmpty(dipList)) {
                             PqScriptDtls dip = dipList.get(0);
                             dipDataDTO.setFTransValue(dip.getTransValue());
+                            dipDataDTO.setFPreTime(dip.getFPreTime());
+                            dipDataDTO.setFAfterTime(dip.getFAfterTime());
                             if (devFly) {
 //                                if (isValueType) {
                                 dipDataDTO.setFTransValue(dip.getTransValue());