diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 0d1211e..ccf7717 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,10 +92,10 @@
      */
     @GetMapping("/test")
     @ResponseBody
-    public void test(Long id) throws Exception {
+    public void test(String id) throws Exception {
 //        //进行证书报告生成，并在远程注册服务器注册
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-        printFileRegister.registerPrintFile(id, "计量人员", "导出word");
+        printFileRegister.registerPrintFile(StringUtils.isEmpty(id) ? null : Long.valueOf(id), "计量人员", "导出word", true);
     }
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 0d1211e..ccf7717 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,10 +92,10 @@
      */
     @GetMapping("/test")
     @ResponseBody
-    public void test(Long id) throws Exception {
+    public void test(String id) throws Exception {
 //        //进行证书报告生成，并在远程注册服务器注册
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-        printFileRegister.registerPrintFile(id, "计量人员", "导出word");
+        printFileRegister.registerPrintFile(StringUtils.isEmpty(id) ? null : Long.valueOf(id), "计量人员", "导出word", true);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
index ab29b4e..6b76f47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
@@ -16,7 +16,7 @@
 
 
     //主表查询
-    Map<String, Object> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
+    List<Map<String, Object>> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
 
     //=查询
     List<Map<String, Object>> equalRelateBizList(@Param("tableName") String tableName,

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 0d1211e..ccf7717 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,10 +92,10 @@
      */
     @GetMapping("/test")
     @ResponseBody
-    public void test(Long id) throws Exception {
+    public void test(String id) throws Exception {
 //        //进行证书报告生成，并在远程注册服务器注册
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-        printFileRegister.registerPrintFile(id, "计量人员", "导出word");
+        printFileRegister.registerPrintFile(StringUtils.isEmpty(id) ? null : Long.valueOf(id), "计量人员", "导出word", true);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
index ab29b4e..6b76f47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
@@ -16,7 +16,7 @@
 
 
     //主表查询
-    Map<String, Object> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
+    List<Map<String, Object>> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
 
     //=查询
     List<Map<String, Object>> equalRelateBizList(@Param("tableName") String tableName,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
index 7e6b017..733bea5 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
@@ -15,11 +15,11 @@
     String getSignFileSealById(@Param("id") Long id, @Param("tableName") String tableName);
 
     @Select(" SELECT minio_file_name " +
-            " FROM  ${tableName}  " +
-            " WHERE template_name =#{name}" +
-            " AND  is_del=0 " +
-            " limit 1 ")
-    String   getFileNameByName(@Param("name") String name, @Param("tableName") String tableName);
+            " FROM  system_template " +
+            " WHERE id =#{id}")
+    String getTemplateFileById(@Param("id") Long id);
+
+
     @Select(" SELECT minio_file_name " +
             " FROM  system_sign  " +
             " WHERE sign_user_id =#{signUserId}  " +

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 0d1211e..ccf7717 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,10 +92,10 @@
      */
     @GetMapping("/test")
     @ResponseBody
-    public void test(Long id) throws Exception {
+    public void test(String id) throws Exception {
 //        //进行证书报告生成，并在远程注册服务器注册
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-        printFileRegister.registerPrintFile(id, "计量人员", "导出word");
+        printFileRegister.registerPrintFile(StringUtils.isEmpty(id) ? null : Long.valueOf(id), "计量人员", "导出word", true);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
index ab29b4e..6b76f47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
@@ -16,7 +16,7 @@
 
 
     //主表查询
-    Map<String, Object> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
+    List<Map<String, Object>> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
 
     //=查询
     List<Map<String, Object>> equalRelateBizList(@Param("tableName") String tableName,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
index 7e6b017..733bea5 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
@@ -15,11 +15,11 @@
     String getSignFileSealById(@Param("id") Long id, @Param("tableName") String tableName);
 
     @Select(" SELECT minio_file_name " +
-            " FROM  ${tableName}  " +
-            " WHERE template_name =#{name}" +
-            " AND  is_del=0 " +
-            " limit 1 ")
-    String   getFileNameByName(@Param("name") String name, @Param("tableName") String tableName);
+            " FROM  system_template " +
+            " WHERE id =#{id}")
+    String getTemplateFileById(@Param("id") Long id);
+
+
     @Select(" SELECT minio_file_name " +
             " FROM  system_sign  " +
             " WHERE sign_user_id =#{signUserId}  " +
diff --git a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
index 3a5ed4b..12f9c6a 100644
--- a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
@@ -4,9 +4,11 @@
 
 
     <select id="getBizMapList" resultType="java.util.Map">
-        SELECT  *
+        SELECT *
         From ${tableName}
-        WHERE id =#{idValue}
+        <if test="idValue != null">
+            WHERE id =#{idValue}
+        </if>
     </select>
 
     <select id="equalRelateBizList" resultType="java.util.Map">
@@ -21,11 +23,11 @@
     </select>
 
     <select id="inRelateBizList" resultType="java.util.Map">
-        SELECT  *
-        From  ${tableName}
-        WHERE  1=1
+        SELECT *
+        From ${tableName}
+        WHERE 1=1
         <if test="relateIdList != null">
-            and   ${foreignKeyField}  in
+            and ${foreignKeyField} in
             <foreach collection="relateIdList" item="relateId" index="index" open="(" close=")" separator=",">
                 #{relateId}
             </foreach>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 0d1211e..ccf7717 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,10 +92,10 @@
      */
     @GetMapping("/test")
     @ResponseBody
-    public void test(Long id) throws Exception {
+    public void test(String id) throws Exception {
 //        //进行证书报告生成，并在远程注册服务器注册
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-        printFileRegister.registerPrintFile(id, "计量人员", "导出word");
+        printFileRegister.registerPrintFile(StringUtils.isEmpty(id) ? null : Long.valueOf(id), "计量人员", "导出word", true);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
index ab29b4e..6b76f47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
@@ -16,7 +16,7 @@
 
 
     //主表查询
-    Map<String, Object> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
+    List<Map<String, Object>> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
 
     //=查询
     List<Map<String, Object>> equalRelateBizList(@Param("tableName") String tableName,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
index 7e6b017..733bea5 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
@@ -15,11 +15,11 @@
     String getSignFileSealById(@Param("id") Long id, @Param("tableName") String tableName);
 
     @Select(" SELECT minio_file_name " +
-            " FROM  ${tableName}  " +
-            " WHERE template_name =#{name}" +
-            " AND  is_del=0 " +
-            " limit 1 ")
-    String   getFileNameByName(@Param("name") String name, @Param("tableName") String tableName);
+            " FROM  system_template " +
+            " WHERE id =#{id}")
+    String getTemplateFileById(@Param("id") Long id);
+
+
     @Select(" SELECT minio_file_name " +
             " FROM  system_sign  " +
             " WHERE sign_user_id =#{signUserId}  " +
diff --git a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
index 3a5ed4b..12f9c6a 100644
--- a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
@@ -4,9 +4,11 @@
 
 
     <select id="getBizMapList" resultType="java.util.Map">
-        SELECT  *
+        SELECT *
         From ${tableName}
-        WHERE id =#{idValue}
+        <if test="idValue != null">
+            WHERE id =#{idValue}
+        </if>
     </select>
 
     <select id="equalRelateBizList" resultType="java.util.Map">
@@ -21,11 +23,11 @@
     </select>
 
     <select id="inRelateBizList" resultType="java.util.Map">
-        SELECT  *
-        From  ${tableName}
-        WHERE  1=1
+        SELECT *
+        From ${tableName}
+        WHERE 1=1
         <if test="relateIdList != null">
-            and   ${foreignKeyField}  in
+            and ${foreignKeyField} in
             <foreach collection="relateIdList" item="relateId" index="index" open="(" close=")" separator=",">
                 #{relateId}
             </foreach>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
index 8dcb3b3..14245cd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
@@ -37,7 +37,7 @@
 
     @ApiModelProperty("模板名称")
     @TableField("template_file")
-    private String templateFile;
+    private Long templateFile;
 
     @ApiModelProperty("模板字段id")
     @TableField("module_field_id")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 0d1211e..ccf7717 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,10 +92,10 @@
      */
     @GetMapping("/test")
     @ResponseBody
-    public void test(Long id) throws Exception {
+    public void test(String id) throws Exception {
 //        //进行证书报告生成，并在远程注册服务器注册
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-        printFileRegister.registerPrintFile(id, "计量人员", "导出word");
+        printFileRegister.registerPrintFile(StringUtils.isEmpty(id) ? null : Long.valueOf(id), "计量人员", "导出word", true);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
index ab29b4e..6b76f47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
@@ -16,7 +16,7 @@
 
 
     //主表查询
-    Map<String, Object> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
+    List<Map<String, Object>> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
 
     //=查询
     List<Map<String, Object>> equalRelateBizList(@Param("tableName") String tableName,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
index 7e6b017..733bea5 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
@@ -15,11 +15,11 @@
     String getSignFileSealById(@Param("id") Long id, @Param("tableName") String tableName);
 
     @Select(" SELECT minio_file_name " +
-            " FROM  ${tableName}  " +
-            " WHERE template_name =#{name}" +
-            " AND  is_del=0 " +
-            " limit 1 ")
-    String   getFileNameByName(@Param("name") String name, @Param("tableName") String tableName);
+            " FROM  system_template " +
+            " WHERE id =#{id}")
+    String getTemplateFileById(@Param("id") Long id);
+
+
     @Select(" SELECT minio_file_name " +
             " FROM  system_sign  " +
             " WHERE sign_user_id =#{signUserId}  " +
diff --git a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
index 3a5ed4b..12f9c6a 100644
--- a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
@@ -4,9 +4,11 @@
 
 
     <select id="getBizMapList" resultType="java.util.Map">
-        SELECT  *
+        SELECT *
         From ${tableName}
-        WHERE id =#{idValue}
+        <if test="idValue != null">
+            WHERE id =#{idValue}
+        </if>
     </select>
 
     <select id="equalRelateBizList" resultType="java.util.Map">
@@ -21,11 +23,11 @@
     </select>
 
     <select id="inRelateBizList" resultType="java.util.Map">
-        SELECT  *
-        From  ${tableName}
-        WHERE  1=1
+        SELECT *
+        From ${tableName}
+        WHERE 1=1
         <if test="relateIdList != null">
-            and   ${foreignKeyField}  in
+            and ${foreignKeyField} in
             <foreach collection="relateIdList" item="relateId" index="index" open="(" close=")" separator=",">
                 #{relateId}
             </foreach>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
index 8dcb3b3..14245cd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
@@ -37,7 +37,7 @@
 
     @ApiModelProperty("模板名称")
     @TableField("template_file")
-    private String templateFile;
+    private Long templateFile;
 
     @ApiModelProperty("模板字段id")
     @TableField("module_field_id")
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 092d219..0b1a8d7 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
@@ -59,10 +59,6 @@
 //            electronicSeal.setElectronicSealImageUrl(imagePath);
 //            saveFile(electronSealImage, imageCutOffContents[imageCutOffContents.length - 1], imagePath);
 //        }
-
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl =wordOldUrl.replaceAll("docx", "pdf");
-
         if (CollectionUtils.isNotEmpty(filePrintRegister.getElectronicImageList())) {
             //按关键字进行分组
             Map<String, List<ElectronicImage>> sameKeyWordSealMaps = filePrintRegister.getElectronicImageList().stream()
@@ -84,11 +80,8 @@
                 addAbsolutePathStamp(wordOldUrl, wordOldUrl, absolutePathImage);
             }
             //由于合成word总页数存在不准确，先转换为pdf进行获取合成证书总页数, 处理齐缝章
-
         }
-        // 4、将新word转化为pdf文件
-        wordToPdf(wordOldUrl, pdfNewUrl);
-        return pdfNewUrl;
+        return wordOldUrl;
     }
 
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 0d1211e..ccf7717 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,10 +92,10 @@
      */
     @GetMapping("/test")
     @ResponseBody
-    public void test(Long id) throws Exception {
+    public void test(String id) throws Exception {
 //        //进行证书报告生成，并在远程注册服务器注册
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-        printFileRegister.registerPrintFile(id, "计量人员", "导出word");
+        printFileRegister.registerPrintFile(StringUtils.isEmpty(id) ? null : Long.valueOf(id), "计量人员", "导出word", true);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
index ab29b4e..6b76f47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
@@ -16,7 +16,7 @@
 
 
     //主表查询
-    Map<String, Object> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
+    List<Map<String, Object>> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
 
     //=查询
     List<Map<String, Object>> equalRelateBizList(@Param("tableName") String tableName,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
index 7e6b017..733bea5 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
@@ -15,11 +15,11 @@
     String getSignFileSealById(@Param("id") Long id, @Param("tableName") String tableName);
 
     @Select(" SELECT minio_file_name " +
-            " FROM  ${tableName}  " +
-            " WHERE template_name =#{name}" +
-            " AND  is_del=0 " +
-            " limit 1 ")
-    String   getFileNameByName(@Param("name") String name, @Param("tableName") String tableName);
+            " FROM  system_template " +
+            " WHERE id =#{id}")
+    String getTemplateFileById(@Param("id") Long id);
+
+
     @Select(" SELECT minio_file_name " +
             " FROM  system_sign  " +
             " WHERE sign_user_id =#{signUserId}  " +
diff --git a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
index 3a5ed4b..12f9c6a 100644
--- a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
@@ -4,9 +4,11 @@
 
 
     <select id="getBizMapList" resultType="java.util.Map">
-        SELECT  *
+        SELECT *
         From ${tableName}
-        WHERE id =#{idValue}
+        <if test="idValue != null">
+            WHERE id =#{idValue}
+        </if>
     </select>
 
     <select id="equalRelateBizList" resultType="java.util.Map">
@@ -21,11 +23,11 @@
     </select>
 
     <select id="inRelateBizList" resultType="java.util.Map">
-        SELECT  *
-        From  ${tableName}
-        WHERE  1=1
+        SELECT *
+        From ${tableName}
+        WHERE 1=1
         <if test="relateIdList != null">
-            and   ${foreignKeyField}  in
+            and ${foreignKeyField} in
             <foreach collection="relateIdList" item="relateId" index="index" open="(" close=")" separator=",">
                 #{relateId}
             </foreach>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
index 8dcb3b3..14245cd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
@@ -37,7 +37,7 @@
 
     @ApiModelProperty("模板名称")
     @TableField("template_file")
-    private String templateFile;
+    private Long templateFile;
 
     @ApiModelProperty("模板字段id")
     @TableField("module_field_id")
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 092d219..0b1a8d7 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
@@ -59,10 +59,6 @@
 //            electronicSeal.setElectronicSealImageUrl(imagePath);
 //            saveFile(electronSealImage, imageCutOffContents[imageCutOffContents.length - 1], imagePath);
 //        }
-
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl =wordOldUrl.replaceAll("docx", "pdf");
-
         if (CollectionUtils.isNotEmpty(filePrintRegister.getElectronicImageList())) {
             //按关键字进行分组
             Map<String, List<ElectronicImage>> sameKeyWordSealMaps = filePrintRegister.getElectronicImageList().stream()
@@ -84,11 +80,8 @@
                 addAbsolutePathStamp(wordOldUrl, wordOldUrl, absolutePathImage);
             }
             //由于合成word总页数存在不准确，先转换为pdf进行获取合成证书总页数, 处理齐缝章
-
         }
-        // 4、将新word转化为pdf文件
-        wordToPdf(wordOldUrl, pdfNewUrl);
-        return pdfNewUrl;
+        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 c365c56..88c3826 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
@@ -50,25 +50,31 @@
      * 5、递归删除因为打印产生的文件信息
      * 6、返还打印产生的证书文件
      */
-    public String registerPrintFile(Long moduleIdValue, String moduleName, String moduleType) {
+    public String registerPrintFile(Long moduleIdValue, String moduleName, String moduleType, Boolean isPdf) {
         String tempLocalFileDir = localFileDir;
-        Assert.isFalse(StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(moduleType) || ObjectUtils.isEmpty(moduleIdValue), () -> {
+        Assert.isFalse(StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(moduleType) , () -> {
             throw new RuntimeException("the certificateReport is null,please check your params...");
         });
         FilePrintRegister metaData = genericFilePrintProcessor.printFileRegister(moduleName, moduleType, moduleIdValue, tempLocalFileDir);
         //获取文件夹目录，没有则创建
         tempLocalFileDir = tempLocalFileDir + metaData.getFileNameId() + File.separator;
-//        createLocalFileDir(tempLocalFileDir);
-//        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
-//        for (String fileName : metaData.getBeDownloadedFileNames()) {
-//            downTemplateFile(fileName, tempLocalFileDir);
-//        }
-//        //合并注册
-        String certificatePdfUrl = FilePrintRegisterUtils.filePrintGenerate(metaData);
-//        //上传到服务器
-//        String certificatePdfName = uploadCertificate(certificatePdfUrl);
-//        //删除无效的文件
-//        File invalidFile = new File(tempLocalFileDir);
+        createLocalFileDir(tempLocalFileDir);
+        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
+        for (String fileName : metaData.getBeDownloadedFileNames()) {
+            downTemplateFile(fileName, tempLocalFileDir);
+        }
+        //合并注册
+        String wordOldUrl = FilePrintRegisterUtils.filePrintGenerate(metaData);
+        if (isPdf) {
+            //默认转为docx，只需要进行docx的替换即可
+            String pdfNewUrl = wordOldUrl.replaceAll("docx", "pdf");
+            // 4、将新word转化为pdf文件
+            FilePrintRegisterUtils.wordToPdf(wordOldUrl, pdfNewUrl);
+        }
+        //上传到服务器
+        //String certificatePdfName = uploadCertificate(wordOldUrl);
+        //删除无效的文件
+        File invalidFile = new File(tempLocalFileDir);
         log.debug("invalid print file start delete, the file directory  is {}", tempLocalFileDir);
         //删除运行空间下的文件
 //        deleteFile(invalidFile);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 0d1211e..ccf7717 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,10 +92,10 @@
      */
     @GetMapping("/test")
     @ResponseBody
-    public void test(Long id) throws Exception {
+    public void test(String id) throws Exception {
 //        //进行证书报告生成，并在远程注册服务器注册
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-        printFileRegister.registerPrintFile(id, "计量人员", "导出word");
+        printFileRegister.registerPrintFile(StringUtils.isEmpty(id) ? null : Long.valueOf(id), "计量人员", "导出word", true);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
index ab29b4e..6b76f47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
@@ -16,7 +16,7 @@
 
 
     //主表查询
-    Map<String, Object> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
+    List<Map<String, Object>> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
 
     //=查询
     List<Map<String, Object>> equalRelateBizList(@Param("tableName") String tableName,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
index 7e6b017..733bea5 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
@@ -15,11 +15,11 @@
     String getSignFileSealById(@Param("id") Long id, @Param("tableName") String tableName);
 
     @Select(" SELECT minio_file_name " +
-            " FROM  ${tableName}  " +
-            " WHERE template_name =#{name}" +
-            " AND  is_del=0 " +
-            " limit 1 ")
-    String   getFileNameByName(@Param("name") String name, @Param("tableName") String tableName);
+            " FROM  system_template " +
+            " WHERE id =#{id}")
+    String getTemplateFileById(@Param("id") Long id);
+
+
     @Select(" SELECT minio_file_name " +
             " FROM  system_sign  " +
             " WHERE sign_user_id =#{signUserId}  " +
diff --git a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
index 3a5ed4b..12f9c6a 100644
--- a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
@@ -4,9 +4,11 @@
 
 
     <select id="getBizMapList" resultType="java.util.Map">
-        SELECT  *
+        SELECT *
         From ${tableName}
-        WHERE id =#{idValue}
+        <if test="idValue != null">
+            WHERE id =#{idValue}
+        </if>
     </select>
 
     <select id="equalRelateBizList" resultType="java.util.Map">
@@ -21,11 +23,11 @@
     </select>
 
     <select id="inRelateBizList" resultType="java.util.Map">
-        SELECT  *
-        From  ${tableName}
-        WHERE  1=1
+        SELECT *
+        From ${tableName}
+        WHERE 1=1
         <if test="relateIdList != null">
-            and   ${foreignKeyField}  in
+            and ${foreignKeyField} in
             <foreach collection="relateIdList" item="relateId" index="index" open="(" close=")" separator=",">
                 #{relateId}
             </foreach>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
index 8dcb3b3..14245cd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
@@ -37,7 +37,7 @@
 
     @ApiModelProperty("模板名称")
     @TableField("template_file")
-    private String templateFile;
+    private Long templateFile;
 
     @ApiModelProperty("模板字段id")
     @TableField("module_field_id")
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 092d219..0b1a8d7 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
@@ -59,10 +59,6 @@
 //            electronicSeal.setElectronicSealImageUrl(imagePath);
 //            saveFile(electronSealImage, imageCutOffContents[imageCutOffContents.length - 1], imagePath);
 //        }
-
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl =wordOldUrl.replaceAll("docx", "pdf");
-
         if (CollectionUtils.isNotEmpty(filePrintRegister.getElectronicImageList())) {
             //按关键字进行分组
             Map<String, List<ElectronicImage>> sameKeyWordSealMaps = filePrintRegister.getElectronicImageList().stream()
@@ -84,11 +80,8 @@
                 addAbsolutePathStamp(wordOldUrl, wordOldUrl, absolutePathImage);
             }
             //由于合成word总页数存在不准确，先转换为pdf进行获取合成证书总页数, 处理齐缝章
-
         }
-        // 4、将新word转化为pdf文件
-        wordToPdf(wordOldUrl, pdfNewUrl);
-        return pdfNewUrl;
+        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 c365c56..88c3826 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
@@ -50,25 +50,31 @@
      * 5、递归删除因为打印产生的文件信息
      * 6、返还打印产生的证书文件
      */
-    public String registerPrintFile(Long moduleIdValue, String moduleName, String moduleType) {
+    public String registerPrintFile(Long moduleIdValue, String moduleName, String moduleType, Boolean isPdf) {
         String tempLocalFileDir = localFileDir;
-        Assert.isFalse(StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(moduleType) || ObjectUtils.isEmpty(moduleIdValue), () -> {
+        Assert.isFalse(StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(moduleType) , () -> {
             throw new RuntimeException("the certificateReport is null,please check your params...");
         });
         FilePrintRegister metaData = genericFilePrintProcessor.printFileRegister(moduleName, moduleType, moduleIdValue, tempLocalFileDir);
         //获取文件夹目录，没有则创建
         tempLocalFileDir = tempLocalFileDir + metaData.getFileNameId() + File.separator;
-//        createLocalFileDir(tempLocalFileDir);
-//        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
-//        for (String fileName : metaData.getBeDownloadedFileNames()) {
-//            downTemplateFile(fileName, tempLocalFileDir);
-//        }
-//        //合并注册
-        String certificatePdfUrl = FilePrintRegisterUtils.filePrintGenerate(metaData);
-//        //上传到服务器
-//        String certificatePdfName = uploadCertificate(certificatePdfUrl);
-//        //删除无效的文件
-//        File invalidFile = new File(tempLocalFileDir);
+        createLocalFileDir(tempLocalFileDir);
+        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
+        for (String fileName : metaData.getBeDownloadedFileNames()) {
+            downTemplateFile(fileName, tempLocalFileDir);
+        }
+        //合并注册
+        String wordOldUrl = FilePrintRegisterUtils.filePrintGenerate(metaData);
+        if (isPdf) {
+            //默认转为docx，只需要进行docx的替换即可
+            String pdfNewUrl = wordOldUrl.replaceAll("docx", "pdf");
+            // 4、将新word转化为pdf文件
+            FilePrintRegisterUtils.wordToPdf(wordOldUrl, pdfNewUrl);
+        }
+        //上传到服务器
+        //String certificatePdfName = uploadCertificate(wordOldUrl);
+        //删除无效的文件
+        File invalidFile = new File(tempLocalFileDir);
         log.debug("invalid print file start delete, the file directory  is {}", tempLocalFileDir);
         //删除运行空间下的文件
 //        deleteFile(invalidFile);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
index 5497156..f8adaa9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
@@ -62,10 +62,10 @@
     public static void electronicNoKeySignSeals(String sings, FilePrintRegister filePrintRegister) {
         List<ElectronicImage> electronicImageSeals = new ArrayList<>();
         if (StringUtils.isNotEmpty(sings)) {
-            String[] approvalSignIds = sings.split(",");
-            List<ElectronicImage> electronicImages = autoCreteAbsoluteSignSealByNumber(approvalSignIds.length);
-            for (int i = 0; i < approvalSignIds.length; i++) {
-                electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(approvalSignIds[i]), electronicImages.get(i), filePrintRegister));
+            String[] signIds = sings.split(",");
+            List<ElectronicImage> electronicImages = autoCreteAbsoluteSignSealByNumber(signIds.length);
+            for (int i = 0; i < signIds.length; i++) {
+                electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(signIds[i]), electronicImages.get(i), filePrintRegister));
             }
         }
         filePrintRegister.setElectronicImageList(electronicImageSeals);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 0d1211e..ccf7717 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,10 +92,10 @@
      */
     @GetMapping("/test")
     @ResponseBody
-    public void test(Long id) throws Exception {
+    public void test(String id) throws Exception {
 //        //进行证书报告生成，并在远程注册服务器注册
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-        printFileRegister.registerPrintFile(id, "计量人员", "导出word");
+        printFileRegister.registerPrintFile(StringUtils.isEmpty(id) ? null : Long.valueOf(id), "计量人员", "导出word", true);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
index ab29b4e..6b76f47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
@@ -16,7 +16,7 @@
 
 
     //主表查询
-    Map<String, Object> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
+    List<Map<String, Object>> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
 
     //=查询
     List<Map<String, Object>> equalRelateBizList(@Param("tableName") String tableName,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
index 7e6b017..733bea5 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
@@ -15,11 +15,11 @@
     String getSignFileSealById(@Param("id") Long id, @Param("tableName") String tableName);
 
     @Select(" SELECT minio_file_name " +
-            " FROM  ${tableName}  " +
-            " WHERE template_name =#{name}" +
-            " AND  is_del=0 " +
-            " limit 1 ")
-    String   getFileNameByName(@Param("name") String name, @Param("tableName") String tableName);
+            " FROM  system_template " +
+            " WHERE id =#{id}")
+    String getTemplateFileById(@Param("id") Long id);
+
+
     @Select(" SELECT minio_file_name " +
             " FROM  system_sign  " +
             " WHERE sign_user_id =#{signUserId}  " +
diff --git a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
index 3a5ed4b..12f9c6a 100644
--- a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
@@ -4,9 +4,11 @@
 
 
     <select id="getBizMapList" resultType="java.util.Map">
-        SELECT  *
+        SELECT *
         From ${tableName}
-        WHERE id =#{idValue}
+        <if test="idValue != null">
+            WHERE id =#{idValue}
+        </if>
     </select>
 
     <select id="equalRelateBizList" resultType="java.util.Map">
@@ -21,11 +23,11 @@
     </select>
 
     <select id="inRelateBizList" resultType="java.util.Map">
-        SELECT  *
-        From  ${tableName}
-        WHERE  1=1
+        SELECT *
+        From ${tableName}
+        WHERE 1=1
         <if test="relateIdList != null">
-            and   ${foreignKeyField}  in
+            and ${foreignKeyField} in
             <foreach collection="relateIdList" item="relateId" index="index" open="(" close=")" separator=",">
                 #{relateId}
             </foreach>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
index 8dcb3b3..14245cd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
@@ -37,7 +37,7 @@
 
     @ApiModelProperty("模板名称")
     @TableField("template_file")
-    private String templateFile;
+    private Long templateFile;
 
     @ApiModelProperty("模板字段id")
     @TableField("module_field_id")
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 092d219..0b1a8d7 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
@@ -59,10 +59,6 @@
 //            electronicSeal.setElectronicSealImageUrl(imagePath);
 //            saveFile(electronSealImage, imageCutOffContents[imageCutOffContents.length - 1], imagePath);
 //        }
-
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl =wordOldUrl.replaceAll("docx", "pdf");
-
         if (CollectionUtils.isNotEmpty(filePrintRegister.getElectronicImageList())) {
             //按关键字进行分组
             Map<String, List<ElectronicImage>> sameKeyWordSealMaps = filePrintRegister.getElectronicImageList().stream()
@@ -84,11 +80,8 @@
                 addAbsolutePathStamp(wordOldUrl, wordOldUrl, absolutePathImage);
             }
             //由于合成word总页数存在不准确，先转换为pdf进行获取合成证书总页数, 处理齐缝章
-
         }
-        // 4、将新word转化为pdf文件
-        wordToPdf(wordOldUrl, pdfNewUrl);
-        return pdfNewUrl;
+        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 c365c56..88c3826 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
@@ -50,25 +50,31 @@
      * 5、递归删除因为打印产生的文件信息
      * 6、返还打印产生的证书文件
      */
-    public String registerPrintFile(Long moduleIdValue, String moduleName, String moduleType) {
+    public String registerPrintFile(Long moduleIdValue, String moduleName, String moduleType, Boolean isPdf) {
         String tempLocalFileDir = localFileDir;
-        Assert.isFalse(StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(moduleType) || ObjectUtils.isEmpty(moduleIdValue), () -> {
+        Assert.isFalse(StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(moduleType) , () -> {
             throw new RuntimeException("the certificateReport is null,please check your params...");
         });
         FilePrintRegister metaData = genericFilePrintProcessor.printFileRegister(moduleName, moduleType, moduleIdValue, tempLocalFileDir);
         //获取文件夹目录，没有则创建
         tempLocalFileDir = tempLocalFileDir + metaData.getFileNameId() + File.separator;
-//        createLocalFileDir(tempLocalFileDir);
-//        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
-//        for (String fileName : metaData.getBeDownloadedFileNames()) {
-//            downTemplateFile(fileName, tempLocalFileDir);
-//        }
-//        //合并注册
-        String certificatePdfUrl = FilePrintRegisterUtils.filePrintGenerate(metaData);
-//        //上传到服务器
-//        String certificatePdfName = uploadCertificate(certificatePdfUrl);
-//        //删除无效的文件
-//        File invalidFile = new File(tempLocalFileDir);
+        createLocalFileDir(tempLocalFileDir);
+        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
+        for (String fileName : metaData.getBeDownloadedFileNames()) {
+            downTemplateFile(fileName, tempLocalFileDir);
+        }
+        //合并注册
+        String wordOldUrl = FilePrintRegisterUtils.filePrintGenerate(metaData);
+        if (isPdf) {
+            //默认转为docx，只需要进行docx的替换即可
+            String pdfNewUrl = wordOldUrl.replaceAll("docx", "pdf");
+            // 4、将新word转化为pdf文件
+            FilePrintRegisterUtils.wordToPdf(wordOldUrl, pdfNewUrl);
+        }
+        //上传到服务器
+        //String certificatePdfName = uploadCertificate(wordOldUrl);
+        //删除无效的文件
+        File invalidFile = new File(tempLocalFileDir);
         log.debug("invalid print file start delete, the file directory  is {}", tempLocalFileDir);
         //删除运行空间下的文件
 //        deleteFile(invalidFile);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
index 5497156..f8adaa9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
@@ -62,10 +62,10 @@
     public static void electronicNoKeySignSeals(String sings, FilePrintRegister filePrintRegister) {
         List<ElectronicImage> electronicImageSeals = new ArrayList<>();
         if (StringUtils.isNotEmpty(sings)) {
-            String[] approvalSignIds = sings.split(",");
-            List<ElectronicImage> electronicImages = autoCreteAbsoluteSignSealByNumber(approvalSignIds.length);
-            for (int i = 0; i < approvalSignIds.length; i++) {
-                electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(approvalSignIds[i]), electronicImages.get(i), filePrintRegister));
+            String[] signIds = sings.split(",");
+            List<ElectronicImage> electronicImages = autoCreteAbsoluteSignSealByNumber(signIds.length);
+            for (int i = 0; i < signIds.length; i++) {
+                electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(signIds[i]), electronicImages.get(i), filePrintRegister));
             }
         }
         filePrintRegister.setElectronicImageList(electronicImageSeals);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java
index 510bad1..d67468d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.file.ModuleFieldMapper;
 import com.casic.missiles.mapper.file.ModuleTemplatePrintMapper;
+import com.casic.missiles.mapper.file.PrintFileRegisterMapper;
 import com.casic.missiles.model.file.ModuleFieldConfig;
 import com.casic.missiles.model.file.ModuleTemplatePrintConfig;
 import com.casic.missiles.service.flowable.ApprovalOperateService;
@@ -49,13 +50,19 @@
                                                      Long id, ModuleTemplatePrintConfig moduleTemplatePrintConfig) {
         FilePrintRegister filePrintRegister = new FilePrintRegister();
         templateFileDir = templateFileDir + id + File.separator;
-        filePrintRegister.setFileName(moduleTemplatePrintConfig.getTemplateFile());
+        /**
+         *   查询模板名称，获取
+         *
+         */
+        PrintFileRegisterMapper fileRegisterMapper = SpringContextUtil.getBean(PrintFileRegisterMapper.class);
+        String templateName = fileRegisterMapper.getTemplateFileById(moduleTemplatePrintConfig.getTemplateFile());
+        filePrintRegister.setFileName(templateName);
         filePrintRegister.setTemDir(templateFileDir);
-        filePrintRegister.setTemplatePath(templateFileDir + moduleTemplatePrintConfig.getTemplateFile());
+        filePrintRegister.setTemplatePath(templateFileDir + templateName);
         filePrintRegister.setFileNameId(id);
         //添加模板到待下载列表
         List<String> fileNames = new ArrayList<>();
-        fileNames.add(moduleTemplatePrintConfig.getTemplateFile());
+        fileNames.add(templateName);
         filePrintRegister.setBeDownloadedFileNames(fileNames);
         //这里需要添加电子签章
         ElectronicSignSeal.electronicNoKeySignSeals(moduleTemplatePrintConfig.getSigns(), filePrintRegister);
@@ -110,14 +117,30 @@
         //获取当前模块配置
         ModuleFieldConfig moduleFieldConfig = moduleFieldMapper.selectById(moduleFieldId);
         //获取当前模块对应的信息
-        Map<String, Object> metaDataMap = moduleFieldMapper.getBizMapList(moduleFieldConfig.getTableName(), moduleIdValue);
-        buildModuleElement(metaDataMap, moduleFieldConfig, filePrintRegister);
-        filePrintRegister.setParams(metaDataMap);
-        Map<String, Object> tableNameIdMap = new HashMap<>();
-        tableNameIdMap.put(moduleFieldConfig.getTableName(), metaDataMap);
-        //时间格式的转换，统一处理
-        convertMapDate(metaDataMap);
-        return tableNameIdMap;
+        List<Map<String, Object>> metaDataList = moduleFieldMapper.getBizMapList(moduleFieldConfig.getTableName(), moduleIdValue);
+        Map<String, Object> tableNameMap = new HashMap<>();
+        if (metaDataList.size() == 1) {
+            Map<String, Object> metaDataMap = metaDataList.get(0);
+            buildModuleElement(metaDataMap, moduleFieldConfig, filePrintRegister);
+            filePrintRegister.setParams(metaDataMap);
+            //时间格式的转换，统一处理
+            convertMapDate(metaDataMap);
+        } else if (metaDataList.size() > 0) {
+            int count = 1;
+            for (Map relateBizMap : metaDataList) {
+                convertMapDate(relateBizMap);
+                relateBizMap.put("seq", count++);
+            }
+            String shortName = getShortName(moduleFieldConfig.getTableName(), filePrintRegister.getParams());
+            //执行当前集合的其他元素查询，例如图片，工作流等字段图片
+            for (Map<String, Object> metaDataMap : metaDataList) {
+                buildModuleElement(metaDataMap, moduleFieldConfig, filePrintRegister);
+            }
+            filePrintRegister.getParams().put(shortName, metaDataList);
+        }
+        //无论是否用于doc文档，都需要将当前元素集合保存到临时缓存
+        tableNameMap.put(moduleFieldConfig.getTableName(), metaDataList);
+        return tableNameMap;
     }
 
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 0d1211e..ccf7717 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -91,10 +92,10 @@
      */
     @GetMapping("/test")
     @ResponseBody
-    public void test(Long id) throws Exception {
+    public void test(String id) throws Exception {
 //        //进行证书报告生成，并在远程注册服务器注册
         PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-        printFileRegister.registerPrintFile(id, "计量人员", "导出word");
+        printFileRegister.registerPrintFile(StringUtils.isEmpty(id) ? null : Long.valueOf(id), "计量人员", "导出word", true);
     }
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
index ab29b4e..6b76f47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/ModuleFieldMapper.java
@@ -16,7 +16,7 @@
 
 
     //主表查询
-    Map<String, Object> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
+    List<Map<String, Object>> getBizMapList(@Param("tableName") String tableName, @Param("idValue") Long idValue);
 
     //=查询
     List<Map<String, Object>> equalRelateBizList(@Param("tableName") String tableName,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
index 7e6b017..733bea5 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/file/PrintFileRegisterMapper.java
@@ -15,11 +15,11 @@
     String getSignFileSealById(@Param("id") Long id, @Param("tableName") String tableName);
 
     @Select(" SELECT minio_file_name " +
-            " FROM  ${tableName}  " +
-            " WHERE template_name =#{name}" +
-            " AND  is_del=0 " +
-            " limit 1 ")
-    String   getFileNameByName(@Param("name") String name, @Param("tableName") String tableName);
+            " FROM  system_template " +
+            " WHERE id =#{id}")
+    String getTemplateFileById(@Param("id") Long id);
+
+
     @Select(" SELECT minio_file_name " +
             " FROM  system_sign  " +
             " WHERE sign_user_id =#{signUserId}  " +
diff --git a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
index 3a5ed4b..12f9c6a 100644
--- a/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/file/ModuleFieldMapper.xml
@@ -4,9 +4,11 @@
 
 
     <select id="getBizMapList" resultType="java.util.Map">
-        SELECT  *
+        SELECT *
         From ${tableName}
-        WHERE id =#{idValue}
+        <if test="idValue != null">
+            WHERE id =#{idValue}
+        </if>
     </select>
 
     <select id="equalRelateBizList" resultType="java.util.Map">
@@ -21,11 +23,11 @@
     </select>
 
     <select id="inRelateBizList" resultType="java.util.Map">
-        SELECT  *
-        From  ${tableName}
-        WHERE  1=1
+        SELECT *
+        From ${tableName}
+        WHERE 1=1
         <if test="relateIdList != null">
-            and   ${foreignKeyField}  in
+            and ${foreignKeyField} in
             <foreach collection="relateIdList" item="relateId" index="index" open="(" close=")" separator=",">
                 #{relateId}
             </foreach>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
index 8dcb3b3..14245cd 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/file/ModuleTemplatePrintConfig.java
@@ -37,7 +37,7 @@
 
     @ApiModelProperty("模板名称")
     @TableField("template_file")
-    private String templateFile;
+    private Long templateFile;
 
     @ApiModelProperty("模板字段id")
     @TableField("module_field_id")
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 092d219..0b1a8d7 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
@@ -59,10 +59,6 @@
 //            electronicSeal.setElectronicSealImageUrl(imagePath);
 //            saveFile(electronSealImage, imageCutOffContents[imageCutOffContents.length - 1], imagePath);
 //        }
-
-        //默认转为docx，只需要进行docx的替换即可
-        String pdfNewUrl =wordOldUrl.replaceAll("docx", "pdf");
-
         if (CollectionUtils.isNotEmpty(filePrintRegister.getElectronicImageList())) {
             //按关键字进行分组
             Map<String, List<ElectronicImage>> sameKeyWordSealMaps = filePrintRegister.getElectronicImageList().stream()
@@ -84,11 +80,8 @@
                 addAbsolutePathStamp(wordOldUrl, wordOldUrl, absolutePathImage);
             }
             //由于合成word总页数存在不准确，先转换为pdf进行获取合成证书总页数, 处理齐缝章
-
         }
-        // 4、将新word转化为pdf文件
-        wordToPdf(wordOldUrl, pdfNewUrl);
-        return pdfNewUrl;
+        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 c365c56..88c3826 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
@@ -50,25 +50,31 @@
      * 5、递归删除因为打印产生的文件信息
      * 6、返还打印产生的证书文件
      */
-    public String registerPrintFile(Long moduleIdValue, String moduleName, String moduleType) {
+    public String registerPrintFile(Long moduleIdValue, String moduleName, String moduleType, Boolean isPdf) {
         String tempLocalFileDir = localFileDir;
-        Assert.isFalse(StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(moduleType) || ObjectUtils.isEmpty(moduleIdValue), () -> {
+        Assert.isFalse(StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(moduleType) , () -> {
             throw new RuntimeException("the certificateReport is null,please check your params...");
         });
         FilePrintRegister metaData = genericFilePrintProcessor.printFileRegister(moduleName, moduleType, moduleIdValue, tempLocalFileDir);
         //获取文件夹目录，没有则创建
         tempLocalFileDir = tempLocalFileDir + metaData.getFileNameId() + File.separator;
-//        createLocalFileDir(tempLocalFileDir);
-//        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
-//        for (String fileName : metaData.getBeDownloadedFileNames()) {
-//            downTemplateFile(fileName, tempLocalFileDir);
-//        }
-//        //合并注册
-        String certificatePdfUrl = FilePrintRegisterUtils.filePrintGenerate(metaData);
-//        //上传到服务器
-//        String certificatePdfName = uploadCertificate(certificatePdfUrl);
-//        //删除无效的文件
-//        File invalidFile = new File(tempLocalFileDir);
+        createLocalFileDir(tempLocalFileDir);
+        //证书产生准备工作，将相应的文件下载到本地的工作空间，获取相应的模板的读取权限
+        for (String fileName : metaData.getBeDownloadedFileNames()) {
+            downTemplateFile(fileName, tempLocalFileDir);
+        }
+        //合并注册
+        String wordOldUrl = FilePrintRegisterUtils.filePrintGenerate(metaData);
+        if (isPdf) {
+            //默认转为docx，只需要进行docx的替换即可
+            String pdfNewUrl = wordOldUrl.replaceAll("docx", "pdf");
+            // 4、将新word转化为pdf文件
+            FilePrintRegisterUtils.wordToPdf(wordOldUrl, pdfNewUrl);
+        }
+        //上传到服务器
+        //String certificatePdfName = uploadCertificate(wordOldUrl);
+        //删除无效的文件
+        File invalidFile = new File(tempLocalFileDir);
         log.debug("invalid print file start delete, the file directory  is {}", tempLocalFileDir);
         //删除运行空间下的文件
 //        deleteFile(invalidFile);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
index 5497156..f8adaa9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/ElectronicSignSeal.java
@@ -62,10 +62,10 @@
     public static void electronicNoKeySignSeals(String sings, FilePrintRegister filePrintRegister) {
         List<ElectronicImage> electronicImageSeals = new ArrayList<>();
         if (StringUtils.isNotEmpty(sings)) {
-            String[] approvalSignIds = sings.split(",");
-            List<ElectronicImage> electronicImages = autoCreteAbsoluteSignSealByNumber(approvalSignIds.length);
-            for (int i = 0; i < approvalSignIds.length; i++) {
-                electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(approvalSignIds[i]), electronicImages.get(i), filePrintRegister));
+            String[] signIds = sings.split(",");
+            List<ElectronicImage> electronicImages = autoCreteAbsoluteSignSealByNumber(signIds.length);
+            for (int i = 0; i < signIds.length; i++) {
+                electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(signIds[i]), electronicImages.get(i), filePrintRegister));
             }
         }
         filePrintRegister.setElectronicImageList(electronicImageSeals);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java
index 510bad1..d67468d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/FilePrintSupport.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.file.ModuleFieldMapper;
 import com.casic.missiles.mapper.file.ModuleTemplatePrintMapper;
+import com.casic.missiles.mapper.file.PrintFileRegisterMapper;
 import com.casic.missiles.model.file.ModuleFieldConfig;
 import com.casic.missiles.model.file.ModuleTemplatePrintConfig;
 import com.casic.missiles.service.flowable.ApprovalOperateService;
@@ -49,13 +50,19 @@
                                                      Long id, ModuleTemplatePrintConfig moduleTemplatePrintConfig) {
         FilePrintRegister filePrintRegister = new FilePrintRegister();
         templateFileDir = templateFileDir + id + File.separator;
-        filePrintRegister.setFileName(moduleTemplatePrintConfig.getTemplateFile());
+        /**
+         *   查询模板名称，获取
+         *
+         */
+        PrintFileRegisterMapper fileRegisterMapper = SpringContextUtil.getBean(PrintFileRegisterMapper.class);
+        String templateName = fileRegisterMapper.getTemplateFileById(moduleTemplatePrintConfig.getTemplateFile());
+        filePrintRegister.setFileName(templateName);
         filePrintRegister.setTemDir(templateFileDir);
-        filePrintRegister.setTemplatePath(templateFileDir + moduleTemplatePrintConfig.getTemplateFile());
+        filePrintRegister.setTemplatePath(templateFileDir + templateName);
         filePrintRegister.setFileNameId(id);
         //添加模板到待下载列表
         List<String> fileNames = new ArrayList<>();
-        fileNames.add(moduleTemplatePrintConfig.getTemplateFile());
+        fileNames.add(templateName);
         filePrintRegister.setBeDownloadedFileNames(fileNames);
         //这里需要添加电子签章
         ElectronicSignSeal.electronicNoKeySignSeals(moduleTemplatePrintConfig.getSigns(), filePrintRegister);
@@ -110,14 +117,30 @@
         //获取当前模块配置
         ModuleFieldConfig moduleFieldConfig = moduleFieldMapper.selectById(moduleFieldId);
         //获取当前模块对应的信息
-        Map<String, Object> metaDataMap = moduleFieldMapper.getBizMapList(moduleFieldConfig.getTableName(), moduleIdValue);
-        buildModuleElement(metaDataMap, moduleFieldConfig, filePrintRegister);
-        filePrintRegister.setParams(metaDataMap);
-        Map<String, Object> tableNameIdMap = new HashMap<>();
-        tableNameIdMap.put(moduleFieldConfig.getTableName(), metaDataMap);
-        //时间格式的转换，统一处理
-        convertMapDate(metaDataMap);
-        return tableNameIdMap;
+        List<Map<String, Object>> metaDataList = moduleFieldMapper.getBizMapList(moduleFieldConfig.getTableName(), moduleIdValue);
+        Map<String, Object> tableNameMap = new HashMap<>();
+        if (metaDataList.size() == 1) {
+            Map<String, Object> metaDataMap = metaDataList.get(0);
+            buildModuleElement(metaDataMap, moduleFieldConfig, filePrintRegister);
+            filePrintRegister.setParams(metaDataMap);
+            //时间格式的转换，统一处理
+            convertMapDate(metaDataMap);
+        } else if (metaDataList.size() > 0) {
+            int count = 1;
+            for (Map relateBizMap : metaDataList) {
+                convertMapDate(relateBizMap);
+                relateBizMap.put("seq", count++);
+            }
+            String shortName = getShortName(moduleFieldConfig.getTableName(), filePrintRegister.getParams());
+            //执行当前集合的其他元素查询，例如图片，工作流等字段图片
+            for (Map<String, Object> metaDataMap : metaDataList) {
+                buildModuleElement(metaDataMap, moduleFieldConfig, filePrintRegister);
+            }
+            filePrintRegister.getParams().put(shortName, metaDataList);
+        }
+        //无论是否用于doc文档，都需要将当前元素集合保存到临时缓存
+        tableNameMap.put(moduleFieldConfig.getTableName(), metaDataList);
+        return tableNameMap;
     }
 
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java
index fe44c2c..73420ef 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/GenericFilePrintProcessor.java
@@ -3,6 +3,7 @@
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.casic.missiles.dto.certificate.FilePrintRegister;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -32,7 +33,7 @@
         //获取当前模板配置信息
         ModuleTemplatePrintConfig moduleTemplatePrintConfig = getModuleTemplatePrintConfig(moduleName, moduleType);
         //判断是否有模板，没有直接抛出异常，健壮性校验
-        Assert.isFalse(StringUtils.isEmpty(moduleTemplatePrintConfig.getTemplateFile()), () -> {
+        Assert.isFalse(ObjectUtils.isEmpty(moduleTemplatePrintConfig.getTemplateFile()), () -> {
             throw new BusinessException(BusinessExceptionEnum.TEMPLATE_FILE_NULL);
         });
         //根据打印模板配置，初始化文件打印注册信息