diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index cb7f4a7..22fd3ea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index cb7f4a7..22fd3ea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index bd20c07..cf9a952 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -355,10 +355,12 @@
                     RegisterCustomParameters.builder()
                             .customObject(certificateReport)
                             .prefixType(CALIBRATION_CERTIFICATE)
+                            .pdf(false)
                             .response(response)
                             //文件自定义命名 证书报告名称+证书报告编号
                             .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
                             .build());
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index cb7f4a7..22fd3ea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index bd20c07..cf9a952 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -355,10 +355,12 @@
                     RegisterCustomParameters.builder()
                             .customObject(certificateReport)
                             .prefixType(CALIBRATION_CERTIFICATE)
+                            .pdf(false)
                             .response(response)
                             //文件自定义命名 证书报告名称+证书报告编号
                             .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
                             .build());
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 0d9872f..cd0db1e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -226,11 +226,13 @@
                         RegisterCustomParameters.builder()
                                 .customObject(businessOriginalRecord)
                                 .prefixType(ORIGINAL_RECORD)
+                                .pdf(false)
                                 .response(response)
                                 //文件自定义命名 证书报告名称+证书报告编号
                                 .customFileName(businessOriginalRecord.getOriginalRecordName() + businessOriginalRecord.getOriginalRecordCode())
                                 .build());
             }
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index cb7f4a7..22fd3ea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index bd20c07..cf9a952 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -355,10 +355,12 @@
                     RegisterCustomParameters.builder()
                             .customObject(certificateReport)
                             .prefixType(CALIBRATION_CERTIFICATE)
+                            .pdf(false)
                             .response(response)
                             //文件自定义命名 证书报告名称+证书报告编号
                             .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
                             .build());
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 0d9872f..cd0db1e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -226,11 +226,13 @@
                         RegisterCustomParameters.builder()
                                 .customObject(businessOriginalRecord)
                                 .prefixType(ORIGINAL_RECORD)
