样品编码问题；

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustReportServiceImpl.java

@@ -195,7 +195,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
         return org.apache.commons.lang3.StringUtils.isBlank(value) ? "" : value.trim();
     }
 
-    private void generateOtherReportFile(EntrustReport report, Long[] sampleIds) {
+    protected void generateOtherReportFile(EntrustReport report, Long[] sampleIds) {
 
         if (ArrayUtils.isEmpty(sampleIds)) {
             return;
@@ -207,7 +207,15 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
             return;
         }
 
-        Map<String, String> sampleMap = sampleList.stream().collect(Collectors.toMap(EntrustSample::getCode, EntrustSample::getFirstCode));
+        Map<String, String> sampleMap = sampleList.stream().collect(Collectors.toMap(t -> {
+            if (StringUtils.isNotEmpty(t.getThirdCode())) {
+                return t.getThirdCode();
+            } else if (StringUtils.isNotEmpty(t.getSecondCode())) {
+                return t.getSecondCode();
+            } else {
+                return t.getFirstCode();
+            }
+        }, EntrustSample::getFirstCode));
         // objectKey data
         InputStream is = ossClient.download(report.getObjectKey());
 
@@ -223,9 +231,9 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
 
         int rowNum = sheet.getLastRowNum();
         // 默认开始行为：5，单元格序号为：-1
-        int startRow = 5, sampleCodePos = -1, sampleBrandPos = -1;
+        int startRow = -1, sampleCodePos = -1, sampleBrandPos = -1;
         flag:
-        for (int i = 5; i < rowNum; i++) {
+        for (int i = 1; i < rowNum; i++) {
             startRow = i;
             XSSFRow xssfRow = sheet.getRow(i);
             for (int j = 0; j < xssfRow.getLastCellNum(); j++) {
@@ -397,7 +405,8 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
         return entrust;
     }
 
-    private boolean doExecuteSubmit(Long[] ids, EntrustFlowEnum fromFlowStatus, EntrustFlowEnum toFlowStatus, Account account) {
+    @Transactional(rollbackFor = Exception.class)
+    protected boolean doExecuteSubmit(Long[] ids, EntrustFlowEnum fromFlowStatus, EntrustFlowEnum toFlowStatus, Account account) {
         Entrust entrust = handleConditionGetEntrust(ids);
         List<Long> sampleIds = getSampleIds(ids);
         RestAssert.fail(null == sampleIds || sampleIds.isEmpty(), "报告样品信息为空");
@@ -494,6 +503,7 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
 
     /**
      * 记录签发人、发放人、记录审核人
+     *
      * @param fromFlowStatus
      * @param account
      * @param entrustReport