diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
index 96a06a7..0f2d0be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
@@ -123,12 +123,18 @@
         //添加图片信息，关联表的信息,关联表信息同时json化
         List<ModuleFieldConfig> moduleFieldConfigList = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(moduleTemplatePrintDetail.getModuleFieldId())) {
-            moduleFieldConfigList.add(moduleFieldMapper.selectById(moduleTemplatePrintDetail.getModuleFieldId()));
+            ModuleFieldConfig moduleFieldConfig = moduleFieldMapper.selectById(moduleTemplatePrintDetail.getModuleFieldId());
+            if (ObjectUtils.isNotEmpty(moduleFieldConfig)) {
+                moduleFieldConfigList.add(moduleFieldConfig);
+            }
         }
         if (StringUtils.isNotEmpty(moduleTemplatePrintDetail.getRelateModuleFieldIds())) {
             String[] relateModuleFieldIds = moduleTemplatePrintDetail.getRelateModuleFieldIds().split(",");
             List<String> relateModuleFieldList = Arrays.asList(relateModuleFieldIds);
-            moduleFieldConfigList.addAll(moduleFieldMapper.selectBatchIds(relateModuleFieldList));
+            List<ModuleFieldConfig> moduleFieldConfigs = moduleFieldMapper.selectBatchIds(relateModuleFieldList);
+            if (CollectionUtil.isNotEmpty(moduleFieldConfigs)) {
+                moduleFieldConfigList.addAll(moduleFieldConfigs);
+            }
         }
         moduleTemplatePrintDetail.setModuleFieldConfigList(moduleFieldConfigList);
         return moduleTemplatePrintDetail;

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
index 96a06a7..0f2d0be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
@@ -123,12 +123,18 @@
         //添加图片信息，关联表的信息,关联表信息同时json化
         List<ModuleFieldConfig> moduleFieldConfigList = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(moduleTemplatePrintDetail.getModuleFieldId())) {
-            moduleFieldConfigList.add(moduleFieldMapper.selectById(moduleTemplatePrintDetail.getModuleFieldId()));
+            ModuleFieldConfig moduleFieldConfig = moduleFieldMapper.selectById(moduleTemplatePrintDetail.getModuleFieldId());
+            if (ObjectUtils.isNotEmpty(moduleFieldConfig)) {
+                moduleFieldConfigList.add(moduleFieldConfig);
+            }
         }
         if (StringUtils.isNotEmpty(moduleTemplatePrintDetail.getRelateModuleFieldIds())) {
             String[] relateModuleFieldIds = moduleTemplatePrintDetail.getRelateModuleFieldIds().split(",");
             List<String> relateModuleFieldList = Arrays.asList(relateModuleFieldIds);
-            moduleFieldConfigList.addAll(moduleFieldMapper.selectBatchIds(relateModuleFieldList));
+            List<ModuleFieldConfig> moduleFieldConfigs = moduleFieldMapper.selectBatchIds(relateModuleFieldList);
+            if (CollectionUtil.isNotEmpty(moduleFieldConfigs)) {
+                moduleFieldConfigList.addAll(moduleFieldConfigs);
+            }
         }
         moduleTemplatePrintDetail.setModuleFieldConfigList(moduleFieldConfigList);
         return moduleTemplatePrintDetail;
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 78f91f9..934b992 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
@@ -124,11 +124,11 @@
                 DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl());
                 //设置图片位于文字顶层
                 docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text);