+                                .pdf(false)
                                 .response(response)
                                 //文件自定义命名 证书报告名称+证书报告编号
                                 .customFileName(businessOriginalRecord.getOriginalRecordName() + businessOriginalRecord.getOriginalRecordCode())
                                 .build());
             }
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
index 1b79dd5..38410f1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
@@ -95,12 +95,12 @@
     }
 
     private static void getQrCode(String tempDir, String customFileName, String wordOldUrl, FilePrintRegister filePrintRegister) throws IOException {
-        if(StringUtils.isEmpty(filePrintRegister.getQrCode())){
+        if (StringUtils.isEmpty(filePrintRegister.getQrCode())) {
             return;
         }
         String urlPath = StringUtils.isNotEmpty(customFileName) ? customFileName + ".jpg" : "检测.jpg";
         String[] split = wordOldUrl.split("\\.");
-        String content="";
+        String content = "";
         if (split.length > 1) {
             content = split[0] + "_" + System.currentTimeMillis() + ".pdf";
         } else {
@@ -118,21 +118,21 @@
      * @return
      */
     private static String checkExtendSeal(String wordOldUrl, ElectronicImage selectSeal, FilePrintRegister filePrintRegister) {
-//        if (ObjectUtils.isNotEmpty(selectSeal)) {
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl = "";
-        if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
-            String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
-            pdfNewUrl = pdfUrl[0] + ".pdf";
-        } else {
-            pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+        if (ObjectUtils.isNotEmpty(selectSeal)) {
+            //默认转为docx，只需要进行docx的替换即可
+            String pdfNewUrl = "";
+            if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
+                String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
+                pdfNewUrl = pdfUrl[0] + ".pdf";
+            } else {
+                pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+            }
+            String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
+            FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
+            DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
+            return filePrintRegister.getTemDir() + pdfNewUrl;
         }
-        String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
-        FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
-        DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
-        return filePrintRegister.getTemDir() + pdfNewUrl;
-//        }
-//        return wordOldUrl;
+        return wordOldUrl;
     }
 
     /**

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index cb7f4a7..22fd3ea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index bd20c07..cf9a952 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -355,10 +355,12 @@
                     RegisterCustomParameters.builder()
                             .customObject(certificateReport)
                             .prefixType(CALIBRATION_CERTIFICATE)
+                            .pdf(false)
                             .response(response)
                             //文件自定义命名 证书报告名称+证书报告编号
                             .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
                             .build());
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 0d9872f..cd0db1e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -226,11 +226,13 @@
                         RegisterCustomParameters.builder()
                                 .customObject(businessOriginalRecord)
                                 .prefixType(ORIGINAL_RECORD)
+                                .pdf(false)
                                 .response(response)
                                 //文件自定义命名 证书报告名称+证书报告编号
                                 .customFileName(businessOriginalRecord.getOriginalRecordName() + businessOriginalRecord.getOriginalRecordCode())
                                 .build());
             }
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
index 1b79dd5..38410f1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
@@ -95,12 +95,12 @@
     }
 
     private static void getQrCode(String tempDir, String customFileName, String wordOldUrl, FilePrintRegister filePrintRegister) throws IOException {
-        if(StringUtils.isEmpty(filePrintRegister.getQrCode())){
+        if (StringUtils.isEmpty(filePrintRegister.getQrCode())) {
             return;
         }
         String urlPath = StringUtils.isNotEmpty(customFileName) ? customFileName + ".jpg" : "检测.jpg";
         String[] split = wordOldUrl.split("\\.");
-        String content="";
+        String content = "";
         if (split.length > 1) {
             content = split[0] + "_" + System.currentTimeMillis() + ".pdf";
         } else {
@@ -118,21 +118,21 @@
      * @return
      */
     private static String checkExtendSeal(String wordOldUrl, ElectronicImage selectSeal, FilePrintRegister filePrintRegister) {
-//        if (ObjectUtils.isNotEmpty(selectSeal)) {
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl = "";
-        if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
-            String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
-            pdfNewUrl = pdfUrl[0] + ".pdf";
-        } else {
-            pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+        if (ObjectUtils.isNotEmpty(selectSeal)) {
+            //默认转为docx，只需要进行docx的替换即可
+            String pdfNewUrl = "";
+            if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
+                String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
+                pdfNewUrl = pdfUrl[0] + ".pdf";
+            } else {
+                pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+            }
+            String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
+            FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
+            DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
+            return filePrintRegister.getTemDir() + pdfNewUrl;
         }
-        String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
-        FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
-        DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
-        return filePrintRegister.getTemDir() + pdfNewUrl;
-//        }
-//        return wordOldUrl;
+        return wordOldUrl;
     }
 
     /**
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
index 034dd94..2ba364e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
@@ -77,6 +77,13 @@
         FilePrintRegister filePrintRegister = fileDataGeneric.CustomizedPrintFileRegister(registerParameters, tempLocalFileDir);
         if (fileDataGeneric != null) {
             try {
+                //获取文件夹目录，没有则创建
+                tempLocalFileDir = tempLocalFileDir + filePrintRegister.getFileNameId() + File.separator;
+                createLocalFileDir(tempLocalFileDir);
+                //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
+                for (String fileName : filePrintRegister.getBeDownloadedFileNames()) {
+                    downTemplateFile(fileName, tempLocalFileDir);
+                }
                 //区分excel的打印
                 if (filePrintRegister.getTemplateWordType()) {
                     printDocUrl = populateWordPrintFile(tempLocalFileDir, filePrintRegister, registerParameters.getCustomFileName());
@@ -109,13 +116,7 @@
      * 拆分成excel和word格式开发，
      */
     private String populateWordPrintFile(String tempLocalFileDir, FilePrintRegister filePrintRegister, String customFileName) throws Exception {
-        //获取文件夹目录，没有则创建
-        tempLocalFileDir = tempLocalFileDir + filePrintRegister.getFileNameId() + File.separator;
-        createLocalFileDir(tempLocalFileDir);
-        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
-        for (String fileName : filePrintRegister.getBeDownloadedFileNames()) {
-            downTemplateFile(fileName, tempLocalFileDir);
-        }
+
         //合并注册
         filePrintRegister.setCustomFileName(customFileName);
         return FilePrintRegisterUtils.filePrintGenerate(filePrintRegister);

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index cb7f4a7..22fd3ea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index bd20c07..cf9a952 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -355,10 +355,12 @@
                     RegisterCustomParameters.builder()
                             .customObject(certificateReport)
                             .prefixType(CALIBRATION_CERTIFICATE)
+                            .pdf(false)
                             .response(response)
                             //文件自定义命名 证书报告名称+证书报告编号
                             .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
                             .build());
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 0d9872f..cd0db1e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -226,11 +226,13 @@
                         RegisterCustomParameters.builder()
                                 .customObject(businessOriginalRecord)
                                 .prefixType(ORIGINAL_RECORD)
+                                .pdf(false)
                                 .response(response)
                                 //文件自定义命名 证书报告名称+证书报告编号
                                 .customFileName(businessOriginalRecord.getOriginalRecordName() + businessOriginalRecord.getOriginalRecordCode())
                                 .build());
             }
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
index 1b79dd5..38410f1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
@@ -95,12 +95,12 @@
     }
 
     private static void getQrCode(String tempDir, String customFileName, String wordOldUrl, FilePrintRegister filePrintRegister) throws IOException {
-        if(StringUtils.isEmpty(filePrintRegister.getQrCode())){
+        if (StringUtils.isEmpty(filePrintRegister.getQrCode())) {
             return;
         }
         String urlPath = StringUtils.isNotEmpty(customFileName) ? customFileName + ".jpg" : "检测.jpg";
         String[] split = wordOldUrl.split("\\.");
-        String content="";
+        String content = "";
         if (split.length > 1) {
             content = split[0] + "_" + System.currentTimeMillis() + ".pdf";
         } else {
@@ -118,21 +118,21 @@
      * @return
      */
     private static String checkExtendSeal(String wordOldUrl, ElectronicImage selectSeal, FilePrintRegister filePrintRegister) {
-//        if (ObjectUtils.isNotEmpty(selectSeal)) {
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl = "";
-        if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
-            String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
-            pdfNewUrl = pdfUrl[0] + ".pdf";
-        } else {
-            pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+        if (ObjectUtils.isNotEmpty(selectSeal)) {
+            //默认转为docx，只需要进行docx的替换即可
+            String pdfNewUrl = "";
+            if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
+                String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
+                pdfNewUrl = pdfUrl[0] + ".pdf";
+            } else {
+                pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+            }
+            String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
+            FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
+            DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
+            return filePrintRegister.getTemDir() + pdfNewUrl;
         }
-        String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
-        FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
-        DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
-        return filePrintRegister.getTemDir() + pdfNewUrl;
-//        }
-//        return wordOldUrl;
+        return wordOldUrl;
     }
 
     /**
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
index 034dd94..2ba364e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
@@ -77,6 +77,13 @@
         FilePrintRegister filePrintRegister = fileDataGeneric.CustomizedPrintFileRegister(registerParameters, tempLocalFileDir);
         if (fileDataGeneric != null) {
             try {
+                //获取文件夹目录，没有则创建
+                tempLocalFileDir = tempLocalFileDir + filePrintRegister.getFileNameId() + File.separator;
+                createLocalFileDir(tempLocalFileDir);
+                //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
+                for (String fileName : filePrintRegister.getBeDownloadedFileNames()) {
+                    downTemplateFile(fileName, tempLocalFileDir);
+                }
                 //区分excel的打印
                 if (filePrintRegister.getTemplateWordType()) {
                     printDocUrl = populateWordPrintFile(tempLocalFileDir, filePrintRegister, registerParameters.getCustomFileName());
@@ -109,13 +116,7 @@
      * 拆分成excel和word格式开发，
      */
     private String populateWordPrintFile(String tempLocalFileDir, FilePrintRegister filePrintRegister, String customFileName) throws Exception {
-        //获取文件夹目录，没有则创建
-        tempLocalFileDir = tempLocalFileDir + filePrintRegister.getFileNameId() + File.separator;
-        createLocalFileDir(tempLocalFileDir);
-        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
-        for (String fileName : filePrintRegister.getBeDownloadedFileNames()) {
-            downTemplateFile(fileName, tempLocalFileDir);
-        }
+
         //合并注册
         filePrintRegister.setCustomFileName(customFileName);
         return FilePrintRegisterUtils.filePrintGenerate(filePrintRegister);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
index b5fefcf..6dde846 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
@@ -51,7 +51,7 @@
             //封装返回值
             byte[] data = out.toByteArray();
             response.reset();
-            response.setHeader("Content-Disposition", file.getName());
+            response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(file.getName(), "UTF-8"));
             response.addHeader("Content-Length", "" + data.length);
             response.setHeader("Access-Control-Allow-Origin", "*");
             response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index cb7f4a7..22fd3ea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index bd20c07..cf9a952 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -355,10 +355,12 @@
                     RegisterCustomParameters.builder()
                             .customObject(certificateReport)
                             .prefixType(CALIBRATION_CERTIFICATE)
+                            .pdf(false)
                             .response(response)
                             //文件自定义命名 证书报告名称+证书报告编号
                             .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
                             .build());
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 0d9872f..cd0db1e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -226,11 +226,13 @@
                         RegisterCustomParameters.builder()
                                 .customObject(businessOriginalRecord)
                                 .prefixType(ORIGINAL_RECORD)
+                                .pdf(false)
                                 .response(response)
                                 //文件自定义命名 证书报告名称+证书报告编号
                                 .customFileName(businessOriginalRecord.getOriginalRecordName() + businessOriginalRecord.getOriginalRecordCode())
                                 .build());
             }
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
index 1b79dd5..38410f1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
@@ -95,12 +95,12 @@
     }
 
     private static void getQrCode(String tempDir, String customFileName, String wordOldUrl, FilePrintRegister filePrintRegister) throws IOException {
-        if(StringUtils.isEmpty(filePrintRegister.getQrCode())){
+        if (StringUtils.isEmpty(filePrintRegister.getQrCode())) {
             return;
         }
         String urlPath = StringUtils.isNotEmpty(customFileName) ? customFileName + ".jpg" : "检测.jpg";
         String[] split = wordOldUrl.split("\\.");
-        String content="";
+        String content = "";
         if (split.length > 1) {
             content = split[0] + "_" + System.currentTimeMillis() + ".pdf";
         } else {
@@ -118,21 +118,21 @@
      * @return
      */
     private static String checkExtendSeal(String wordOldUrl, ElectronicImage selectSeal, FilePrintRegister filePrintRegister) {
-//        if (ObjectUtils.isNotEmpty(selectSeal)) {
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl = "";
-        if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
-            String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
-            pdfNewUrl = pdfUrl[0] + ".pdf";
-        } else {
-            pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+        if (ObjectUtils.isNotEmpty(selectSeal)) {
+            //默认转为docx，只需要进行docx的替换即可
+            String pdfNewUrl = "";
+            if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
+                String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
+                pdfNewUrl = pdfUrl[0] + ".pdf";
+            } else {
+                pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+            }
+            String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
+            FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
+            DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
+            return filePrintRegister.getTemDir() + pdfNewUrl;
         }
-        String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
-        FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
-        DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
-        return filePrintRegister.getTemDir() + pdfNewUrl;
-//        }
-//        return wordOldUrl;
+        return wordOldUrl;
     }
 
     /**
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
index 034dd94..2ba364e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
@@ -77,6 +77,13 @@
         FilePrintRegister filePrintRegister = fileDataGeneric.CustomizedPrintFileRegister(registerParameters, tempLocalFileDir);
         if (fileDataGeneric != null) {
             try {
+                //获取文件夹目录，没有则创建
+                tempLocalFileDir = tempLocalFileDir + filePrintRegister.getFileNameId() + File.separator;
+                createLocalFileDir(tempLocalFileDir);
+                //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
+                for (String fileName : filePrintRegister.getBeDownloadedFileNames()) {
+                    downTemplateFile(fileName, tempLocalFileDir);
+                }
                 //区分excel的打印
                 if (filePrintRegister.getTemplateWordType()) {
                     printDocUrl = populateWordPrintFile(tempLocalFileDir, filePrintRegister, registerParameters.getCustomFileName());
@@ -109,13 +116,7 @@
      * 拆分成excel和word格式开发，
      */
     private String populateWordPrintFile(String tempLocalFileDir, FilePrintRegister filePrintRegister, String customFileName) throws Exception {
-        //获取文件夹目录，没有则创建
-        tempLocalFileDir = tempLocalFileDir + filePrintRegister.getFileNameId() + File.separator;
-        createLocalFileDir(tempLocalFileDir);
-        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
-        for (String fileName : filePrintRegister.getBeDownloadedFileNames()) {
-            downTemplateFile(fileName, tempLocalFileDir);
-        }
+
         //合并注册
         filePrintRegister.setCustomFileName(customFileName);
         return FilePrintRegisterUtils.filePrintGenerate(filePrintRegister);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
index b5fefcf..6dde846 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
@@ -51,7 +51,7 @@
             //封装返回值
             byte[] data = out.toByteArray();
             response.reset();
-            response.setHeader("Content-Disposition", file.getName());
+            response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(file.getName(), "UTF-8"));
             response.addHeader("Content-Length", "" + data.length);
             response.setHeader("Access-Control-Allow-Origin", "*");
             response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
index fa805a1..c0c995a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
@@ -1,22 +1,23 @@
 package com.casic.missiles.service.listeners.register.data.certificate;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.casic.missiles.dto.business.certificate.RegisterCustomParameters;
 import com.casic.missiles.dto.business.file.FilePrintRegister;
 import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataGeneric;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataSupport;
 import com.casic.missiles.utils.SnowflakeUtil;
-import liquibase.pro.packaged.A;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -48,7 +49,7 @@
         }
         //初始化，生成模板文件
         FilePrintRegister filePrintRegister = initialization(templateFileDir, metaData.getId(), getTemplateName(metaData.getTemplateId()));
-        filePrintRegister.setTemplateWordType(metaData.getCertificateReportTypeName().contains("检测") ? true : false);
+        filePrintRegister.setTemplateWordType("1".equals(metaData.getCertificateReportCategory()) ? true : false);
         //填充定制化的参数
         filePrintRegister.setParams(certificateFileParamCreator(metaData.getOrderId(), metaData.getSampleId()));
         //定制化参数开发
@@ -88,8 +89,20 @@
                 params.put("monthD", calendar.get(Calendar.MONTH) + 1);
                 params.put("dayD", calendar.get(Calendar.DAY_OF_MONTH));
             }
