diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java
index 2b4c919..3afee12 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java
@@ -478,22 +478,22 @@
         //数字
         Map<String, OscilloscopeStrategyType> digitalMap = new HashMap<>();
         digitalMap.put("1", OscilloscopeStrategyType.TIME_BASE);
-        digitalMap.put("2", OscilloscopeStrategyType.RELATIVE_ERROR);
-        digitalMap.put("3", OscilloscopeStrategyType.ERROR);
-        digitalMap.put("4", OscilloscopeStrategyType.DECIBEL);
-        digitalMap.put("5", OscilloscopeStrategyType.MEASURE_VALUE);
-        digitalMap.put("6", OscilloscopeStrategyType.MEASURE_VALUE);
-        digitalMap.put("7", OscilloscopeStrategyType.RELATIVE_ERROR);
+        digitalMap.put("2", OscilloscopeStrategyType.DIGITAL_GAIN);
+        digitalMap.put("3", OscilloscopeStrategyType.DIGITAL_OFFSET);
+        digitalMap.put("4", OscilloscopeStrategyType.FREQUENCY_BANDWIDTH);
+        digitalMap.put("5", OscilloscopeStrategyType.TRIGGER_SENSITIVITY);
+        digitalMap.put("6", OscilloscopeStrategyType.DIGITAL_RISE_TIME);
+        digitalMap.put("7", OscilloscopeStrategyType.DIGITAL_INPUT_RESISTANCE);
         digitalMap.put("8", OscilloscopeStrategyType.DIGITAL_CALIBRATION_SIGNAL);
         //模拟
         Map<String, OscilloscopeStrategyType> simulationMap = new HashMap<>();
