Merge remote-tracking branch 'origin/test' into test

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java

@@ -214,9 +214,17 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
 
         //委托单号
         String entrustCode = "";
+
         if(!ObjectUtils.isEmpty(entrustList)){
             for(BusinessSampleEntrustRegistrationDO entrust : entrustList){
                 entrustCode += entrust.getEntrustNumber() + ",";
+                String externalInfomation = entrust.getExternalInfomation();
+                if(!ObjectUtils.isEmpty(externalInfomation)){
+                    JSONObject externalInfomationJson = JSONObject.parseObject(externalInfomation);
+                    String sampleCategory = externalInfomationJson.getString("sampleCategory");
+                    if(!ObjectUtils.isEmpty(sampleCategory))
+                        formDataJson.put("sampleCategory", sampleCategory);
+                }
                 break;
             }
         }