+            params.put("verifierName", metaData.getBusinessOriginalRecord().getVerifierName());
             params.put("certificateNo", metaData.getCertificateReportCode());
             params.put("createUserName", metaData.getCreateUserName());
+            params.put("humidity",metaData.getBusinessOriginalRecord().getHumidity());
+            params.put("temperature",metaData.getBusinessOriginalRecord().getTemperature());
+            params.put("measureResult",metaData.getMeasureResult());
+            List<Map> mapList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(metaData.getBusinessOriginalRecord().getEquipmentInfoList())) {
+                for (EquipmentFixedAssets equipmentInfo : metaData.getBusinessOriginalRecord().getEquipmentInfoList()) {
+                    Map<String, Object> map = BeanUtil.beanToMap(equipmentInfo);
+                    mapList.add(map);
+                }
+            }
+            params.put("mapList", mapList);
         } catch (Exception ex) {
             log.error("日期格式转换异常，异常信息{}", ex);
         }

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index cb7f4a7..22fd3ea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index bd20c07..cf9a952 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -355,10 +355,12 @@
                     RegisterCustomParameters.builder()
                             .customObject(certificateReport)
                             .prefixType(CALIBRATION_CERTIFICATE)
+                            .pdf(false)
                             .response(response)
                             //文件自定义命名 证书报告名称+证书报告编号
                             .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
                             .build());
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 0d9872f..cd0db1e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -226,11 +226,13 @@
                         RegisterCustomParameters.builder()
                                 .customObject(businessOriginalRecord)
                                 .prefixType(ORIGINAL_RECORD)