-        simulationMap.put("1", OscilloscopeStrategyType.RELATIVE_ERROR);
-        simulationMap.put("2", OscilloscopeStrategyType.RELATIVE_ERROR);
-        simulationMap.put("3", OscilloscopeStrategyType.MEASURE_VALUE);
-        simulationMap.put("4", OscilloscopeStrategyType.OUTPUT_SIGNAL);
-        simulationMap.put("5", OscilloscopeStrategyType.RELATIVE_ERROR);
-        simulationMap.put("6", OscilloscopeStrategyType.UP_TIME);
-        simulationMap.put("7", OscilloscopeStrategyType.CALIBRATION_SIGNAL);
+        simulationMap.put("1", OscilloscopeStrategyType.SCAN_TIME_COEFFICIENT_AND_EXPANSION);
+        simulationMap.put("2", OscilloscopeStrategyType.VERTICAL_AMPLITUDE);
+        simulationMap.put("3", OscilloscopeStrategyType.FREQUENCY_BAND_WIDTH);
+        simulationMap.put("4", OscilloscopeStrategyType.TRIGGER_CHARACTERISTICS);
+        simulationMap.put("5", OscilloscopeStrategyType.INPUT_RESISTANCE);
+        simulationMap.put("6", OscilloscopeStrategyType.RISE_TIME);
+        simulationMap.put("7", OscilloscopeStrategyType.SIMULATION_SIGNAL);
         OscilloscopeStrategyType oscilloscopeStrategyType = null;
         switch (type) {
             case "数字示波器": {

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java
index 2b4c919..3afee12 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java
@@ -478,22 +478,22 @@
         //数字
         Map<String, OscilloscopeStrategyType> digitalMap = new HashMap<>();
         digitalMap.put("1", OscilloscopeStrategyType.TIME_BASE);
-        digitalMap.put("2", OscilloscopeStrategyType.RELATIVE_ERROR);
-        digitalMap.put("3", OscilloscopeStrategyType.ERROR);
-        digitalMap.put("4", OscilloscopeStrategyType.DECIBEL);
-        digitalMap.put("5", OscilloscopeStrategyType.MEASURE_VALUE);
-        digitalMap.put("6", OscilloscopeStrategyType.MEASURE_VALUE);
-        digitalMap.put("7", OscilloscopeStrategyType.RELATIVE_ERROR);
+        digitalMap.put("2", OscilloscopeStrategyType.DIGITAL_GAIN);
+        digitalMap.put("3", OscilloscopeStrategyType.DIGITAL_OFFSET);
+        digitalMap.put("4", OscilloscopeStrategyType.FREQUENCY_BANDWIDTH);
+        digitalMap.put("5", OscilloscopeStrategyType.TRIGGER_SENSITIVITY);
+        digitalMap.put("6", OscilloscopeStrategyType.DIGITAL_RISE_TIME);
+        digitalMap.put("7", OscilloscopeStrategyType.DIGITAL_INPUT_RESISTANCE);
         digitalMap.put("8", OscilloscopeStrategyType.DIGITAL_CALIBRATION_SIGNAL);
         //模拟
         Map<String, OscilloscopeStrategyType> simulationMap = new HashMap<>();
-        simulationMap.put("1", OscilloscopeStrategyType.RELATIVE_ERROR);
-        simulationMap.put("2", OscilloscopeStrategyType.RELATIVE_ERROR);
-        simulationMap.put("3", OscilloscopeStrategyType.MEASURE_VALUE);
-        simulationMap.put("4", OscilloscopeStrategyType.OUTPUT_SIGNAL);
-        simulationMap.put("5", OscilloscopeStrategyType.RELATIVE_ERROR);
-        simulationMap.put("6", OscilloscopeStrategyType.UP_TIME);
-        simulationMap.put("7", OscilloscopeStrategyType.CALIBRATION_SIGNAL);
+        simulationMap.put("1", OscilloscopeStrategyType.SCAN_TIME_COEFFICIENT_AND_EXPANSION);
+        simulationMap.put("2", OscilloscopeStrategyType.VERTICAL_AMPLITUDE);
+        simulationMap.put("3", OscilloscopeStrategyType.FREQUENCY_BAND_WIDTH);
+        simulationMap.put("4", OscilloscopeStrategyType.TRIGGER_CHARACTERISTICS);
+        simulationMap.put("5", OscilloscopeStrategyType.INPUT_RESISTANCE);
+        simulationMap.put("6", OscilloscopeStrategyType.RISE_TIME);
+        simulationMap.put("7", OscilloscopeStrategyType.SIMULATION_SIGNAL);
         OscilloscopeStrategyType oscilloscopeStrategyType = null;
         switch (type) {
             case "数字示波器": {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 2ac6417..aa0a898 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -61,7 +61,7 @@
                 BigDecimal riseTime = new BigDecimal(cesiumAtom.getRiseTime());
                 cesiumAtom.setRiseTime(cesiumAtom.getRiseTime() + cesiumAtom.getTechnicalIndexUnit());
                 if (riseTime.compareTo(new BigDecimal(cesiumAtom.getTechnicalIndex())) > 0) {
-                    cesiumAtom.setTechnicalIndex(cesiumAtom.getTechnicalIndex() + cesiumAtom.getTechnicalIndexUnit());
+                    cesiumAtom.setTechnicalIndex(cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() + cesiumAtom.getTechnicalIndexUnit());
                     cesiumAtom.setRiseTime(cesiumAtom.getRiseTime() + "*");
                 }
             }
@@ -78,6 +78,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom) {
             cesiumAtom.setTestedSignalFrequency(StringUtils.isNotBlank(cesiumAtom.getTestedSignalFrequency()) ? cesiumAtom.getTestedSignalFrequency() + cesiumAtom.getTestedSignalFrequencyUnit() : "");
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
+            cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
             if (StringUtils.isNotBlank(cesiumAtom.getFrequencyStability())) {
                 cesiumAtom.setFrequencyStability(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getFrequencyStability() + "*" : cesiumAtom.getFrequencyStability());
             }
@@ -96,6 +97,7 @@
             cesiumAtom.setGateTime(StringUtils.isNotBlank(cesiumAtom.getGateTime()) ? cesiumAtom.getGateTime() + cesiumAtom.getGateTimeUnit() : "");
             cesiumAtom.setOnTime(StringUtils.isNotBlank(cesiumAtom.getOnTime()) ? cesiumAtom.getOnTime() + cesiumAtom.getOnTimeUnit() : "");
             cesiumAtom.setRelativeFrequencyDeviationOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getRelativeFrequencyDeviationOne() + "*" : cesiumAtom.getRelativeFrequencyDeviationOne());
+            cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
         }
     },
     /**
@@ -111,6 +113,7 @@
             cesiumAtom.setTOne(StringUtils.isNotBlank(cesiumAtom.getTOne()) ? cesiumAtom.getTOne() + cesiumAtom.getTOneUnit() : "");
             cesiumAtom.setTTwo(StringUtils.isNotBlank(cesiumAtom.getTTwo()) ? cesiumAtom.getTTwo() + cesiumAtom.getTTwoUnit() : "");
             cesiumAtom.setFrequencyReproducibility(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getFrequencyReproducibility() + "*" : cesiumAtom.getFrequencyReproducibility());
+            cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
         }
     },
     /**
@@ -126,6 +129,7 @@
             cesiumAtom.setGateTime(StringUtils.isNotBlank(cesiumAtom.getGateTime()) ? cesiumAtom.getGateTime() + cesiumAtom.getGateTimeUnit() : "");
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
+            cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
         }
     },
     /**
@@ -168,11 +172,11 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom) {
             cesiumAtom.setNominalValue(StringUtils.isNotBlank(cesiumAtom.getNominalValue()) ? cesiumAtom.getNominalValue() + cesiumAtom.getNominalValueUnit() : "");
             cesiumAtom.setGateTime(StringUtils.isNotBlank(cesiumAtom.getGateTime()) ? cesiumAtom.getGateTime() + cesiumAtom.getGateTimeUnit() : "");
-            cesiumAtom.setTestValueOne(StringUtils.isNotBlank(cesiumAtom.getTestValueOne())?cesiumAtom.getTestValueOne()+cesiumAtom.getNominalValueUnit():"");
-            cesiumAtom.setTestValueTwo(StringUtils.isNotBlank(cesiumAtom.getTestValueTwo())?cesiumAtom.getTestValueTwo()+cesiumAtom.getNominalValueUnit():"");
-            cesiumAtom.setTestValueThree(StringUtils.isNotBlank(cesiumAtom.getTestValueThree())?cesiumAtom.getTestValueThree()+cesiumAtom.getNominalValueUnit():"");
+            cesiumAtom.setTestValueOne(StringUtils.isNotBlank(cesiumAtom.getTestValueOne()) ? cesiumAtom.getTestValueOne() + cesiumAtom.getNominalValueUnit() : "");
+            cesiumAtom.setTestValueTwo(StringUtils.isNotBlank(cesiumAtom.getTestValueTwo()) ? cesiumAtom.getTestValueTwo() + cesiumAtom.getNominalValueUnit() : "");
+            cesiumAtom.setTestValueThree(StringUtils.isNotBlank(cesiumAtom.getTestValueThree()) ? cesiumAtom.getTestValueThree() + cesiumAtom.getNominalValueUnit() : "");
             cesiumAtom.setEffectiveResolution(StringUtils.isNotBlank(cesiumAtom.getEffectiveResolution()) ? cesiumAtom.getEffectiveResolution() + cesiumAtom.getEffectiveResolutionUnit() : "");
-            if (StringUtils.isNotBlank(cesiumAtom.getTestValueError())){
+            if (StringUtils.isNotBlank(cesiumAtom.getTestValueError())) {
                 cesiumAtom.setTestValueError(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getTestValueError() + "*" : cesiumAtom.getTestValueError());
             }
         }
@@ -187,12 +191,12 @@
         @Override
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom) {
             cesiumAtom.setNominalValue(StringUtils.isNotBlank(cesiumAtom.getNominalValue()) ? cesiumAtom.getNominalValue() + cesiumAtom.getNominalValueUnit() : "");
-            if (StringUtils.isNotBlank(cesiumAtom.getInputSensitivity()) && StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex())){
+            if (StringUtils.isNotBlank(cesiumAtom.getInputSensitivity()) && StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex())) {
                 BigDecimal inputSensitivity = new BigDecimal(cesiumAtom.getInputSensitivity());
                 int compare = inputSensitivity.compareTo(new BigDecimal(cesiumAtom.getTechnicalIndex()));
                 cesiumAtom.setInputSensitivity(StringUtils.isNotBlank(cesiumAtom.getInputSensitivity()) ? cesiumAtom.getInputSensitivity() + cesiumAtom.getInputSensitivityUnit() : "");
                 cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() + cesiumAtom.getTechnicalIndexUnit() : "");
-                if (compare > 0){
+                if (compare > 0) {
                     cesiumAtom.setInputSensitivity(cesiumAtom.getInputSensitivity() + "*");
                 }
             }
@@ -200,8 +204,8 @@
                 BigDecimal maxInputLevel = new BigDecimal(cesiumAtom.getMaxInputLevel());
                 int compare = maxInputLevel.compareTo(new BigDecimal(cesiumAtom.getOtherTechnicalIndex()));
                 cesiumAtom.setMaxInputLevel(StringUtils.isNotBlank(cesiumAtom.getMaxInputLevel()) ? cesiumAtom.getMaxInputLevel() + cesiumAtom.getMaxInputLevelUnit() : "");
-                cesiumAtom.setOtherTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getOtherTechnicalIndex())?cesiumAtom.getOtherTechnicalIndexSymbol() + cesiumAtom.getOtherTechnicalIndex() + cesiumAtom.getOtherTechnicalIndexUnit():"");
-                if (compare > 0){
+                cesiumAtom.setOtherTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getOtherTechnicalIndex()) ? cesiumAtom.getOtherTechnicalIndexSymbol() + cesiumAtom.getOtherTechnicalIndex() + cesiumAtom.getOtherTechnicalIndexUnit() : "");
+                if (compare > 0) {
                     cesiumAtom.setMaxInputLevel(cesiumAtom.getMaxInputLevel() + "*");
                 }
             }

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java
index 2b4c919..3afee12 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataOscilloscope.java
@@ -478,22 +478,22 @@
         //数字
         Map<String, OscilloscopeStrategyType> digitalMap = new HashMap<>();
         digitalMap.put("1", OscilloscopeStrategyType.TIME_BASE);
-        digitalMap.put("2", OscilloscopeStrategyType.RELATIVE_ERROR);
-        digitalMap.put("3", OscilloscopeStrategyType.ERROR);
-        digitalMap.put("4", OscilloscopeStrategyType.DECIBEL);
-        digitalMap.put("5", OscilloscopeStrategyType.MEASURE_VALUE);
-        digitalMap.put("6", OscilloscopeStrategyType.MEASURE_VALUE);
-        digitalMap.put("7", OscilloscopeStrategyType.RELATIVE_ERROR);
+        digitalMap.put("2", OscilloscopeStrategyType.DIGITAL_GAIN);
+        digitalMap.put("3", OscilloscopeStrategyType.DIGITAL_OFFSET);
+        digitalMap.put("4", OscilloscopeStrategyType.FREQUENCY_BANDWIDTH);
+        digitalMap.put("5", OscilloscopeStrategyType.TRIGGER_SENSITIVITY);
+        digitalMap.put("6", OscilloscopeStrategyType.DIGITAL_RISE_TIME);
+        digitalMap.put("7", OscilloscopeStrategyType.DIGITAL_INPUT_RESISTANCE);
         digitalMap.put("8", OscilloscopeStrategyType.DIGITAL_CALIBRATION_SIGNAL);
         //模拟
         Map<String, OscilloscopeStrategyType> simulationMap = new HashMap<>();
-        simulationMap.put("1", OscilloscopeStrategyType.RELATIVE_ERROR);
-        simulationMap.put("2", OscilloscopeStrategyType.RELATIVE_ERROR);
-        simulationMap.put("3", OscilloscopeStrategyType.MEASURE_VALUE);
-        simulationMap.put("4", OscilloscopeStrategyType.OUTPUT_SIGNAL);
-        simulationMap.put("5", OscilloscopeStrategyType.RELATIVE_ERROR);
-        simulationMap.put("6", OscilloscopeStrategyType.UP_TIME);
-        simulationMap.put("7", OscilloscopeStrategyType.CALIBRATION_SIGNAL);
+        simulationMap.put("1", OscilloscopeStrategyType.SCAN_TIME_COEFFICIENT_AND_EXPANSION);
+        simulationMap.put("2", OscilloscopeStrategyType.VERTICAL_AMPLITUDE);
+        simulationMap.put("3", OscilloscopeStrategyType.FREQUENCY_BAND_WIDTH);
+        simulationMap.put("4", OscilloscopeStrategyType.TRIGGER_CHARACTERISTICS);
+        simulationMap.put("5", OscilloscopeStrategyType.INPUT_RESISTANCE);
+        simulationMap.put("6", OscilloscopeStrategyType.RISE_TIME);
+        simulationMap.put("7", OscilloscopeStrategyType.SIMULATION_SIGNAL);
         OscilloscopeStrategyType oscilloscopeStrategyType = null;
         switch (type) {
             case "数字示波器": {
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
index 2ac6417..aa0a898 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/CesiumAtomStrategyType.java
@@ -61,7 +61,7 @@
                 BigDecimal riseTime = new BigDecimal(cesiumAtom.getRiseTime());
                 cesiumAtom.setRiseTime(cesiumAtom.getRiseTime() + cesiumAtom.getTechnicalIndexUnit());
                 if (riseTime.compareTo(new BigDecimal(cesiumAtom.getTechnicalIndex())) > 0) {
-                    cesiumAtom.setTechnicalIndex(cesiumAtom.getTechnicalIndex() + cesiumAtom.getTechnicalIndexUnit());
+                    cesiumAtom.setTechnicalIndex(cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() + cesiumAtom.getTechnicalIndexUnit());
                     cesiumAtom.setRiseTime(cesiumAtom.getRiseTime() + "*");
                 }
             }
@@ -78,6 +78,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom) {
             cesiumAtom.setTestedSignalFrequency(StringUtils.isNotBlank(cesiumAtom.getTestedSignalFrequency()) ? cesiumAtom.getTestedSignalFrequency() + cesiumAtom.getTestedSignalFrequencyUnit() : "");
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
+            cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
             if (StringUtils.isNotBlank(cesiumAtom.getFrequencyStability())) {
                 cesiumAtom.setFrequencyStability(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getFrequencyStability() + "*" : cesiumAtom.getFrequencyStability());
             }
@@ -96,6 +97,7 @@
             cesiumAtom.setGateTime(StringUtils.isNotBlank(cesiumAtom.getGateTime()) ? cesiumAtom.getGateTime() + cesiumAtom.getGateTimeUnit() : "");
             cesiumAtom.setOnTime(StringUtils.isNotBlank(cesiumAtom.getOnTime()) ? cesiumAtom.getOnTime() + cesiumAtom.getOnTimeUnit() : "");
             cesiumAtom.setRelativeFrequencyDeviationOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getRelativeFrequencyDeviationOne() + "*" : cesiumAtom.getRelativeFrequencyDeviationOne());
+            cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
         }
     },
     /**
@@ -111,6 +113,7 @@
             cesiumAtom.setTOne(StringUtils.isNotBlank(cesiumAtom.getTOne()) ? cesiumAtom.getTOne() + cesiumAtom.getTOneUnit() : "");
             cesiumAtom.setTTwo(StringUtils.isNotBlank(cesiumAtom.getTTwo()) ? cesiumAtom.getTTwo() + cesiumAtom.getTTwoUnit() : "");
             cesiumAtom.setFrequencyReproducibility(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getFrequencyReproducibility() + "*" : cesiumAtom.getFrequencyReproducibility());
+            cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
         }
     },
     /**
@@ -126,6 +129,7 @@
             cesiumAtom.setGateTime(StringUtils.isNotBlank(cesiumAtom.getGateTime()) ? cesiumAtom.getGateTime() + cesiumAtom.getGateTimeUnit() : "");
             cesiumAtom.setSampleTime(StringUtils.isNotBlank(cesiumAtom.getSampleTime()) ? cesiumAtom.getSampleTime() + cesiumAtom.getSampleTimeUnit() : "");
             cesiumAtom.setDailyAgingRateOne(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getDailyAgingRateOne() + "*" : cesiumAtom.getDailyAgingRateOne());
+            cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() : "");
         }
     },
     /**
@@ -168,11 +172,11 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom) {
             cesiumAtom.setNominalValue(StringUtils.isNotBlank(cesiumAtom.getNominalValue()) ? cesiumAtom.getNominalValue() + cesiumAtom.getNominalValueUnit() : "");
             cesiumAtom.setGateTime(StringUtils.isNotBlank(cesiumAtom.getGateTime()) ? cesiumAtom.getGateTime() + cesiumAtom.getGateTimeUnit() : "");
-            cesiumAtom.setTestValueOne(StringUtils.isNotBlank(cesiumAtom.getTestValueOne())?cesiumAtom.getTestValueOne()+cesiumAtom.getNominalValueUnit():"");
-            cesiumAtom.setTestValueTwo(StringUtils.isNotBlank(cesiumAtom.getTestValueTwo())?cesiumAtom.getTestValueTwo()+cesiumAtom.getNominalValueUnit():"");
-            cesiumAtom.setTestValueThree(StringUtils.isNotBlank(cesiumAtom.getTestValueThree())?cesiumAtom.getTestValueThree()+cesiumAtom.getNominalValueUnit():"");
+            cesiumAtom.setTestValueOne(StringUtils.isNotBlank(cesiumAtom.getTestValueOne()) ? cesiumAtom.getTestValueOne() + cesiumAtom.getNominalValueUnit() : "");
+            cesiumAtom.setTestValueTwo(StringUtils.isNotBlank(cesiumAtom.getTestValueTwo()) ? cesiumAtom.getTestValueTwo() + cesiumAtom.getNominalValueUnit() : "");
+            cesiumAtom.setTestValueThree(StringUtils.isNotBlank(cesiumAtom.getTestValueThree()) ? cesiumAtom.getTestValueThree() + cesiumAtom.getNominalValueUnit() : "");
             cesiumAtom.setEffectiveResolution(StringUtils.isNotBlank(cesiumAtom.getEffectiveResolution()) ? cesiumAtom.getEffectiveResolution() + cesiumAtom.getEffectiveResolutionUnit() : "");
-            if (StringUtils.isNotBlank(cesiumAtom.getTestValueError())){
+            if (StringUtils.isNotBlank(cesiumAtom.getTestValueError())) {
                 cesiumAtom.setTestValueError(cesiumAtom.getExceedMark() == 1 ? cesiumAtom.getTestValueError() + "*" : cesiumAtom.getTestValueError());
             }
         }
@@ -187,12 +191,12 @@
         @Override
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom) {
             cesiumAtom.setNominalValue(StringUtils.isNotBlank(cesiumAtom.getNominalValue()) ? cesiumAtom.getNominalValue() + cesiumAtom.getNominalValueUnit() : "");
-            if (StringUtils.isNotBlank(cesiumAtom.getInputSensitivity()) && StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex())){
+            if (StringUtils.isNotBlank(cesiumAtom.getInputSensitivity()) && StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex())) {
                 BigDecimal inputSensitivity = new BigDecimal(cesiumAtom.getInputSensitivity());
                 int compare = inputSensitivity.compareTo(new BigDecimal(cesiumAtom.getTechnicalIndex()));
                 cesiumAtom.setInputSensitivity(StringUtils.isNotBlank(cesiumAtom.getInputSensitivity()) ? cesiumAtom.getInputSensitivity() + cesiumAtom.getInputSensitivityUnit() : "");
                 cesiumAtom.setTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getTechnicalIndex()) ? cesiumAtom.getTechnicalIndexSymbol() + cesiumAtom.getTechnicalIndex() + cesiumAtom.getTechnicalIndexUnit() : "");
-                if (compare > 0){
+                if (compare > 0) {
                     cesiumAtom.setInputSensitivity(cesiumAtom.getInputSensitivity() + "*");
                 }
             }
@@ -200,8 +204,8 @@
                 BigDecimal maxInputLevel = new BigDecimal(cesiumAtom.getMaxInputLevel());
                 int compare = maxInputLevel.compareTo(new BigDecimal(cesiumAtom.getOtherTechnicalIndex()));
                 cesiumAtom.setMaxInputLevel(StringUtils.isNotBlank(cesiumAtom.getMaxInputLevel()) ? cesiumAtom.getMaxInputLevel() + cesiumAtom.getMaxInputLevelUnit() : "");
-                cesiumAtom.setOtherTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getOtherTechnicalIndex())?cesiumAtom.getOtherTechnicalIndexSymbol() + cesiumAtom.getOtherTechnicalIndex() + cesiumAtom.getOtherTechnicalIndexUnit():"");
-                if (compare > 0){
+                cesiumAtom.setOtherTechnicalIndex(StringUtils.isNotBlank(cesiumAtom.getOtherTechnicalIndex()) ? cesiumAtom.getOtherTechnicalIndexSymbol() + cesiumAtom.getOtherTechnicalIndex() + cesiumAtom.getOtherTechnicalIndexUnit() : "");
+                if (compare > 0) {
                     cesiumAtom.setMaxInputLevel(cesiumAtom.getMaxInputLevel() + "*");
                 }
             }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
index 0f81e29..ef89368 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/OscilloscopeStrategyType.java
@@ -11,9 +11,9 @@
  */
 public enum OscilloscopeStrategyType implements OscilloscopeStrategy {
     /**
-     * 相对误差
+     * 扫描时间系数及扩展
      */
-    RELATIVE_ERROR {
+    SCAN_TIME_COEFFICIENT_AND_EXPANSION {
         /**
          * @param oscilloscope
          */
@@ -23,17 +23,38 @@
             oscilloscope.setHorizontalScaleGear(StringUtils.isNotBlank(oscilloscope.getHorizontalScaleGear()) ? oscilloscope.getHorizontalScaleGear() + oscilloscope.getHorizontalScaleGearUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
-            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
-            oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
+            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getHorizontalScaleGearUnit() : "");
+            oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
             if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
                 oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
             }
         }
     },
     /**
-     * 测量值
+     * 垂直幅度
      */