-                Section section = textSelections[keyWordIndex].getAsOneRange().getDocument().getLastSection();
                 //表、行、列索引是必填的，兼容之前的代码，之前的代码不用配置
                 ImageConfig imageConfig = electronicSeal.getImageConfig();
                 if (ObjectUtils.isNotEmpty(imageConfig.getTableIndex()) &&
                         ObjectUtils.isNotEmpty(imageConfig.getRowIndex()) && ObjectUtils.isNotEmpty(imageConfig.getColIndex())) {
+                    Section section = textSelections[keyWordIndex].getAsOneRange().getDocument().getLastSection();
                     //指定电子章位置
                     //水平位置
                     docPicture.setHorizontalAlignment(ShapeHorizontalAlignment.Center);

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
index 96a06a7..0f2d0be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
@@ -123,12 +123,18 @@
         //添加图片信息，关联表的信息,关联表信息同时json化
         List<ModuleFieldConfig> moduleFieldConfigList = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(moduleTemplatePrintDetail.getModuleFieldId())) {
-            moduleFieldConfigList.add(moduleFieldMapper.selectById(moduleTemplatePrintDetail.getModuleFieldId()));
+            ModuleFieldConfig moduleFieldConfig = moduleFieldMapper.selectById(moduleTemplatePrintDetail.getModuleFieldId());
+            if (ObjectUtils.isNotEmpty(moduleFieldConfig)) {
+                moduleFieldConfigList.add(moduleFieldConfig);
+            }
         }
         if (StringUtils.isNotEmpty(moduleTemplatePrintDetail.getRelateModuleFieldIds())) {
             String[] relateModuleFieldIds = moduleTemplatePrintDetail.getRelateModuleFieldIds().split(",");
             List<String> relateModuleFieldList = Arrays.asList(relateModuleFieldIds);
-            moduleFieldConfigList.addAll(moduleFieldMapper.selectBatchIds(relateModuleFieldList));
+            List<ModuleFieldConfig> moduleFieldConfigs = moduleFieldMapper.selectBatchIds(relateModuleFieldList);
+            if (CollectionUtil.isNotEmpty(moduleFieldConfigs)) {
+                moduleFieldConfigList.addAll(moduleFieldConfigs);
+            }
         }
         moduleTemplatePrintDetail.setModuleFieldConfigList(moduleFieldConfigList);
         return moduleTemplatePrintDetail;
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 78f91f9..934b992 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
@@ -124,11 +124,11 @@
                 DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl());
                 //设置图片位于文字顶层
                 docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text);