+                                .pdf(false)
                                 .response(response)
                                 //文件自定义命名 证书报告名称+证书报告编号
                                 .customFileName(businessOriginalRecord.getOriginalRecordName() + businessOriginalRecord.getOriginalRecordCode())
                                 .build());
             }
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
index 1b79dd5..38410f1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
@@ -95,12 +95,12 @@
     }
 
     private static void getQrCode(String tempDir, String customFileName, String wordOldUrl, FilePrintRegister filePrintRegister) throws IOException {
-        if(StringUtils.isEmpty(filePrintRegister.getQrCode())){
+        if (StringUtils.isEmpty(filePrintRegister.getQrCode())) {
             return;
         }
         String urlPath = StringUtils.isNotEmpty(customFileName) ? customFileName + ".jpg" : "检测.jpg";
         String[] split = wordOldUrl.split("\\.");
-        String content="";
+        String content = "";
         if (split.length > 1) {
             content = split[0] + "_" + System.currentTimeMillis() + ".pdf";
         } else {
@@ -118,21 +118,21 @@
      * @return
      */
     private static String checkExtendSeal(String wordOldUrl, ElectronicImage selectSeal, FilePrintRegister filePrintRegister) {
-//        if (ObjectUtils.isNotEmpty(selectSeal)) {
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl = "";
-        if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
-            String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
-            pdfNewUrl = pdfUrl[0] + ".pdf";
-        } else {
-            pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+        if (ObjectUtils.isNotEmpty(selectSeal)) {
+            //默认转为docx，只需要进行docx的替换即可
+            String pdfNewUrl = "";
+            if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
+                String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
+                pdfNewUrl = pdfUrl[0] + ".pdf";
+            } else {
+                pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+            }
+            String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
+            FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
+            DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
+            return filePrintRegister.getTemDir() + pdfNewUrl;
         }
-        String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
-        FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
-        DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
-        return filePrintRegister.getTemDir() + pdfNewUrl;
-//        }
-//        return wordOldUrl;
+        return wordOldUrl;
     }
 
     /**
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
index 034dd94..2ba364e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
@@ -77,6 +77,13 @@
         FilePrintRegister filePrintRegister = fileDataGeneric.CustomizedPrintFileRegister(registerParameters, tempLocalFileDir);
         if (fileDataGeneric != null) {
             try {
+                //获取文件夹目录，没有则创建
+                tempLocalFileDir = tempLocalFileDir + filePrintRegister.getFileNameId() + File.separator;
+                createLocalFileDir(tempLocalFileDir);
+                //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
+                for (String fileName : filePrintRegister.getBeDownloadedFileNames()) {
+                    downTemplateFile(fileName, tempLocalFileDir);
+                }
                 //区分excel的打印
                 if (filePrintRegister.getTemplateWordType()) {
                     printDocUrl = populateWordPrintFile(tempLocalFileDir, filePrintRegister, registerParameters.getCustomFileName());
@@ -109,13 +116,7 @@
      * 拆分成excel和word格式开发，
      */
     private String populateWordPrintFile(String tempLocalFileDir, FilePrintRegister filePrintRegister, String customFileName) throws Exception {
-        //获取文件夹目录，没有则创建
-        tempLocalFileDir = tempLocalFileDir + filePrintRegister.getFileNameId() + File.separator;
-        createLocalFileDir(tempLocalFileDir);
-        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
-        for (String fileName : filePrintRegister.getBeDownloadedFileNames()) {
-            downTemplateFile(fileName, tempLocalFileDir);
-        }
+
         //合并注册
         filePrintRegister.setCustomFileName(customFileName);
         return FilePrintRegisterUtils.filePrintGenerate(filePrintRegister);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
index b5fefcf..6dde846 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
@@ -51,7 +51,7 @@
             //封装返回值
             byte[] data = out.toByteArray();
             response.reset();
-            response.setHeader("Content-Disposition", file.getName());
+            response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(file.getName(), "UTF-8"));
             response.addHeader("Content-Length", "" + data.length);
             response.setHeader("Access-Control-Allow-Origin", "*");
             response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
index fa805a1..c0c995a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
@@ -1,22 +1,23 @@
 package com.casic.missiles.service.listeners.register.data.certificate;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.casic.missiles.dto.business.certificate.RegisterCustomParameters;
 import com.casic.missiles.dto.business.file.FilePrintRegister;
 import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataGeneric;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataSupport;
 import com.casic.missiles.utils.SnowflakeUtil;
-import liquibase.pro.packaged.A;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -48,7 +49,7 @@
         }
         //初始化，生成模板文件
         FilePrintRegister filePrintRegister = initialization(templateFileDir, metaData.getId(), getTemplateName(metaData.getTemplateId()));
-        filePrintRegister.setTemplateWordType(metaData.getCertificateReportTypeName().contains("检测") ? true : false);
+        filePrintRegister.setTemplateWordType("1".equals(metaData.getCertificateReportCategory()) ? true : false);
         //填充定制化的参数
         filePrintRegister.setParams(certificateFileParamCreator(metaData.getOrderId(), metaData.getSampleId()));
         //定制化参数开发
@@ -88,8 +89,20 @@
                 params.put("monthD", calendar.get(Calendar.MONTH) + 1);
                 params.put("dayD", calendar.get(Calendar.DAY_OF_MONTH));
             }
