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 e748bf9..356bf06 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
@@ -87,6 +87,8 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
             for(ReportDocumentDataDO dataDO : dataList){
                 String documentContent = dataDO.getDocumentContent();
                 JSONObject dataJson = JSONObject.parseObject(documentContent);
+                if(dataJson == null)
+                    continue;
                 if(dataJson.containsKey(field)){
                     if(!hasFields.contains( fieldName)){
                         fieldList.add(fieldDO);
@@ -404,6 +406,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
             String sampleName = dataDO.getSampleName();
             String sampleCode = dataDO.getSampleCode();
             String sampleNameCode = sampleName + " " + sampleCode;
+            t.put("id", dataDO.getId());
             t.put("sampleNameCode", sampleNameCode);
             t.put("sampleName", sampleName);
             t.put("sampleCode", sampleCode);