-                Section section = textSelections[keyWordIndex].getAsOneRange().getDocument().getLastSection();
                 //表、行、列索引是必填的，兼容之前的代码，之前的代码不用配置
                 ImageConfig imageConfig = electronicSeal.getImageConfig();
                 if (ObjectUtils.isNotEmpty(imageConfig.getTableIndex()) &&
                         ObjectUtils.isNotEmpty(imageConfig.getRowIndex()) && ObjectUtils.isNotEmpty(imageConfig.getColIndex())) {
+                    Section section = textSelections[keyWordIndex].getAsOneRange().getDocument().getLastSection();
                     //指定电子章位置
                     //水平位置
                     docPicture.setHorizontalAlignment(ShapeHorizontalAlignment.Center);
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 c80d547..373e358 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
@@ -52,6 +52,7 @@
     public void registerPrintFile(String moduleName, String moduleType,
                                   Long moduleIdValue, Map<String, Object> customParam,
                                   Boolean isPdf, HttpServletResponse response) {
+        log.info("-----" + JSON.toJSON(customParam));
         this.registerPrintFile(moduleName, moduleType,
                 moduleIdValue, customParam,
                 isPdf, response, null);

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
index 96a06a7..0f2d0be 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/PrintFileTemplateRegisterServiceImpl.java
@@ -123,12 +123,18 @@
         //添加图片信息，关联表的信息,关联表信息同时json化
         List<ModuleFieldConfig> moduleFieldConfigList = new ArrayList<>();
         if (ObjectUtils.isNotEmpty(moduleTemplatePrintDetail.getModuleFieldId())) {
-            moduleFieldConfigList.add(moduleFieldMapper.selectById(moduleTemplatePrintDetail.getModuleFieldId()));
+            ModuleFieldConfig moduleFieldConfig = moduleFieldMapper.selectById(moduleTemplatePrintDetail.getModuleFieldId());
+            if (ObjectUtils.isNotEmpty(moduleFieldConfig)) {
+                moduleFieldConfigList.add(moduleFieldConfig);
+            }
         }
         if (StringUtils.isNotEmpty(moduleTemplatePrintDetail.getRelateModuleFieldIds())) {
             String[] relateModuleFieldIds = moduleTemplatePrintDetail.getRelateModuleFieldIds().split(",");
             List<String> relateModuleFieldList = Arrays.asList(relateModuleFieldIds);
-            moduleFieldConfigList.addAll(moduleFieldMapper.selectBatchIds(relateModuleFieldList));
+            List<ModuleFieldConfig> moduleFieldConfigs = moduleFieldMapper.selectBatchIds(relateModuleFieldList);
+            if (CollectionUtil.isNotEmpty(moduleFieldConfigs)) {
+                moduleFieldConfigList.addAll(moduleFieldConfigs);
+            }
         }
         moduleTemplatePrintDetail.setModuleFieldConfigList(moduleFieldConfigList);
         return moduleTemplatePrintDetail;
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 78f91f9..934b992 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
@@ -124,11 +124,11 @@
                 DocPicture docPicture = paragraph.appendPicture(electronicSeal.getElectronicSealImageUrl());
                 //设置图片位于文字顶层
                 docPicture.setTextWrappingStyle(TextWrappingStyle.In_Front_Of_Text);
-                Section section = textSelections[keyWordIndex].getAsOneRange().getDocument().getLastSection();
                 //表、行、列索引是必填的，兼容之前的代码，之前的代码不用配置
                 ImageConfig imageConfig = electronicSeal.getImageConfig();
                 if (ObjectUtils.isNotEmpty(imageConfig.getTableIndex()) &&
                         ObjectUtils.isNotEmpty(imageConfig.getRowIndex()) && ObjectUtils.isNotEmpty(imageConfig.getColIndex())) {
+                    Section section = textSelections[keyWordIndex].getAsOneRange().getDocument().getLastSection();
                     //指定电子章位置
                     //水平位置
                     docPicture.setHorizontalAlignment(ShapeHorizontalAlignment.Center);
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 c80d547..373e358 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
@@ -52,6 +52,7 @@
     public void registerPrintFile(String moduleName, String moduleType,
                                   Long moduleIdValue, Map<String, Object> customParam,
                                   Boolean isPdf, HttpServletResponse response) {
+        log.info("-----" + JSON.toJSON(customParam));
         this.registerPrintFile(moduleName, moduleType,
                 moduleIdValue, customParam,
                 isPdf, response, null);
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 4839a72..adf9604 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
@@ -173,6 +173,7 @@
             //获取当前模块配置
             ModuleFieldConfig moduleFieldConfig = moduleFieldMapper.selectById(moduleFieldId);
             //构建图片元素
+            populateMergeColNames(moduleFieldConfig, filePrintRegister);
             buildDocImageElement(customParam, filePrintRegister, moduleFieldConfig);
         }
         //通过模块ids集合，进行关联模块参数的获取
@@ -216,8 +217,6 @@
             //判断是否是用于doc填充
             if (ObjectUtils.isNotEmpty(moduleFieldConfig.getDocUse()) && (1 == moduleFieldConfig.getDocUse())) {
                 int count = 1;
-                //简称
-                String shortName = getShortName(moduleFieldConfig.getTableName(), filePrintRegister.getParams());
                 //健壮性校验
                 if (CollectionUtils.isEmpty(relateBizMapList)) {
                     return;
@@ -230,6 +229,8 @@
                 for (Map<String, Object> metaDataMap : relateBizMapList) {
                     buildModuleElement(metaDataMap, moduleFieldConfig, filePrintRegister);
                 }
+                //简称
+                String shortName = getShortName(moduleFieldConfig.getTableName(), filePrintRegister.getParams());
                 //判断当前模块信息在单元格中的执行情况
                 if (StringUtils.isEmpty(moduleFieldConfig.getObjectString())) {
                     //不作为当前一个单元格执行
@@ -421,7 +422,7 @@
     private void buildDocImageElement(Map<String, Object> metaDataMap, FilePrintRegister filePrintRegister, ModuleFieldConfig moduleFieldConfig) {
         if (StringUtils.isNotEmpty(moduleFieldConfig.getImageJson())) {
             //获取审批流程的bean
-            List<ImageConfig> imageConfig = JSON.parseObject(moduleFieldConfig.getImageJson(), List.class);
+            List<ImageConfig> imageConfig = JSON.parseArray(moduleFieldConfig.getImageJson(), ImageConfig.class);
             //遍历判断是否有工作流字段（approvalField），工作流map取出
             ElectronicSignSeal.approvalImage(metaDataMap, moduleFieldConfig.getFlowField(), imageConfig, filePrintRegister);
             //执行构建关键字图片集合，默认为不会在列表中构建图片