+            params.put("verifierName", metaData.getBusinessOriginalRecord().getVerifierName());
             params.put("certificateNo", metaData.getCertificateReportCode());
             params.put("createUserName", metaData.getCreateUserName());
+            params.put("humidity",metaData.getBusinessOriginalRecord().getHumidity());
+            params.put("temperature",metaData.getBusinessOriginalRecord().getTemperature());
+            params.put("measureResult",metaData.getMeasureResult());
+            List<Map> mapList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(metaData.getBusinessOriginalRecord().getEquipmentInfoList())) {
+                for (EquipmentFixedAssets equipmentInfo : metaData.getBusinessOriginalRecord().getEquipmentInfoList()) {
+                    Map<String, Object> map = BeanUtil.beanToMap(equipmentInfo);
+                    mapList.add(map);
+                }
+            }
+            params.put("mapList", mapList);
         } catch (Exception ex) {
             log.error("日期格式转换异常，异常信息{}", ex);
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/original/OriginalRecord.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/original/OriginalRecord.java
index 2ef3fde..7977387 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/original/OriginalRecord.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/original/OriginalRecord.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.service.listeners.register.data.original;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.casic.missiles.dto.business.certificate.RegisterCustomParameters;
 import com.casic.missiles.dto.business.file.FilePrintRegister;
 import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataGeneric;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataSupport;
 import com.casic.missiles.utils.SnowflakeUtil;
@@ -15,7 +18,9 @@
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -37,6 +42,7 @@
         }
         //初始化，生成模板文件
         FilePrintRegister filePrintRegister = initialization(templateFileDir, metaData.getId(), getTemplateName(metaData.getTemplateId()));
