diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java
index 01debfcc..ccb7828d 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java
@@ -67,9 +67,8 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
     //@PreAuthorize("@ss.hasPermission('qms:report-document-data:create')")
     public CommonResult<JSONArray> assembleByReportData(@RequestBody JSONObject jsonObject) {
 //        Long mainId = jsonObject.getLong("mainId");
-        List<BusinessAssayReportDataDO> assayReportDataList = jsonObject.getJSONArray("assayReportDataList").toJavaList(BusinessAssayReportDataDO.class);
-        List<String> itemNameList = jsonObject.getJSONArray("itemNameList").toJavaList(String.class);
-        return reportDocumentDataService.assembleByReportData(assayReportDataList, itemNameList);
+
+        return reportDocumentDataService.assembleByReportData(jsonObject);
     }
 
     /*
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataService.java
index 819b7bdc..a26d26f2 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataService.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataService.java
@@ -22,7 +22,7 @@ public interface ReportDocumentDataService {
 
     CommonResult<JSONArray> assembleDynamicData(ReportDocumentMainDO mainData, ReportDocumentTypeDO reportConfig, String pageFlag);
 
-    CommonResult<JSONArray> assembleByReportData(List<BusinessAssayReportDataDO> assayReportDataList, List<String> itemNameList);
+    CommonResult<JSONArray> assembleByReportData(JSONObject jsonObject);
 
     CommonResult<List<ReportDocumentDataDO>> listByMainDataId(Long mainDataId);
     CommonResult<Long> countMainDataId(Long mainDataId);
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java
index d14bc903..2e583a57 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java
@@ -869,7 +869,10 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
      *
      * */
     @Override
-    public CommonResult<JSONArray> assembleByReportData(List<BusinessAssayReportDataDO> assayReportDataList, List<String> itemNameList) {
+    public CommonResult<JSONArray> assembleByReportData(JSONObject jsonObject) {
+        List<BusinessAssayReportDataDO> assayReportDataList = jsonObject.getJSONArray("assayReportDataList").toJavaList(BusinessAssayReportDataDO.class);
+        List<String> itemNameList = jsonObject.getJSONArray("itemNameList").toJavaList(String.class);
+        JSONObject signatureData = jsonObject.getJSONObject("signatureData");
         if(assayReportDataList.isEmpty() || itemNameList.isEmpty())
             return CommonResult.success(new JSONArray());
         String pageFlag = "1";
@@ -887,8 +890,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
         DictionaryBusinessRespVO dictConf = dictionaryBusinessService.getDataByDataKey("工段报告表单编辑模板参数").getData();
         if(dictConf != null && !ObjectUtils.isEmpty(dictConf.getCustomConfig()))
             reportConfigStr = dictConf.getCustomConfig();
-        ReportDocumentMainDO mainData = new ReportDocumentMainDO();
-        mainData.builder().formData("").documentSignature("").documentConfig("");
+        ReportDocumentMainDO mainData = new ReportDocumentMainDO().builder().formData("").documentSignature(signatureData.toJSONString()).documentConfig("").build();
         JSONObject configJson = JSONObject.parseObject(reportConfigStr);
         String verticalFlag = configJson.getString("verticalFlag");
         String maxRowCountStr = configJson.getString("maxRowCount");                    //最大行数