diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
index 557f12b..7157f28 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.service.Impl.eqpt.standard;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.casic.missiles.dto.certificate.ToBeRemoveDataItem;
@@ -27,6 +29,7 @@
 
     /**
      * 去除核查依据技术文件编号和文件后缀
+     *
      * @param map
      */
     protected void processCheckAccord(Map<String, Object> map) {
@@ -94,15 +97,6 @@
             default:
                 break;
         }
-        //填充有效日期
-        if (!org.springframework.util.ObjectUtils.isEmpty(map.get(MEASURE_TRACE_DATE))) {
-            String traceDate = (String) map.get(MEASURE_TRACE_DATE);
-            try {
-                map.put(MEASURE_TRACE_DATE, new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(traceDate)));
-            } catch (Exception e) {
-                throw new BusinessException(1500, String.format(traceDate, "检定有效日期，格式不正确"));
-            }
-        }
         //技术文件处理
         if (map.containsKey("technologyFile") && ObjectUtils.isNotEmpty(map.get("technologyFile"))) {
             //技术文件用逗号隔开
@@ -159,7 +153,7 @@
                 break;
             default:
                 map.put("title", "校验结果");
-                return;
+                break;
         }
         //西昌海口基本信息录入
         if ("x".equals(labCode)) {
@@ -175,14 +169,23 @@
             map.put("phone", HAIKOU_PHONE);
             map.put("postalCode", HAIKOU_POSTAL_CODE);
         }
+        //填充测试、校准、检定日期
+        if (!org.springframework.util.ObjectUtils.isEmpty(map.get(MEASURE_TRACE_DATE))) {
+            String traceDate = (String) map.get(MEASURE_TRACE_DATE);
+            DateTime dateTime = DateUtil.parseDate(traceDate);
+            map.put(MEASURE_TRACE_DATE, DateUtil.formatChineseDate(dateTime, false, false));
+//            map.put(YEAR, DateUtil.year(dateTime));
+//            map.put(MONTH, DateUtil.month(dateTime) + 1);
+//            map.put(DAY, DateUtil.dayOfMonth(dateTime));
+        }
         //填充有效日期
         if (ObjectUtils.isNotEmpty(map.get(MEASURE_VALID_DATE))) {
             String measureValidDate = (String) map.get(MEASURE_VALID_DATE);
-            try {
-                map.put(MEASURE_DATE, new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(measureValidDate)));
-            } catch (Exception e) {
-                throw new BusinessException(1500, String.format(measureValidDate, "检定有效日期，格式不正确"));
-            }
+            DateTime dateTime = DateUtil.parseDate(measureValidDate);
+            map.put(MEASURE_VALID_DATE, DateUtil.formatChineseDate(dateTime, false, false));
+//            map.put(MEASURE_YEAR, DateUtil.year(dateTime));
+//            map.put(MEASURE_MONTH, DateUtil.month(dateTime) + 1);
+//            map.put(MEASURE_DAY, DateUtil.dayOfMonth(dateTime));
         }
     }
 
@@ -258,7 +261,7 @@
      * @param titleKeyWords  待删除的标题关键字
      */
     protected void checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex,
-             List<ToBeRemoveDataItem> dataItems, Integer tableIndex, String titleKeyWords) {
+                                   List<ToBeRemoveDataItem> dataItems, Integer tableIndex, String titleKeyWords) {
         if (measureDataMap.containsKey(key)) {
             map.put(titleParam, (titleIndex++) + ".");
         } else {