+        filePrintRegister.setTemplateWordType("1".equals(metaData.getMeasureCategory()) ? true : false);
         //定制化签名开发预处理，定制化参数
         customizedSignNamesParamCreator();
         //填充定制化的参数
@@ -64,6 +70,14 @@
             params.put("humidity", metaData.getHumidity() + "%RH");
             params.put("calibrationPlace", metaData.getCalibrationPlace());
             params.put("verifierName", metaData.getVerifierName());
+            List<Map> mapList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(metaData.getEquipmentInfoList())) {
+                for (EquipmentFixedAssets equipmentInfo : metaData.getEquipmentInfoList()) {
+                    Map<String, Object> map = BeanUtil.beanToMap(equipmentInfo);
+                    mapList.add(map);
+                }
+            }
+            params.put("mapList", mapList);
         } catch (Exception ex) {
             log.error("日期格式转换异常，异常信息{}", ex);
         }

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
index cb7f4a7..22fd3ea 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java
@@ -6,7 +6,6 @@
 import com.casic.missiles.annotation.DictCodeField;
 import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index bd20c07..cf9a952 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -355,10 +355,12 @@
                     RegisterCustomParameters.builder()
                             .customObject(certificateReport)
                             .prefixType(CALIBRATION_CERTIFICATE)
+                            .pdf(false)
                             .response(response)
                             //文件自定义命名 证书报告名称+证书报告编号
                             .customFileName(certificateReport.getCertificateReportName() + certificateReport.getCertificateReportCode())
                             .build());
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
index 0d9872f..cd0db1e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOriginalRecordServiceImpl.java
@@ -226,11 +226,13 @@
                         RegisterCustomParameters.builder()
                                 .customObject(businessOriginalRecord)
                                 .prefixType(ORIGINAL_RECORD)
+                                .pdf(false)
                                 .response(response)
                                 //文件自定义命名 证书报告名称+证书报告编号
                                 .customFileName(businessOriginalRecord.getOriginalRecordName() + businessOriginalRecord.getOriginalRecordCode())
                                 .build());
             }
+            return;
         }
         throw new BusinessException(BusinessExceptionEnum.OUTSOURCE_CERTIFICATE_NO_FILES);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
