diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
index 78bbfffc..0abd418b 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
@@ -958,15 +958,17 @@ public class SocketDevResponseService {
 
                                 //告诉前端当前项开始了
                                 WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
+                                String type = sourceIssues.get(0).getType();
                                 if (StrUtil.isNotBlank(sourceIssues.get(0).getOtherType())) {
                                     sourceIssues.get(0).setType(ResultUnitEnum.V_ABSOLUTELY.getCode());
                                     webSocketVO.setRequestId(sourceIssues.get(0).getOtherType() + CnSocketUtil.START_TAG);
+                                    type = sourceIssues.get(0).getOtherType();
                                 } else {
                                     webSocketVO.setRequestId(sourceIssues.get(0).getType() + CnSocketUtil.START_TAG);
                                 }
                                 FormalTestManager.currentIssue = sourceIssues.get(0);
                                 socketMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
-                                socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + sourceIssues.get(0).getOtherType());
+                                socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type);
                                 socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
                                 SocketManager.sendMsg(param.getUserPageId() + CnSocketUtil.SOURCE_TAG, JSON.toJSONString(socketMsg));
 
@@ -1215,13 +1217,16 @@ public class SocketDevResponseService {
 
                                 //告诉前端当前项开始了
                                 WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
+
                                 String type = sourceIssues.get(0).getType();
-                                if (ResultUnitEnum.P.getCode().equals(type)) {
+                                if (StrUtil.isNotBlank(sourceIssues.get(0).getOtherType())) {
                                     sourceIssues.get(0).setType(ResultUnitEnum.V_ABSOLUTELY.getCode());
-                                    webSocketVO.setRequestId(ResultUnitEnum.P.getCode() + CnSocketUtil.START_TAG);
+                                    webSocketVO.setRequestId(sourceIssues.get(0).getOtherType() + CnSocketUtil.START_TAG);
+                                    type = sourceIssues.get(0).getOtherType();
                                 } else {
                                     webSocketVO.setRequestId(sourceIssues.get(0).getType() + CnSocketUtil.START_TAG);
                                 }
+
                                 FormalTestManager.currentIssue = sourceIssues.get(0);
                                 socketMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
                                 socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type);
@@ -1361,15 +1366,16 @@ public class SocketDevResponseService {
                         List<SourceIssue> sourceIssueList = SocketManager.getSourceList();
                         if (CollUtil.isNotEmpty(sourceIssueList)) {
                             SourceIssue sourceIssues = SocketManager.getSourceList().get(0);
-                            // 如果上一个大项检测完成，则检测下一个大项，并向前端推送消息
-                            if (residueCount == 0) {
-                                WebServiceManager.sendDetectionMessage(param.getUserPageId(), sourceIssues.getType() + CnSocketUtil.START_TAG, null, new ArrayList<>(), null);
-                            }
+
                             String type = sourceIssues.getType();
                             if (StrUtil.isNotBlank(sourceIssues.getOtherType())) {
                                 sourceIssues.setType(ResultUnitEnum.V_ABSOLUTELY.getCode());
                                 type = sourceIssues.getOtherType();
                             }
+                            // 如果上一个大项检测完成，则检测下一个大项，并向前端推送消息
+                            if (residueCount == 0) {
+                                WebServiceManager.sendDetectionMessage(param.getUserPageId(), type + CnSocketUtil.START_TAG, null, new ArrayList<>(), null);
+                            }
 
                             //控源下发下一个小项脚本
                             SocketMsg<String> xuMsg = new SocketMsg<>();
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 43ad26f8..91ae08c3 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
@@ -104,6 +104,18 @@ public class PqScriptDtls implements Serializable {
     @TableField("FAfterTime")
     private Double fAfterTime;
 
+    /**
+     * 暂态写入时间（S）
+     */
+    @TableField("FRampIn")
+    private Double fRampIn;
+
+    /**
+     * 暂态写出时间（S）
+     */
+    @TableField("FRampOut")
+    private Double fRampOut;
+
     /**
      * 变动频度（次/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 ac5bc218..6c150b7c 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
@@ -69,13 +69,13 @@ 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}")
+//    @Value("${Dip.fPreTime}")
 //    private Double fPreTime;
-    @Value("${Dip.fRampIn}")
-    private Double fRampIn;
-    @Value("${Dip.fRampOut}")
-    private Double fRampOut;
-    //        @Value("${Dip.fAfterTime}")
+//    @Value("${Dip.fRampIn}")
+//    private Double fRampIn;
+//    @Value("${Dip.fRampOut}")
+//    private Double fRampOut;
+//    @Value("${Dip.fAfterTime}")
 //    private Double fAfterTime;
     private static final String waveFluType = "CPM";
     private static final String waveType = "SQU";
@@ -386,6 +386,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                             dip.setRetainTime(dipData.getRetainTime());
                             dip.setFPreTime(dipData.getFPreTime());
                             dip.setFAfterTime(dipData.getFAfterTime());
+                            dip.setFRampIn(dipData.getFRampIn());
+                            dip.setFRampOut(dipData.getFRampOut());
                             info.add(dip);
                         }
                     }
@@ -1315,8 +1317,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             dipDataDTO.setFRetainTime(0.0);
 
 //            dipDataDTO.setFPreTime(fPreTime);
-            dipDataDTO.setFRampIn(fRampIn);
-            dipDataDTO.setFRampOut(fRampOut);
+//            dipDataDTO.setFRampIn(fRampIn);
+//            dipDataDTO.setFRampOut(fRampOut);
 //            dipDataDTO.setFAfterTime(fAfterTime);
 
 
@@ -1373,6 +1375,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                             dipDataDTO.setFTransValue(dip.getTransValue());
                             dipDataDTO.setFPreTime(dip.getFPreTime());
                             dipDataDTO.setFAfterTime(dip.getFAfterTime());
+                            dipDataDTO.setFRampIn(dip.getFRampIn());
+                            dipDataDTO.setFRampOut(dip.getFRampOut());
                             if (devFly) {
 //                                if (isValueType) {
                                 dipDataDTO.setFTransValue(dip.getTransValue());
diff --git a/entrance/src/main/resources/application.yml b/entrance/src/main/resources/application.yml
index 4efd995d..468dda11 100644
--- a/entrance/src/main/resources/application.yml
+++ b/entrance/src/main/resources/application.yml
@@ -6,7 +6,7 @@ spring:
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.1.24:13306/pqs91001?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+      url: jdbc:mysql://192.168.1.24:13306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
       #      username: root
       #      password: njcnpqs
       #      url: jdbc:mysql://127.0.0.1:3306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
@@ -70,9 +70,9 @@ Dip:
   #  暂态前时间（s）
   #  fPreTime: 2f
   #写入时间（s）
-  fRampIn: 0.001f
+#  fRampIn: 0.001f
   #写出时间（s）
-  fRampOut: 0.001f
+#  fRampOut: 0.001f
 #  暂态后时间（s）
 #  fAfterTime: 3f