样本送检 执行后若无项目编号则取批准编号

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleAnimalImagingServiceImpl.java

@@ -252,8 +252,9 @@ public class SampleAnimalImagingServiceImpl extends ServiceImpl<SampleAnimalImag
         SampleInfo sampleInfo = sampleInfoMapper.selectById(sampleId);
 
         String projectType = "样本送检/" + Objects.requireNonNull(SampleTypeEnum.resolve(sampleInfo.getType())).getLabel();
-        if (StrUtil.isNotBlank(sampleInfo.getProjectNo())) {
-            projectType += "/" + sampleInfo.getProjectNo();
+        String proNo = StrUtil.emptyToDefault(sampleInfo.getProjectNo(), sampleInfo.getApprovalNo());
+        if (StrUtil.isNotBlank(proNo)) {
+            projectType += "/" + proNo;
         }
         if (StrUtil.isNotBlank(sampleInfo.getProjectName())) {
             projectType += "/" + sampleInfo.getProjectName();

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleAnimalServiceImpl.java

@@ -287,8 +287,9 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
         SampleInfo sampleInfo = sampleInfoMapper.selectById(sampleId);
 
         String projectType = "样本送检/" + Objects.requireNonNull(SampleTypeEnum.resolve(sampleInfo.getType())).getLabel();
-        if (StrUtil.isNotBlank(sampleInfo.getProjectNo())) {
-            projectType += "/" + sampleInfo.getProjectNo();
+        String proNo = StrUtil.emptyToDefault(sampleInfo.getProjectNo(), sampleInfo.getApprovalNo());
+        if (StrUtil.isNotBlank(proNo)) {
+            projectType += "/" + proNo;
         }
         if (StrUtil.isNotBlank(sampleInfo.getProjectName())) {
             projectType += "/" + sampleInfo.getProjectName();

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SamplePathologicalServiceImpl.java

@@ -283,8 +283,9 @@ public class SamplePathologicalServiceImpl extends ServiceImpl<SamplePathologica
         SampleInfo sampleInfo = sampleInfoMapper.selectById(sampleId);
 
         String projectType = "样本送检/" + Objects.requireNonNull(SampleTypeEnum.resolve(sampleInfo.getType())).getLabel();
-        if (StrUtil.isNotBlank(sampleInfo.getProjectNo())) {
-            projectType += "/" + sampleInfo.getProjectNo();
+        String proNo = StrUtil.emptyToDefault(sampleInfo.getProjectNo(), sampleInfo.getApprovalNo());
+        if (StrUtil.isNotBlank(proNo)) {
+            projectType += "/" + proNo;
         }
         if (StrUtil.isNotBlank(sampleInfo.getProjectName())) {
             projectType += "/" + sampleInfo.getProjectName();