index 1b79dd5..38410f1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java
@@ -95,12 +95,12 @@
     }
 
     private static void getQrCode(String tempDir, String customFileName, String wordOldUrl, FilePrintRegister filePrintRegister) throws IOException {
-        if(StringUtils.isEmpty(filePrintRegister.getQrCode())){
+        if (StringUtils.isEmpty(filePrintRegister.getQrCode())) {
             return;
         }
         String urlPath = StringUtils.isNotEmpty(customFileName) ? customFileName + ".jpg" : "检测.jpg";
         String[] split = wordOldUrl.split("\\.");
-        String content="";
+        String content = "";
         if (split.length > 1) {
             content = split[0] + "_" + System.currentTimeMillis() + ".pdf";
         } else {
@@ -118,21 +118,21 @@
      * @return
      */
     private static String checkExtendSeal(String wordOldUrl, ElectronicImage selectSeal, FilePrintRegister filePrintRegister) {
-//        if (ObjectUtils.isNotEmpty(selectSeal)) {
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl = "";
-        if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
-            String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
-            pdfNewUrl = pdfUrl[0] + ".pdf";
-        } else {
-            pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+        if (ObjectUtils.isNotEmpty(selectSeal)) {
+            //默认转为docx，只需要进行docx的替换即可
+            String pdfNewUrl = "";
+            if (StringUtils.isEmpty(filePrintRegister.getCustomFileName())) {
+                String[] pdfUrl = filePrintRegister.getFileName().split("/.docx");
+                pdfNewUrl = pdfUrl[0] + ".pdf";
+            } else {
+                pdfNewUrl = filePrintRegister.getCustomFileName() + ".pdf";
+            }
+            String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
+            FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
+            DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
+            return filePrintRegister.getTemDir() + pdfNewUrl;
         }
-        String tempPdfUrl = filePrintRegister.getTemDir() + "XH" + pdfNewUrl;
-        FilePrintRegisterUtils.wordToPdf(wordOldUrl, tempPdfUrl);
-        DocPictureProvider.wordFullSeam(tempPdfUrl, selectSeal.getElectronicSealImageUrl(), filePrintRegister.getTemDir() + pdfNewUrl);
-        return filePrintRegister.getTemDir() + pdfNewUrl;
-//        }
-//        return wordOldUrl;
+        return wordOldUrl;
     }
 
     /**
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
index 034dd94..2ba364e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java
@@ -77,6 +77,13 @@
         FilePrintRegister filePrintRegister = fileDataGeneric.CustomizedPrintFileRegister(registerParameters, tempLocalFileDir);
         if (fileDataGeneric != null) {
             try {
+                //获取文件夹目录，没有则创建
+                tempLocalFileDir = tempLocalFileDir + filePrintRegister.getFileNameId() + File.separator;
+                createLocalFileDir(tempLocalFileDir);
+                //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
+                for (String fileName : filePrintRegister.getBeDownloadedFileNames()) {
+                    downTemplateFile(fileName, tempLocalFileDir);
+                }
                 //区分excel的打印
                 if (filePrintRegister.getTemplateWordType()) {
                     printDocUrl = populateWordPrintFile(tempLocalFileDir, filePrintRegister, registerParameters.getCustomFileName());
@@ -109,13 +116,7 @@
      * 拆分成excel和word格式开发，
      */
     private String populateWordPrintFile(String tempLocalFileDir, FilePrintRegister filePrintRegister, String customFileName) throws Exception {
-        //获取文件夹目录，没有则创建
-        tempLocalFileDir = tempLocalFileDir + filePrintRegister.getFileNameId() + File.separator;
-        createLocalFileDir(tempLocalFileDir);
-        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
-        for (String fileName : filePrintRegister.getBeDownloadedFileNames()) {
-            downTemplateFile(fileName, tempLocalFileDir);
-        }
+
         //合并注册
         filePrintRegister.setCustomFileName(customFileName);
         return FilePrintRegisterUtils.filePrintGenerate(filePrintRegister);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
index b5fefcf..6dde846 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java
@@ -51,7 +51,7 @@
             //封装返回值
             byte[] data = out.toByteArray();
             response.reset();
-            response.setHeader("Content-Disposition", file.getName());
+            response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(file.getName(), "UTF-8"));
             response.addHeader("Content-Length", "" + data.length);
             response.setHeader("Access-Control-Allow-Origin", "*");
             response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
index fa805a1..c0c995a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java
@@ -1,22 +1,23 @@
 package com.casic.missiles.service.listeners.register.data.certificate;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.casic.missiles.dto.business.certificate.RegisterCustomParameters;
 import com.casic.missiles.dto.business.file.FilePrintRegister;
 import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataGeneric;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataSupport;
 import com.casic.missiles.utils.SnowflakeUtil;
-import liquibase.pro.packaged.A;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -48,7 +49,7 @@
         }
         //初始化，生成模板文件
         FilePrintRegister filePrintRegister = initialization(templateFileDir, metaData.getId(), getTemplateName(metaData.getTemplateId()));
-        filePrintRegister.setTemplateWordType(metaData.getCertificateReportTypeName().contains("检测") ? true : false);
+        filePrintRegister.setTemplateWordType("1".equals(metaData.getCertificateReportCategory()) ? true : false);
         //填充定制化的参数
         filePrintRegister.setParams(certificateFileParamCreator(metaData.getOrderId(), metaData.getSampleId()));
         //定制化参数开发
@@ -88,8 +89,20 @@
                 params.put("monthD", calendar.get(Calendar.MONTH) + 1);
                 params.put("dayD", calendar.get(Calendar.DAY_OF_MONTH));
             }
+            params.put("verifierName", metaData.getBusinessOriginalRecord().getVerifierName());
             params.put("certificateNo", metaData.getCertificateReportCode());
             params.put("createUserName", metaData.getCreateUserName());
+            params.put("humidity",metaData.getBusinessOriginalRecord().getHumidity());
+            params.put("temperature",metaData.getBusinessOriginalRecord().getTemperature());
+            params.put("measureResult",metaData.getMeasureResult());
+            List<Map> mapList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(metaData.getBusinessOriginalRecord().getEquipmentInfoList())) {
+                for (EquipmentFixedAssets equipmentInfo : metaData.getBusinessOriginalRecord().getEquipmentInfoList()) {
+                    Map<String, Object> map = BeanUtil.beanToMap(equipmentInfo);
+                    mapList.add(map);
+                }
+            }
+            params.put("mapList", mapList);
         } catch (Exception ex) {
             log.error("日期格式转换异常，异常信息{}", ex);
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/original/OriginalRecord.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/original/OriginalRecord.java
index 2ef3fde..7977387 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/original/OriginalRecord.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/original/OriginalRecord.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.service.listeners.register.data.original;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.casic.missiles.dto.business.certificate.RegisterCustomParameters;
 import com.casic.missiles.dto.business.file.FilePrintRegister;
 import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.business.BusinessOriginalRecord;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataGeneric;
 import com.casic.missiles.service.listeners.register.data.PrintFileDataSupport;
 import com.casic.missiles.utils.SnowflakeUtil;
@@ -15,7 +18,9 @@
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -37,6 +42,7 @@
         }
         //初始化，生成模板文件
         FilePrintRegister filePrintRegister = initialization(templateFileDir, metaData.getId(), getTemplateName(metaData.getTemplateId()));