-    MEASURE_VALUE {
+    VERTICAL_AMPLITUDE {
+        /**
+         * @param oscilloscope
+         */
+        @Override
+        public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
+            oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
+            oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
+            oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
+            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getVerticalScaleGearUnit() : "");
+            oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
+            oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
+
+            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+                oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
+            }
+        }
+    },
+    /**
+     * 频带宽度
+     */
+    FREQUENCY_BAND_WIDTH {
         /**
          * @param oscilloscope
          */
@@ -41,8 +62,7 @@
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
             oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-            oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
-            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
+            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
@@ -50,9 +70,9 @@
         }
     },
     /**
-     * 输出信号幅度
+     * 触发特性
      */
-    OUTPUT_SIGNAL {
+    TRIGGER_CHARACTERISTICS {
         /**
          * @param oscilloscope
          */
@@ -62,12 +82,32 @@
             oscilloscope.setFrequencyUpper(StringUtils.isNotBlank(oscilloscope.getFrequencyUpper()) ? oscilloscope.getFrequencyUpper() + oscilloscope.getFrequencyUpperUnit() : "");
             oscilloscope.setOutputSignalAmplitude(StringUtils.isNotBlank(oscilloscope.getOutputSignalAmplitude()) ? oscilloscope.getOutputSignalAmplitude() + oscilloscope.getTechnicalIndexUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
+            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getSignalFrequency())) {
+                oscilloscope.setSignalFrequency(oscilloscope.getSignalFrequency() + "*");
+            }
+        }
+    },
+    /**
+     * 输入电阻
+     */
+    INPUT_RESISTANCE {
+        /**
+         * @param oscilloscope
+         */
+        @Override
+        public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
+            oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
+            oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
+            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getImpedanceUnit() : "");
+            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+                oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
+            }
         }
     },
     /**
      * 上升时间
      */
