diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index 3a811b9..5af9802 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -35,7 +35,7 @@
  */
 @Api(tags = "受检设备检定管理-检定项")
 @RestController
-@RequestMapping("/business/device/measureItemInfo")
+    @RequestMapping("/business/device/measureItemInfo")
 public class BizBusinessDeviceMeasureItemInfoController extends ExportController {
     @Autowired
     private IBizBusinessDeviceMeasureItemInfoService measureItemInfoService;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index 3a811b9..5af9802 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -35,7 +35,7 @@
  */
 @Api(tags = "受检设备检定管理-检定项")
 @RestController
-@RequestMapping("/business/device/measureItemInfo")
+    @RequestMapping("/business/device/measureItemInfo")
 public class BizBusinessDeviceMeasureItemInfoController extends ExportController {
     @Autowired
     private IBizBusinessDeviceMeasureItemInfoService measureItemInfoService;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
index 25201b7..a3088bb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
@@ -476,16 +476,27 @@
                 } else if ("稳幅正弦信号电压平坦度".equals(checkData.getParams())) {
                     BizEquipmentStandardCheckDataOscilloscope reference = checkDataOscilloscopeList.stream()
                             .filter(data -> 1 == data.getReferencePoint() && data.getTypeValue().equals(checkData.getTypeValue())).findFirst().get();
-                    BigDecimal referenceVoltageOne = sqrt(new BigDecimal(reference.getTestValueOne()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageTwo = sqrt(new BigDecimal(reference.getTestValueTwo()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageThree = sqrt(new BigDecimal(reference.getTestValueThree()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageFour = sqrt(new BigDecimal(reference.getTestValueFour()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageFive = sqrt(new BigDecimal(reference.getTestValueFive()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageSix = sqrt(new BigDecimal(reference.getTestValueSix()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageSeven = sqrt(new BigDecimal(reference.getTestValueSeven()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageEight = sqrt(new BigDecimal(reference.getTestValueEight()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageNine = sqrt(new BigDecimal(reference.getTestValueNine()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageTen = sqrt(new BigDecimal(reference.getTestValueTen()).multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal oneReference = UnitConvertUtil.powerConvert(reference.getTestValueOne(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageOne = sqrt(oneReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal twoReference = UnitConvertUtil.powerConvert(reference.getTestValueTwo(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageTwo = sqrt(twoReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal threeReference = UnitConvertUtil.powerConvert(reference.getTestValueThree(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageThree = sqrt(threeReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal fourReference = UnitConvertUtil.powerConvert(reference.getTestValueFour(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageFour = sqrt(fourReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal fiveReference = UnitConvertUtil.powerConvert(reference.getTestValueFive(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageFive = sqrt(fiveReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal sixReference = UnitConvertUtil.powerConvert(reference.getTestValueSix(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageSix = sqrt(sixReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal sevenReference = UnitConvertUtil.powerConvert(reference.getTestValueSeven(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageSeven = sqrt(sevenReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal eightReference = UnitConvertUtil.powerConvert(reference.getTestValueEight(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageEight = sqrt(eightReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal nineReference = UnitConvertUtil.powerConvert(reference.getTestValueNine(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageNine = sqrt(nineReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal tenReference = UnitConvertUtil.powerConvert(reference.getTestValueTen(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageTen = sqrt(tenReference.multiply(BigDecimal.valueOf(50)), 4);
+
                     //转换为电压值
                     BigDecimal one = UnitConvertUtil.powerConvert(checkData.getTestValueOne(), checkData.getTestValueUnit(), "W");
                     BigDecimal convertVoltageOne = sqrt(one.multiply(BigDecimal.valueOf(50)), 4);
@@ -538,70 +549,70 @@
                     checkData.setFlatnessOne("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageOne) != 0) {
                         flatnessOne = (convertVoltageOne.subtract(referenceVoltageOne)).divide(referenceVoltageOne, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessOne(String.valueOf(flatnessOne.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessOne(String.valueOf(flatnessOne.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessTwo = BigDecimal.ZERO;
                     checkData.setFlatnessTwo("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageTwo) != 0) {
                         flatnessTwo = (convertVoltageTwo.subtract(referenceVoltageTwo)).divide(referenceVoltageTwo, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessTwo(String.valueOf(flatnessTwo.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessTwo(String.valueOf(flatnessTwo.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessThree = BigDecimal.ZERO;
                     checkData.setFlatnessThree("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageThree) != 0) {
                         flatnessThree = convertVoltageThree.subtract(referenceVoltageThree).divide(referenceVoltageThree, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessThree(String.valueOf(flatnessThree.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessThree(String.valueOf(flatnessThree.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessFour = BigDecimal.ZERO;
                     checkData.setFlatnessFour("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageFour) != 0) {
                         flatnessFour = convertVoltageFour.subtract(referenceVoltageFour).divide(referenceVoltageFour, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessFour(String.valueOf(flatnessFour.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessFour(String.valueOf(flatnessFour.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessFive = BigDecimal.ZERO;
                     checkData.setFlatnessFive("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageFive) != 0) {
                         flatnessFive = convertVoltageFive.subtract(referenceVoltageFive).divide(referenceVoltageFive, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessFive(String.valueOf(flatnessFive.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessFive(String.valueOf(flatnessFive.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessSix = BigDecimal.ZERO;
                     checkData.setFlatnessSix("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageSix) != 0) {
                         flatnessSix = convertVoltageSix.subtract(referenceVoltageSix).divide(referenceVoltageSix, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessSix(String.valueOf(flatnessSix.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessSix(String.valueOf(flatnessSix.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessSeven = BigDecimal.ZERO;
                     checkData.setFlatnessSeven("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageSeven) != 0) {
                         flatnessSeven = convertVoltageSeven.subtract(referenceVoltageSeven).divide(referenceVoltageSeven, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessSeven(String.valueOf(flatnessSeven.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessSeven(String.valueOf(flatnessSeven.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessEight = BigDecimal.ZERO;
                     checkData.setFlatnessEight("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageEight) != 0) {
                         flatnessEight = convertVoltageEight.subtract(referenceVoltageEight).divide(referenceVoltageEight, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessEight(String.valueOf(flatnessEight.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessEight(String.valueOf(flatnessEight.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessNine = BigDecimal.ZERO;
                     checkData.setFlatnessNine("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageNine) != 0) {
                         flatnessNine = convertVoltageNine.subtract(referenceVoltageNine).divide(referenceVoltageNine, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessNine(String.valueOf(flatnessNine.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessNine(String.valueOf(flatnessNine.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessTen = BigDecimal.ZERO;
                     checkData.setFlatnessTen("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageTen) != 0) {
                         flatnessTen = convertVoltageTen.subtract(referenceVoltageTen).divide(referenceVoltageTen, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessTen(String.valueOf(flatnessTen.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index 3a811b9..5af9802 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -35,7 +35,7 @@
  */
 @Api(tags = "受检设备检定管理-检定项")
 @RestController
-@RequestMapping("/business/device/measureItemInfo")
+    @RequestMapping("/business/device/measureItemInfo")
 public class BizBusinessDeviceMeasureItemInfoController extends ExportController {
     @Autowired
     private IBizBusinessDeviceMeasureItemInfoService measureItemInfoService;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
index 25201b7..a3088bb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
@@ -476,16 +476,27 @@
                 } else if ("稳幅正弦信号电压平坦度".equals(checkData.getParams())) {
                     BizEquipmentStandardCheckDataOscilloscope reference = checkDataOscilloscopeList.stream()
                             .filter(data -> 1 == data.getReferencePoint() && data.getTypeValue().equals(checkData.getTypeValue())).findFirst().get();
-                    BigDecimal referenceVoltageOne = sqrt(new BigDecimal(reference.getTestValueOne()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageTwo = sqrt(new BigDecimal(reference.getTestValueTwo()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageThree = sqrt(new BigDecimal(reference.getTestValueThree()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageFour = sqrt(new BigDecimal(reference.getTestValueFour()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageFive = sqrt(new BigDecimal(reference.getTestValueFive()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageSix = sqrt(new BigDecimal(reference.getTestValueSix()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageSeven = sqrt(new BigDecimal(reference.getTestValueSeven()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageEight = sqrt(new BigDecimal(reference.getTestValueEight()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageNine = sqrt(new BigDecimal(reference.getTestValueNine()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageTen = sqrt(new BigDecimal(reference.getTestValueTen()).multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal oneReference = UnitConvertUtil.powerConvert(reference.getTestValueOne(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageOne = sqrt(oneReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal twoReference = UnitConvertUtil.powerConvert(reference.getTestValueTwo(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageTwo = sqrt(twoReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal threeReference = UnitConvertUtil.powerConvert(reference.getTestValueThree(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageThree = sqrt(threeReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal fourReference = UnitConvertUtil.powerConvert(reference.getTestValueFour(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageFour = sqrt(fourReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal fiveReference = UnitConvertUtil.powerConvert(reference.getTestValueFive(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageFive = sqrt(fiveReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal sixReference = UnitConvertUtil.powerConvert(reference.getTestValueSix(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageSix = sqrt(sixReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal sevenReference = UnitConvertUtil.powerConvert(reference.getTestValueSeven(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageSeven = sqrt(sevenReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal eightReference = UnitConvertUtil.powerConvert(reference.getTestValueEight(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageEight = sqrt(eightReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal nineReference = UnitConvertUtil.powerConvert(reference.getTestValueNine(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageNine = sqrt(nineReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal tenReference = UnitConvertUtil.powerConvert(reference.getTestValueTen(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageTen = sqrt(tenReference.multiply(BigDecimal.valueOf(50)), 4);
+
                     //转换为电压值
                     BigDecimal one = UnitConvertUtil.powerConvert(checkData.getTestValueOne(), checkData.getTestValueUnit(), "W");
                     BigDecimal convertVoltageOne = sqrt(one.multiply(BigDecimal.valueOf(50)), 4);
@@ -538,70 +549,70 @@
                     checkData.setFlatnessOne("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageOne) != 0) {
                         flatnessOne = (convertVoltageOne.subtract(referenceVoltageOne)).divide(referenceVoltageOne, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessOne(String.valueOf(flatnessOne.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessOne(String.valueOf(flatnessOne.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessTwo = BigDecimal.ZERO;
                     checkData.setFlatnessTwo("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageTwo) != 0) {
                         flatnessTwo = (convertVoltageTwo.subtract(referenceVoltageTwo)).divide(referenceVoltageTwo, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessTwo(String.valueOf(flatnessTwo.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessTwo(String.valueOf(flatnessTwo.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessThree = BigDecimal.ZERO;
                     checkData.setFlatnessThree("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageThree) != 0) {
                         flatnessThree = convertVoltageThree.subtract(referenceVoltageThree).divide(referenceVoltageThree, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessThree(String.valueOf(flatnessThree.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessThree(String.valueOf(flatnessThree.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessFour = BigDecimal.ZERO;
                     checkData.setFlatnessFour("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageFour) != 0) {
                         flatnessFour = convertVoltageFour.subtract(referenceVoltageFour).divide(referenceVoltageFour, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessFour(String.valueOf(flatnessFour.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessFour(String.valueOf(flatnessFour.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessFive = BigDecimal.ZERO;
                     checkData.setFlatnessFive("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageFive) != 0) {
                         flatnessFive = convertVoltageFive.subtract(referenceVoltageFive).divide(referenceVoltageFive, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessFive(String.valueOf(flatnessFive.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessFive(String.valueOf(flatnessFive.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessSix = BigDecimal.ZERO;
                     checkData.setFlatnessSix("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageSix) != 0) {
                         flatnessSix = convertVoltageSix.subtract(referenceVoltageSix).divide(referenceVoltageSix, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessSix(String.valueOf(flatnessSix.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessSix(String.valueOf(flatnessSix.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessSeven = BigDecimal.ZERO;
                     checkData.setFlatnessSeven("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageSeven) != 0) {
                         flatnessSeven = convertVoltageSeven.subtract(referenceVoltageSeven).divide(referenceVoltageSeven, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessSeven(String.valueOf(flatnessSeven.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessSeven(String.valueOf(flatnessSeven.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessEight = BigDecimal.ZERO;
                     checkData.setFlatnessEight("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageEight) != 0) {
                         flatnessEight = convertVoltageEight.subtract(referenceVoltageEight).divide(referenceVoltageEight, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessEight(String.valueOf(flatnessEight.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessEight(String.valueOf(flatnessEight.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessNine = BigDecimal.ZERO;
                     checkData.setFlatnessNine("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageNine) != 0) {
                         flatnessNine = convertVoltageNine.subtract(referenceVoltageNine).divide(referenceVoltageNine, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessNine(String.valueOf(flatnessNine.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessNine(String.valueOf(flatnessNine.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessTen = BigDecimal.ZERO;
                     checkData.setFlatnessTen("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageTen) != 0) {
                         flatnessTen = convertVoltageTen.subtract(referenceVoltageTen).divide(referenceVoltageTen, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessTen(String.valueOf(flatnessTen.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen);
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
index da11bd6..e611ea3 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
@@ -223,9 +223,12 @@
     </select>
 
     <select id="listPageForInterchange" resultType="com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse">
-        SELECT eei.id AS sampleId, eei.sampleNo, eei.sampleName, eei.sampleModel, bor.appendix_descn, bor.appearance_inspect, bor.special_require, bor.measure_content
+        SELECT eei.id AS sampleId, eei.sampleNo, eei.sampleName, eei.sampleModel, bor.appendix_descn, bor.appearance_inspect,
+        bor.special_require, bor.measure_content, eei.manufacture_no AS manufactureNo, eei.manufacturer, eei.certificate_valid AS certificateValid,
+        eei.meter_identify AS meterIdentify, eei.limit_instruction AS limitInstruction
         FROM (
-            SELECT id, equipment_no AS sampleNo, equipment_name AS sampleName, model AS sampleModel
+            SELECT id, equipment_no AS sampleNo, equipment_name AS sampleName, model AS sampleModel, manufacture_no, manufacturer, certificate_valid,
+                meter_identify, limit_instruction
             FROM eqpt_equipment_info
             WHERE 1=1
             <if test="request != null and request.sampleNo != null and request.sampleNo !=''">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index 3a811b9..5af9802 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -35,7 +35,7 @@
  */
 @Api(tags = "受检设备检定管理-检定项")
 @RestController
-@RequestMapping("/business/device/measureItemInfo")
+    @RequestMapping("/business/device/measureItemInfo")
 public class BizBusinessDeviceMeasureItemInfoController extends ExportController {
     @Autowired
     private IBizBusinessDeviceMeasureItemInfoService measureItemInfoService;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
index 25201b7..a3088bb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
@@ -476,16 +476,27 @@
                 } else if ("稳幅正弦信号电压平坦度".equals(checkData.getParams())) {
                     BizEquipmentStandardCheckDataOscilloscope reference = checkDataOscilloscopeList.stream()
                             .filter(data -> 1 == data.getReferencePoint() && data.getTypeValue().equals(checkData.getTypeValue())).findFirst().get();
-                    BigDecimal referenceVoltageOne = sqrt(new BigDecimal(reference.getTestValueOne()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageTwo = sqrt(new BigDecimal(reference.getTestValueTwo()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageThree = sqrt(new BigDecimal(reference.getTestValueThree()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageFour = sqrt(new BigDecimal(reference.getTestValueFour()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageFive = sqrt(new BigDecimal(reference.getTestValueFive()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageSix = sqrt(new BigDecimal(reference.getTestValueSix()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageSeven = sqrt(new BigDecimal(reference.getTestValueSeven()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageEight = sqrt(new BigDecimal(reference.getTestValueEight()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageNine = sqrt(new BigDecimal(reference.getTestValueNine()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageTen = sqrt(new BigDecimal(reference.getTestValueTen()).multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal oneReference = UnitConvertUtil.powerConvert(reference.getTestValueOne(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageOne = sqrt(oneReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal twoReference = UnitConvertUtil.powerConvert(reference.getTestValueTwo(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageTwo = sqrt(twoReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal threeReference = UnitConvertUtil.powerConvert(reference.getTestValueThree(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageThree = sqrt(threeReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal fourReference = UnitConvertUtil.powerConvert(reference.getTestValueFour(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageFour = sqrt(fourReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal fiveReference = UnitConvertUtil.powerConvert(reference.getTestValueFive(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageFive = sqrt(fiveReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal sixReference = UnitConvertUtil.powerConvert(reference.getTestValueSix(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageSix = sqrt(sixReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal sevenReference = UnitConvertUtil.powerConvert(reference.getTestValueSeven(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageSeven = sqrt(sevenReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal eightReference = UnitConvertUtil.powerConvert(reference.getTestValueEight(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageEight = sqrt(eightReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal nineReference = UnitConvertUtil.powerConvert(reference.getTestValueNine(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageNine = sqrt(nineReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal tenReference = UnitConvertUtil.powerConvert(reference.getTestValueTen(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageTen = sqrt(tenReference.multiply(BigDecimal.valueOf(50)), 4);
+
                     //转换为电压值
                     BigDecimal one = UnitConvertUtil.powerConvert(checkData.getTestValueOne(), checkData.getTestValueUnit(), "W");
                     BigDecimal convertVoltageOne = sqrt(one.multiply(BigDecimal.valueOf(50)), 4);
@@ -538,70 +549,70 @@
                     checkData.setFlatnessOne("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageOne) != 0) {
                         flatnessOne = (convertVoltageOne.subtract(referenceVoltageOne)).divide(referenceVoltageOne, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessOne(String.valueOf(flatnessOne.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessOne(String.valueOf(flatnessOne.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessTwo = BigDecimal.ZERO;
                     checkData.setFlatnessTwo("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageTwo) != 0) {
                         flatnessTwo = (convertVoltageTwo.subtract(referenceVoltageTwo)).divide(referenceVoltageTwo, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessTwo(String.valueOf(flatnessTwo.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessTwo(String.valueOf(flatnessTwo.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessThree = BigDecimal.ZERO;
                     checkData.setFlatnessThree("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageThree) != 0) {
                         flatnessThree = convertVoltageThree.subtract(referenceVoltageThree).divide(referenceVoltageThree, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessThree(String.valueOf(flatnessThree.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessThree(String.valueOf(flatnessThree.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessFour = BigDecimal.ZERO;
                     checkData.setFlatnessFour("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageFour) != 0) {
                         flatnessFour = convertVoltageFour.subtract(referenceVoltageFour).divide(referenceVoltageFour, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessFour(String.valueOf(flatnessFour.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessFour(String.valueOf(flatnessFour.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessFive = BigDecimal.ZERO;
                     checkData.setFlatnessFive("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageFive) != 0) {
                         flatnessFive = convertVoltageFive.subtract(referenceVoltageFive).divide(referenceVoltageFive, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessFive(String.valueOf(flatnessFive.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessFive(String.valueOf(flatnessFive.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessSix = BigDecimal.ZERO;
                     checkData.setFlatnessSix("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageSix) != 0) {
                         flatnessSix = convertVoltageSix.subtract(referenceVoltageSix).divide(referenceVoltageSix, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessSix(String.valueOf(flatnessSix.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessSix(String.valueOf(flatnessSix.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessSeven = BigDecimal.ZERO;
                     checkData.setFlatnessSeven("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageSeven) != 0) {
                         flatnessSeven = convertVoltageSeven.subtract(referenceVoltageSeven).divide(referenceVoltageSeven, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessSeven(String.valueOf(flatnessSeven.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessSeven(String.valueOf(flatnessSeven.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessEight = BigDecimal.ZERO;
                     checkData.setFlatnessEight("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageEight) != 0) {
                         flatnessEight = convertVoltageEight.subtract(referenceVoltageEight).divide(referenceVoltageEight, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessEight(String.valueOf(flatnessEight.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessEight(String.valueOf(flatnessEight.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessNine = BigDecimal.ZERO;
                     checkData.setFlatnessNine("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageNine) != 0) {
                         flatnessNine = convertVoltageNine.subtract(referenceVoltageNine).divide(referenceVoltageNine, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessNine(String.valueOf(flatnessNine.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessNine(String.valueOf(flatnessNine.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessTen = BigDecimal.ZERO;
                     checkData.setFlatnessTen("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageTen) != 0) {
                         flatnessTen = convertVoltageTen.subtract(referenceVoltageTen).divide(referenceVoltageTen, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessTen(String.valueOf(flatnessTen.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen);
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
index da11bd6..e611ea3 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
@@ -223,9 +223,12 @@
     </select>
 
     <select id="listPageForInterchange" resultType="com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse">
-        SELECT eei.id AS sampleId, eei.sampleNo, eei.sampleName, eei.sampleModel, bor.appendix_descn, bor.appearance_inspect, bor.special_require, bor.measure_content
+        SELECT eei.id AS sampleId, eei.sampleNo, eei.sampleName, eei.sampleModel, bor.appendix_descn, bor.appearance_inspect,
+        bor.special_require, bor.measure_content, eei.manufacture_no AS manufactureNo, eei.manufacturer, eei.certificate_valid AS certificateValid,
+        eei.meter_identify AS meterIdentify, eei.limit_instruction AS limitInstruction
         FROM (
-            SELECT id, equipment_no AS sampleNo, equipment_name AS sampleName, model AS sampleModel
+            SELECT id, equipment_no AS sampleNo, equipment_name AS sampleName, model AS sampleModel, manufacture_no, manufacturer, certificate_valid,
+                meter_identify, limit_instruction
             FROM eqpt_equipment_info
             WHERE 1=1
             <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 5aaa3f9..191b0fc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -35,7 +35,7 @@
         eei.manufacture_no AS manufactureNo, eei.manufacturer, eei.help_instruction AS helpInstruction, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id,
         bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, bo.customer_address,
         blei.measure_person_id, eei.RFID AS labelBind, bbdmi.measure_valid_date AS certificateValid, bbdmi.trace_date, bbdmi.conclusion, bbdmi.restriction_instruction,
-        bbdmi.meter_identify, eei.category, bbdmi.id AS dataId
+        bbdmi.meter_identify, eei.category, bbdmi.id AS dataId, eei.certificate_valid AS deviceCertificateValid
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index 3a811b9..5af9802 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -35,7 +35,7 @@
  */
 @Api(tags = "受检设备检定管理-检定项")
 @RestController
-@RequestMapping("/business/device/measureItemInfo")
+    @RequestMapping("/business/device/measureItemInfo")
 public class BizBusinessDeviceMeasureItemInfoController extends ExportController {
     @Autowired
     private IBizBusinessDeviceMeasureItemInfoService measureItemInfoService;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
index 25201b7..a3088bb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
@@ -476,16 +476,27 @@
                 } else if ("稳幅正弦信号电压平坦度".equals(checkData.getParams())) {
                     BizEquipmentStandardCheckDataOscilloscope reference = checkDataOscilloscopeList.stream()
                             .filter(data -> 1 == data.getReferencePoint() && data.getTypeValue().equals(checkData.getTypeValue())).findFirst().get();
-                    BigDecimal referenceVoltageOne = sqrt(new BigDecimal(reference.getTestValueOne()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageTwo = sqrt(new BigDecimal(reference.getTestValueTwo()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageThree = sqrt(new BigDecimal(reference.getTestValueThree()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageFour = sqrt(new BigDecimal(reference.getTestValueFour()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageFive = sqrt(new BigDecimal(reference.getTestValueFive()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageSix = sqrt(new BigDecimal(reference.getTestValueSix()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageSeven = sqrt(new BigDecimal(reference.getTestValueSeven()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageEight = sqrt(new BigDecimal(reference.getTestValueEight()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageNine = sqrt(new BigDecimal(reference.getTestValueNine()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageTen = sqrt(new BigDecimal(reference.getTestValueTen()).multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal oneReference = UnitConvertUtil.powerConvert(reference.getTestValueOne(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageOne = sqrt(oneReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal twoReference = UnitConvertUtil.powerConvert(reference.getTestValueTwo(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageTwo = sqrt(twoReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal threeReference = UnitConvertUtil.powerConvert(reference.getTestValueThree(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageThree = sqrt(threeReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal fourReference = UnitConvertUtil.powerConvert(reference.getTestValueFour(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageFour = sqrt(fourReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal fiveReference = UnitConvertUtil.powerConvert(reference.getTestValueFive(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageFive = sqrt(fiveReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal sixReference = UnitConvertUtil.powerConvert(reference.getTestValueSix(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageSix = sqrt(sixReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal sevenReference = UnitConvertUtil.powerConvert(reference.getTestValueSeven(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageSeven = sqrt(sevenReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal eightReference = UnitConvertUtil.powerConvert(reference.getTestValueEight(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageEight = sqrt(eightReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal nineReference = UnitConvertUtil.powerConvert(reference.getTestValueNine(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageNine = sqrt(nineReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal tenReference = UnitConvertUtil.powerConvert(reference.getTestValueTen(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageTen = sqrt(tenReference.multiply(BigDecimal.valueOf(50)), 4);
+
                     //转换为电压值
                     BigDecimal one = UnitConvertUtil.powerConvert(checkData.getTestValueOne(), checkData.getTestValueUnit(), "W");
                     BigDecimal convertVoltageOne = sqrt(one.multiply(BigDecimal.valueOf(50)), 4);
@@ -538,70 +549,70 @@
                     checkData.setFlatnessOne("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageOne) != 0) {
                         flatnessOne = (convertVoltageOne.subtract(referenceVoltageOne)).divide(referenceVoltageOne, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessOne(String.valueOf(flatnessOne.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessOne(String.valueOf(flatnessOne.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessTwo = BigDecimal.ZERO;
                     checkData.setFlatnessTwo("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageTwo) != 0) {
                         flatnessTwo = (convertVoltageTwo.subtract(referenceVoltageTwo)).divide(referenceVoltageTwo, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessTwo(String.valueOf(flatnessTwo.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessTwo(String.valueOf(flatnessTwo.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessThree = BigDecimal.ZERO;
                     checkData.setFlatnessThree("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageThree) != 0) {
                         flatnessThree = convertVoltageThree.subtract(referenceVoltageThree).divide(referenceVoltageThree, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessThree(String.valueOf(flatnessThree.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessThree(String.valueOf(flatnessThree.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessFour = BigDecimal.ZERO;
                     checkData.setFlatnessFour("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageFour) != 0) {
                         flatnessFour = convertVoltageFour.subtract(referenceVoltageFour).divide(referenceVoltageFour, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessFour(String.valueOf(flatnessFour.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessFour(String.valueOf(flatnessFour.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessFive = BigDecimal.ZERO;
                     checkData.setFlatnessFive("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageFive) != 0) {
                         flatnessFive = convertVoltageFive.subtract(referenceVoltageFive).divide(referenceVoltageFive, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessFive(String.valueOf(flatnessFive.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessFive(String.valueOf(flatnessFive.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessSix = BigDecimal.ZERO;
                     checkData.setFlatnessSix("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageSix) != 0) {
                         flatnessSix = convertVoltageSix.subtract(referenceVoltageSix).divide(referenceVoltageSix, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessSix(String.valueOf(flatnessSix.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessSix(String.valueOf(flatnessSix.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessSeven = BigDecimal.ZERO;
                     checkData.setFlatnessSeven("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageSeven) != 0) {
                         flatnessSeven = convertVoltageSeven.subtract(referenceVoltageSeven).divide(referenceVoltageSeven, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessSeven(String.valueOf(flatnessSeven.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessSeven(String.valueOf(flatnessSeven.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessEight = BigDecimal.ZERO;
                     checkData.setFlatnessEight("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageEight) != 0) {
                         flatnessEight = convertVoltageEight.subtract(referenceVoltageEight).divide(referenceVoltageEight, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessEight(String.valueOf(flatnessEight.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessEight(String.valueOf(flatnessEight.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessNine = BigDecimal.ZERO;
                     checkData.setFlatnessNine("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageNine) != 0) {
                         flatnessNine = convertVoltageNine.subtract(referenceVoltageNine).divide(referenceVoltageNine, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessNine(String.valueOf(flatnessNine.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessNine(String.valueOf(flatnessNine.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessTen = BigDecimal.ZERO;
                     checkData.setFlatnessTen("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageTen) != 0) {
                         flatnessTen = convertVoltageTen.subtract(referenceVoltageTen).divide(referenceVoltageTen, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessTen(String.valueOf(flatnessTen.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen);
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
index da11bd6..e611ea3 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
@@ -223,9 +223,12 @@
     </select>
 
     <select id="listPageForInterchange" resultType="com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse">
-        SELECT eei.id AS sampleId, eei.sampleNo, eei.sampleName, eei.sampleModel, bor.appendix_descn, bor.appearance_inspect, bor.special_require, bor.measure_content
+        SELECT eei.id AS sampleId, eei.sampleNo, eei.sampleName, eei.sampleModel, bor.appendix_descn, bor.appearance_inspect,
+        bor.special_require, bor.measure_content, eei.manufacture_no AS manufactureNo, eei.manufacturer, eei.certificate_valid AS certificateValid,
+        eei.meter_identify AS meterIdentify, eei.limit_instruction AS limitInstruction
         FROM (
-            SELECT id, equipment_no AS sampleNo, equipment_name AS sampleName, model AS sampleModel
+            SELECT id, equipment_no AS sampleNo, equipment_name AS sampleName, model AS sampleModel, manufacture_no, manufacturer, certificate_valid,
+                meter_identify, limit_instruction
             FROM eqpt_equipment_info
             WHERE 1=1
             <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 5aaa3f9..191b0fc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -35,7 +35,7 @@
         eei.manufacture_no AS manufactureNo, eei.manufacturer, eei.help_instruction AS helpInstruction, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id,
         bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, bo.customer_address,
         blei.measure_person_id, eei.RFID AS labelBind, bbdmi.measure_valid_date AS certificateValid, bbdmi.trace_date, bbdmi.conclusion, bbdmi.restriction_instruction,
-        bbdmi.meter_identify, eei.category, bbdmi.id AS dataId
+        bbdmi.meter_identify, eei.category, bbdmi.id AS dataId, eei.certificate_valid AS deviceCertificateValid
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java
index 7bcc149..bdb529b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java
@@ -44,6 +44,18 @@
     @ApiModelProperty(value = "出厂编号", dataType = "String")
     private String manufactureNo;
 
+    @ApiModelProperty("生产厂家")
+    private String manufacturer;
+
+    @ApiModelProperty("计量标识")
+    private String meterIdentify;
+
+    @ApiModelProperty(value = "限用说明", dataType = "String")
+    private String restrictionInstruction;
+
+    @ApiModelProperty(value = "受检设备证书有效期", dataType = "String")
+    private String deviceCertificateValid;
+
     @ApiModelProperty(value = "标签绑定", dataType = "String")
     private String labelBind;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index 3a811b9..5af9802 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -35,7 +35,7 @@
  */
 @Api(tags = "受检设备检定管理-检定项")
 @RestController
-@RequestMapping("/business/device/measureItemInfo")
+    @RequestMapping("/business/device/measureItemInfo")
 public class BizBusinessDeviceMeasureItemInfoController extends ExportController {
     @Autowired
     private IBizBusinessDeviceMeasureItemInfoService measureItemInfoService;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
index 25201b7..a3088bb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/CheckInfoFormulaCalculateUtil.java
@@ -476,16 +476,27 @@
                 } else if ("稳幅正弦信号电压平坦度".equals(checkData.getParams())) {
                     BizEquipmentStandardCheckDataOscilloscope reference = checkDataOscilloscopeList.stream()
                             .filter(data -> 1 == data.getReferencePoint() && data.getTypeValue().equals(checkData.getTypeValue())).findFirst().get();
-                    BigDecimal referenceVoltageOne = sqrt(new BigDecimal(reference.getTestValueOne()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageTwo = sqrt(new BigDecimal(reference.getTestValueTwo()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageThree = sqrt(new BigDecimal(reference.getTestValueThree()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageFour = sqrt(new BigDecimal(reference.getTestValueFour()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageFive = sqrt(new BigDecimal(reference.getTestValueFive()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageSix = sqrt(new BigDecimal(reference.getTestValueSix()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageSeven = sqrt(new BigDecimal(reference.getTestValueSeven()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageEight = sqrt(new BigDecimal(reference.getTestValueEight()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageNine = sqrt(new BigDecimal(reference.getTestValueNine()).multiply(BigDecimal.valueOf(50)), 4);
-                    BigDecimal referenceVoltageTen = sqrt(new BigDecimal(reference.getTestValueTen()).multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal oneReference = UnitConvertUtil.powerConvert(reference.getTestValueOne(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageOne = sqrt(oneReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal twoReference = UnitConvertUtil.powerConvert(reference.getTestValueTwo(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageTwo = sqrt(twoReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal threeReference = UnitConvertUtil.powerConvert(reference.getTestValueThree(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageThree = sqrt(threeReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal fourReference = UnitConvertUtil.powerConvert(reference.getTestValueFour(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageFour = sqrt(fourReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal fiveReference = UnitConvertUtil.powerConvert(reference.getTestValueFive(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageFive = sqrt(fiveReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal sixReference = UnitConvertUtil.powerConvert(reference.getTestValueSix(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageSix = sqrt(sixReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal sevenReference = UnitConvertUtil.powerConvert(reference.getTestValueSeven(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageSeven = sqrt(sevenReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal eightReference = UnitConvertUtil.powerConvert(reference.getTestValueEight(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageEight = sqrt(eightReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal nineReference = UnitConvertUtil.powerConvert(reference.getTestValueNine(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageNine = sqrt(nineReference.multiply(BigDecimal.valueOf(50)), 4);
+                    BigDecimal tenReference = UnitConvertUtil.powerConvert(reference.getTestValueTen(), reference.getTestValueUnit(), "W");
+                    BigDecimal referenceVoltageTen = sqrt(tenReference.multiply(BigDecimal.valueOf(50)), 4);
+
                     //转换为电压值
                     BigDecimal one = UnitConvertUtil.powerConvert(checkData.getTestValueOne(), checkData.getTestValueUnit(), "W");
                     BigDecimal convertVoltageOne = sqrt(one.multiply(BigDecimal.valueOf(50)), 4);
@@ -538,70 +549,70 @@
                     checkData.setFlatnessOne("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageOne) != 0) {
                         flatnessOne = (convertVoltageOne.subtract(referenceVoltageOne)).divide(referenceVoltageOne, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessOne(String.valueOf(flatnessOne.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessOne(String.valueOf(flatnessOne.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessTwo = BigDecimal.ZERO;
                     checkData.setFlatnessTwo("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageTwo) != 0) {
                         flatnessTwo = (convertVoltageTwo.subtract(referenceVoltageTwo)).divide(referenceVoltageTwo, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessTwo(String.valueOf(flatnessTwo.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessTwo(String.valueOf(flatnessTwo.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessThree = BigDecimal.ZERO;
                     checkData.setFlatnessThree("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageThree) != 0) {
                         flatnessThree = convertVoltageThree.subtract(referenceVoltageThree).divide(referenceVoltageThree, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessThree(String.valueOf(flatnessThree.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessThree(String.valueOf(flatnessThree.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessFour = BigDecimal.ZERO;
                     checkData.setFlatnessFour("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageFour) != 0) {
                         flatnessFour = convertVoltageFour.subtract(referenceVoltageFour).divide(referenceVoltageFour, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessFour(String.valueOf(flatnessFour.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessFour(String.valueOf(flatnessFour.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessFive = BigDecimal.ZERO;
                     checkData.setFlatnessFive("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageFive) != 0) {
                         flatnessFive = convertVoltageFive.subtract(referenceVoltageFive).divide(referenceVoltageFive, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessFive(String.valueOf(flatnessFive.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessFive(String.valueOf(flatnessFive.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessSix = BigDecimal.ZERO;
                     checkData.setFlatnessSix("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageSix) != 0) {
                         flatnessSix = convertVoltageSix.subtract(referenceVoltageSix).divide(referenceVoltageSix, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessSix(String.valueOf(flatnessSix.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessSix(String.valueOf(flatnessSix.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessSeven = BigDecimal.ZERO;
                     checkData.setFlatnessSeven("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageSeven) != 0) {
                         flatnessSeven = convertVoltageSeven.subtract(referenceVoltageSeven).divide(referenceVoltageSeven, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessSeven(String.valueOf(flatnessSeven.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessSeven(String.valueOf(flatnessSeven.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessEight = BigDecimal.ZERO;
                     checkData.setFlatnessEight("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageEight) != 0) {
                         flatnessEight = convertVoltageEight.subtract(referenceVoltageEight).divide(referenceVoltageEight, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessEight(String.valueOf(flatnessEight.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessEight(String.valueOf(flatnessEight.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessNine = BigDecimal.ZERO;
                     checkData.setFlatnessNine("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageNine) != 0) {
                         flatnessNine = convertVoltageNine.subtract(referenceVoltageNine).divide(referenceVoltageNine, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessNine(String.valueOf(flatnessNine.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessNine(String.valueOf(flatnessNine.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal flatnessTen = BigDecimal.ZERO;
                     checkData.setFlatnessTen("0");
                     if (BigDecimal.ZERO.compareTo(referenceVoltageTen) != 0) {
                         flatnessTen = convertVoltageTen.subtract(referenceVoltageTen).divide(referenceVoltageTen, 10, RoundingMode.HALF_UP);
-                        checkData.setFlatnessTen(String.valueOf(flatnessTen.divide(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
+                        checkData.setFlatnessTen(String.valueOf(flatnessTen.multiply(BigDecimal.valueOf(100)).round(new MathContext(3, RoundingMode.HALF_UP))));
                     }
 
                     BigDecimal sum = flatnessOne.add(flatnessTwo).add(flatnessThree).add(flatnessFour).add(flatnessFive).add(flatnessSix).add(flatnessSeven).add(flatnessEight).add(flatnessNine).add(flatnessTen);
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
index da11bd6..e611ea3 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml
@@ -223,9 +223,12 @@
     </select>
 
     <select id="listPageForInterchange" resultType="com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse">
-        SELECT eei.id AS sampleId, eei.sampleNo, eei.sampleName, eei.sampleModel, bor.appendix_descn, bor.appearance_inspect, bor.special_require, bor.measure_content
+        SELECT eei.id AS sampleId, eei.sampleNo, eei.sampleName, eei.sampleModel, bor.appendix_descn, bor.appearance_inspect,
+        bor.special_require, bor.measure_content, eei.manufacture_no AS manufactureNo, eei.manufacturer, eei.certificate_valid AS certificateValid,
+        eei.meter_identify AS meterIdentify, eei.limit_instruction AS limitInstruction
         FROM (
-            SELECT id, equipment_no AS sampleNo, equipment_name AS sampleName, model AS sampleModel
+            SELECT id, equipment_no AS sampleNo, equipment_name AS sampleName, model AS sampleModel, manufacture_no, manufacturer, certificate_valid,
+                meter_identify, limit_instruction
             FROM eqpt_equipment_info
             WHERE 1=1
             <if test="request != null and request.sampleNo != null and request.sampleNo !=''">
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index 5aaa3f9..191b0fc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -35,7 +35,7 @@
         eei.manufacture_no AS manufactureNo, eei.manufacturer, eei.help_instruction AS helpInstruction, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id,
         bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, bo.customer_address,
         blei.measure_person_id, eei.RFID AS labelBind, bbdmi.measure_valid_date AS certificateValid, bbdmi.trace_date, bbdmi.conclusion, bbdmi.restriction_instruction,
-        bbdmi.meter_identify, eei.category, bbdmi.id AS dataId
+        bbdmi.meter_identify, eei.category, bbdmi.id AS dataId, eei.certificate_valid AS deviceCertificateValid
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java
index 7bcc149..bdb529b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java
@@ -44,6 +44,18 @@
     @ApiModelProperty(value = "出厂编号", dataType = "String")
     private String manufactureNo;
 
+    @ApiModelProperty("生产厂家")
+    private String manufacturer;
+
+    @ApiModelProperty("计量标识")
+    private String meterIdentify;
+
+    @ApiModelProperty(value = "限用说明", dataType = "String")
+    private String restrictionInstruction;
+
+    @ApiModelProperty(value = "受检设备证书有效期", dataType = "String")
+    private String deviceCertificateValid;
+
     @ApiModelProperty(value = "标签绑定", dataType = "String")
     private String labelBind;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index eda8d6e..f3c2077 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -447,6 +447,10 @@
         Page<SampleLabExecutiveListResponse> resultPage = new Page<>();
         switch (measureStatus) {
             //待检测，查询本人待检测状态
+            case MeasureStatusEnum.TO_ALLOCATE:
+                resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.TO_ALLOCATE);
+                break;
+            //待检测，查询本人待检测状态
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.TO_MEASURE);
                 //当前检定环节:具体实验室，已出具证书：无，出具证书总数:无
@@ -455,7 +459,6 @@
 //                    lab.setCurrentSegment(lab.getMeasureDeptName());
 //                });
                 break;
-
             //检测中，查询本人检测中
             case MeasureStatusEnum.IN_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE);
@@ -468,7 +471,6 @@
 //                    lab.setAlreadyCertifications(alreadyCertificateNum);
 //                });
                 break;
-
             //检测完，查询本人检测完，当前检定环节:其他实验室/检测完，已出具证书：查询证书报告表/无，证书总数：具体实验室/无
             case MeasureStatusEnum.MEASURE_COMPLETE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.MEASURE_COMPLETE);
@@ -624,7 +626,7 @@
         if (itemCategoryNameList.size() == 1) {
             String one = itemCategoryNameList.get(0);
             for (String identifiableWork : identifiableWorkList) {
-                if (identifiableWork.contains(one)) {
+                if (StringUtils.isNotBlank(identifiableWork) && identifiableWork.contains(one)) {
                     flag = 1;
                 }
             }
@@ -968,7 +970,7 @@
                 //扫描检完：我的任务场景+检测中状态
                 request.setMeasureStatus(MeasureStatusEnum.IN_MEASURE);
             } else if (status.equals("3")) {
-                //扫描检完：我的任务场景+待分配状态
+                //扫描收入：我的任务场景+待分配状态
                 request.setMeasureStatus(MeasureStatusEnum.TO_ALLOCATE);
             }
             Page<SampleLabExecutiveListResponse> sampleLabExecutiveListResponsePage = this.myLabExecutiveListPage(page, request);