+        filePrintRegister.setTemplateWordType("1".equals(metaData.getMeasureCategory()) ? true : false);
         //定制化签名开发预处理，定制化参数
         customizedSignNamesParamCreator();
         //填充定制化的参数
@@ -64,6 +70,14 @@
             params.put("humidity", metaData.getHumidity() + "%RH");
             params.put("calibrationPlace", metaData.getCalibrationPlace());
             params.put("verifierName", metaData.getVerifierName());
+            List<Map> mapList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(metaData.getEquipmentInfoList())) {
+                for (EquipmentFixedAssets equipmentInfo : metaData.getEquipmentInfoList()) {
+                    Map<String, Object> map = BeanUtil.beanToMap(equipmentInfo);
+                    mapList.add(map);
+                }
+            }
+            params.put("mapList", mapList);
         } catch (Exception ex) {
             log.error("日期格式转换异常，异常信息{}", ex);
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java
index 86b6498..b12ec9f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java
@@ -37,14 +37,9 @@
         String wordUrl = exportParam(tempLocalFileDir, filePrintRegister, customFileName);
         //生成二维码
         getQrCode(filePrintRegister.getTemDir(), filePrintRegister.getCustomFileName(), wordUrl, filePrintRegister);
-        Map<String, List<ElectronicImage>> sameKeyWordSealMaps = filePrintRegister.getElectronicImageList().stream()
-                .filter(electronicImage -> StringUtils.isNotEmpty(electronicImage.getKeyWord()))
-                .collect(
-                        Collectors.groupingBy(ElectronicImage::getKeyWord)
-                );
         //3、根据关键字进行添加签章和签字
-        imageWrite(filePrintRegister.getTemDir() + filePrintRegister.getFileName(), sameKeyWordSealMaps);
-        return tempLocalFileDir + customFileName;
+        imageWrite(filePrintRegister.getTemDir() + wordUrl, filePrintRegister.getElectronicImageList());
+        return tempLocalFileDir + wordUrl;
     }
 
     /**
@@ -58,17 +53,19 @@
      */
     private static String exportParam(String tempLocalFileDir, FilePrintRegister filePrintRegister, String customFileName) throws IOException {
         // 加载模板
-        customFileName = StringUtils.isNotEmpty(customFileName) ? customFileName + "xls" : filePrintRegister.getFileName();
-        TemplateExportParams params = new TemplateExportParams(tempLocalFileDir + customFileName);
+        customFileName = StringUtils.isNotEmpty(customFileName) ? customFileName + ".xls" : filePrintRegister.getFileName();
+        TemplateExportParams params = new TemplateExportParams(tempLocalFileDir + filePrintRegister.getFileName());
         //添加sheet三页的打印
         Map<Integer, List<Map<String, Object>>> sheetsMap = new HashMap<>();
-        for (int i = 0; i < params.getDataSheetNum(); i++) {
+        com.spire.xls.Workbook spireWorkbook = new com.spire.xls.Workbook();
+        spireWorkbook.loadFromFile(tempLocalFileDir + filePrintRegister.getFileName());
+        for (int i = 0; i < spireWorkbook.getWorksheets().size(); i++) {
             List<Map<String, Object>> list = new ArrayList();
             list.add(filePrintRegister.getParams());
             sheetsMap.put(i, list);
         }
         try {
-            Workbook workbook = ExcelExportUtil.exportExcel(params, filePrintRegister.getParams());
+            Workbook workbook = ExcelExportUtil.exportExcelClone(sheetsMap, params);
             FileOutputStream fos = new FileOutputStream(tempLocalFileDir + customFileName);
             workbook.write(fos);
             fos.close();
@@ -109,7 +106,15 @@
     /**
      * 填充图片
      */
-    private static void imageWrite(String filePath, Map<String, List<ElectronicImage>> sameKeyWordSealMaps) throws Exception {
+    private static void imageWrite(String filePath, List<ElectronicImage> electronicImageList) throws Exception {
+        Map<String, List<ElectronicImage>> sameKeyWordSealMaps = null;
+        if (CollectionUtils.isNotEmpty(electronicImageList)) {
+            sameKeyWordSealMaps = electronicImageList.stream()
+                    .filter(electronicImage -> StringUtils.isNotEmpty(electronicImage.getKeyWord()))
+                    .collect(
+                            Collectors.groupingBy(ElectronicImage::getKeyWord)
+                    );
+        }
         if (ObjectUtils.isEmpty(sameKeyWordSealMaps)) {
             log.debug("无图片配置填充");
             return;