-    UP_TIME {
+    RISE_TIME {
         /**
          * @param oscilloscope
          */
@@ -84,13 +124,17 @@
     /**
      * 校准信号
      */
-    CALIBRATION_SIGNAL {
+    SIMULATION_SIGNAL {
         /**
          * @param oscilloscope
          */
         @Override
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
+            oscilloscope.setNominalAmplitudeValue(StringUtils.isNotBlank(oscilloscope.getNominalAmplitudeValue()) ? oscilloscope.getNominalAmplitudeValue() + oscilloscope.getNominalAmplitudeValueUnit() : "");
+            oscilloscope.setMeasureAmplitudeValue(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitudeValue()) ? oscilloscope.getMeasureAmplitudeValue() + oscilloscope.getNominalAmplitudeValueUnit() : "");
+            oscilloscope.setNominalFrequencyValue(StringUtils.isNotBlank(oscilloscope.getNominalFrequencyValue()) ? oscilloscope.getNominalFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
+            oscilloscope.setMeasureFrequencyValue(StringUtils.isNotBlank(oscilloscope.getMeasureFrequencyValue()) ? oscilloscope.getMeasureFrequencyValue() + oscilloscope.getNominalFrequencyValueUnit() : "");
             oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
             if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getAmplitudeDeviation())) {
                 oscilloscope.setAmplitudeDeviation(oscilloscope.getAmplitudeDeviation() + "*");
@@ -100,6 +144,9 @@
             }
         }
     },
