diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java
index 5ec34db..ab00d22 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java
@@ -127,26 +127,23 @@
                     return f;
                 })
                 .collect(Collectors.toList());
-        List<String> dateList = freStaList.stream()
-                .flatMap(f -> Stream.of(f.getTestValueOneDate(),
-                        f.getTestValueTwoDate(),
-                        f.getTestValueThreeDate(),
-                        f.getTestValueFourDate(),
-                        f.getTestValueFiveDate(),
-                        f.getTestValueSixDate()))
-                .map(f -> {
-                    if (StringUtils.isNotBlank(f)) {
-                        DateUtil.format(DateUtil.parseDate(f), "yyyy/MM/dd");
-                    }
-                    return f;
-                })
-                .collect(Collectors.toList());
+
+        BizEquipmentStandardCheckDataSpectrumAnalyzer analyzer = freStaList.get(0);
+        String oneDate = formatDate(analyzer.getTestValueOneDate());
+        String twoDate = formatDate(analyzer.getTestValueTwoDate());
+        String threeDate = formatDate(analyzer.getTestValueThreeDate());
+        String fourDate = formatDate(analyzer.getTestValueFourDate());
+        String fiveDate = formatDate(analyzer.getTestValueFiveDate());
+        String sixDate = formatDate(analyzer.getTestValueSixDate());
 
         map.put("freRepList", freRepList);
         map.put("freStaList", freStaList);
-        for (int i = 0; i < dateList.size(); i++) {
-            map.put("freStaDate" + (i + 1), dateList.get(i));
-        }
+        map.put("freStaDate"+ 1, oneDate);
+        map.put("freStaDate"+ 2, twoDate);
+        map.put("freStaDate"+ 3, threeDate);
+        map.put("freStaDate"+ 4, fourDate);
+        map.put("freStaDate"+ 5, fiveDate);
+        map.put("freStaDate"+ 6, sixDate);
 
         List<BizEquipmentStandardCheckDataSpectrumAnalyzer> powerList = groupMap.get(POWER);
         List<BizEquipmentStandardCheckDataSpectrumAnalyzer> powerRepList = powerList.stream()
@@ -184,26 +181,22 @@
                     return f;
                 })
                 .collect(Collectors.toList());
-        List<String> powerDateList = freStaList.stream()
-                .flatMap(f -> Stream.of(f.getTestValueOneDate(),
-                        f.getTestValueTwoDate(),
-                        f.getTestValueThreeDate(),
-                        f.getTestValueFourDate(),
-                        f.getTestValueFiveDate(),
-                        f.getTestValueSixDate()))
-                .map(f -> {
-                    if (StringUtils.isNotBlank(f)) {
-                        DateUtil.format(DateUtil.parseDate(f), "yyyy/MM/dd");
-                    }
-                    return f;
-                })
-                .collect(Collectors.toList());
+        BizEquipmentStandardCheckDataSpectrumAnalyzer powerAnalyzer = powerStaList.get(0);
+        String powerOneDate = formatDate(powerAnalyzer.getTestValueOneDate());
+        String powerTwoDate = formatDate(powerAnalyzer.getTestValueTwoDate());
+        String powerThreeDate = formatDate(powerAnalyzer.getTestValueThreeDate());
+        String powerFourDate = formatDate(powerAnalyzer.getTestValueFourDate());
+        String powerFiveDate = formatDate(powerAnalyzer.getTestValueFiveDate());
+        String powerSixDate = formatDate(powerAnalyzer.getTestValueSixDate());
 
         map.put("powerRepList", powerRepList);
         map.put("powerStaList", powerStaList);
-        for (int i = 0; i < powerDateList.size(); i++) {
-            map.put("powerStaDate" + (i + 1), powerDateList.get(i));
-        }
+        map.put("powerStaDate"+ 1, powerOneDate);
+        map.put("powerStaDate"+ 2, powerTwoDate);
+        map.put("powerStaDate"+ 3, powerThreeDate);
+        map.put("powerStaDate"+ 4, powerFourDate);
+        map.put("powerStaDate"+ 5, powerFiveDate);
+        map.put("powerStaDate"+ 6, powerSixDate);
 
         List<BizEquipmentStandardCheckDataSpectrumAnalyzer> relativeList = groupMap.get(RELATIVE_LEVEL);
         List<BizEquipmentStandardCheckDataSpectrumAnalyzer> relativeRepList = relativeList.stream()
@@ -242,26 +235,29 @@
                 })
                 .collect(Collectors.toList());
 
-        List<String> relativeDateList = freStaList.stream()
-                .flatMap(f -> Stream.of(f.getTestValueOneDate(),
-                        f.getTestValueTwoDate(),
-                        f.getTestValueThreeDate(),
-                        f.getTestValueFourDate(),
-                        f.getTestValueFiveDate(),
-                        f.getTestValueSixDate()))
-                .map(f -> {
-                    if (StringUtils.isNotBlank(f)) {
-                        DateUtil.format(DateUtil.parseDate(f), "yyyy/MM/dd");
-                    }
-                    return f;
-                })
-                .collect(Collectors.toList());
+        BizEquipmentStandardCheckDataSpectrumAnalyzer relativeSta = relativeStaList.get(0);
+        String relativeOneDate = formatDate(relativeSta.getTestValueOneDate());
+        String relativeTwoDate = formatDate(relativeSta.getTestValueTwoDate());
+        String relativeThreeDate = formatDate(relativeSta.getTestValueThreeDate());
+        String relativeFourDate = formatDate(relativeSta.getTestValueFourDate());
+        String relativeFiveDate = formatDate(relativeSta.getTestValueFiveDate());
+        String relativeSixDate = formatDate(relativeSta.getTestValueSixDate());
 
         map.put("relativeRepList", relativeRepList);
         map.put("relativeStaList", relativeStaList);
-        for (int i = 0; i < relativeDateList.size(); i++) {
-            map.put("relativeStaDate" + (i + 1), relativeDateList.get(i));
+        map.put("relativeStaDate"+ 1, relativeOneDate);
+        map.put("relativeStaDate"+ 2, relativeTwoDate);
+        map.put("relativeStaDate"+ 3, relativeThreeDate);
+        map.put("relativeStaDate"+ 4, relativeFourDate);
+        map.put("relativeStaDate"+ 5, relativeFiveDate);
+        map.put("relativeStaDate"+ 6, relativeSixDate);
+    }
+
+    private String formatDate(String date) {
+        if (StringUtils.isNotBlank(date)){
+            return DateUtil.format(DateUtil.parseDate(date),"yyyy/MM/dd");
         }
+        return null;
     }
 
     @Override