+
+    //数字示波器开始
+
     /**
      * 时基
      */
@@ -117,35 +164,54 @@
         }
     },
     /**
-     * 误差
+     * 直流增益
      */
-    ERROR {
+    DIGITAL_GAIN {
         /**
          * @param oscilloscope
          */
         @Override
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
-            oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
+            oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
-            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
-            oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
-            if (oscilloscope.getExceedMark() == 1) {
+            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
+            oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
+            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+                oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
+            }
+        }
+    },
+    /**
+     * 直流偏置
+     */
+    DIGITAL_OFFSET {
+        /**
+         * @param oscilloscope
+         */
+        @Override
+        public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
+            oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
+            oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
+            oscilloscope.setStandardValue(StringUtils.isNotBlank(oscilloscope.getStandardValue()) ? oscilloscope.getStandardValue() + oscilloscope.getStandardValueUnit() : "");
+            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getStandardValueUnit() : "");
+            oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
+            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
                 oscilloscope.setErrorValue(oscilloscope.getErrorValue() + "*");
             }
         }
     },
     /**
-     * 分贝数
+     * 频带宽度
      */
-    DECIBEL {
+    FREQUENCY_BANDWIDTH {
         /**
          * @param oscilloscope
          */
         @Override
         public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
             oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
-            oscilloscope.setVerticalScaleGear(StringUtils.isNotBlank(oscilloscope.getVerticalScaleGear()) ? oscilloscope.getVerticalScaleGear() + oscilloscope.getVerticalScaleGearUnit() : "");
+            oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
             oscilloscope.setReferenceAmplitude(StringUtils.isNotBlank(oscilloscope.getReferenceAmplitude()) ? oscilloscope.getReferenceAmplitude() + oscilloscope.getReferenceAmplitudeUnit() : "");
             oscilloscope.setMeasureAmplitude(StringUtils.isNotBlank(oscilloscope.getMeasureAmplitude()) ? oscilloscope.getMeasureAmplitude() + oscilloscope.getMeasureAmplitudeUnit() : "");
             oscilloscope.setDecibelNumber(StringUtils.isNotBlank(oscilloscope.getDecibelNumber()) ? oscilloscope.getDecibelNumber() + "dB" : "");
@@ -156,6 +222,59 @@
         }
     },
     /**
+     * 触发灵敏度
+     */
+    TRIGGER_SENSITIVITY {
+        /**
+         * @param oscilloscope
+         */
+        @Override
+        public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
+            oscilloscope.setSignalFrequency(StringUtils.isNotBlank(oscilloscope.getSignalFrequency()) ? oscilloscope.getSignalFrequency() + oscilloscope.getSignalFrequencyUnit() : "");
+            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
+            oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
+            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+                oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
+            }
+        }
+    },
+    /**
+     * 上升时间
+     */
+    DIGITAL_RISE_TIME {
+        /**
+         * @param oscilloscope
+         */
+        @Override
+        public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
+            oscilloscope.setImpedance(StringUtils.isNotBlank(oscilloscope.getImpedance()) ? oscilloscope.getImpedance() + oscilloscope.getImpedanceUnit() : "");
+            oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
+            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getMeasureValueUnit() : "");
+            oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
+            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getMeasureValue())) {
+                oscilloscope.setMeasureValue(oscilloscope.getMeasureValue() + "*");
+            }
+        }
+    },
+    /**
+     * 输入电阻
+     */
+    DIGITAL_INPUT_RESISTANCE {
+        /**
+         * @param oscilloscope
+         */
+        @Override
+        public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataOscilloscope oscilloscope) {
+            oscilloscope.setNominalValue(StringUtils.isNotBlank(oscilloscope.getNominalValue()) ? oscilloscope.getNominalValue() + oscilloscope.getNominalValueUnit() : "");
+            oscilloscope.setVerticalDeflectCoefficient(StringUtils.isNotBlank(oscilloscope.getVerticalDeflectCoefficient()) ? oscilloscope.getVerticalDeflectCoefficient() + oscilloscope.getVerticalDeflectCoefficientUnit() : "");
+            oscilloscope.setMeasureValue(StringUtils.isNotBlank(oscilloscope.getMeasureValue()) ? oscilloscope.getMeasureValue() + oscilloscope.getNominalValueUnit() : "");
+            oscilloscope.setTechnicalIndex(StringUtils.isNotBlank(oscilloscope.getTechnicalIndex()) ? oscilloscope.getTechnicalIndexSymbol() + oscilloscope.getTechnicalIndex() + oscilloscope.getTechnicalIndexUnit() : "");
+            if (oscilloscope.getExceedMark() == 1 && StringUtils.isNotBlank(oscilloscope.getRelativeError())) {
+                oscilloscope.setRelativeError(oscilloscope.getRelativeError() + "*");
+            }
+        }
+    },
+    /**
      * 数字校准信号
      */
     DIGITAL_CALIBRATION_SIGNAL {