样本送检执行增加默认项目名称

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

@@ -339,15 +339,22 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
             vo.setApprovalType(Long.parseLong(approvalType));
         }
 
+        //项目编号
         String projectNo = sampleInfo.getProjectNo();
         if (StrUtil.isBlank(projectNo)) {
             projectNo = sampleInfo.getApprovalNo();
         }
         Assert.notEmpty(projectNo, "项目编号为空，无法同步");
 
+        //项目名称
+        String projectName = sampleInfo.getProjectName();
+        if (StrUtil.isBlank(projectName)) {
+            projectName = Objects.requireNonNull(SampleTypeEnum.resolve(sampleInfo.getType())).getLabel() + "-" + projectNo;
+        }
+
         //推送数据到科研项目，并得到科研项目id
         ProjectFeignDTO projectFeignDTO = new ProjectFeignDTO();
-        projectFeignDTO.setName(sampleInfo.getProjectName());
+        projectFeignDTO.setName(projectName);
         projectFeignDTO.setLeader(vo.getProjectLeader());
         projectFeignDTO.setProjectType(vo.getApprovalType());
         projectFeignDTO.setProjectCode(projectNo);
@@ -375,10 +382,10 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
             //同步动物中心，生成动物中心项目信息
             LacmsProjectDTO lacmsProjectDTO = new LacmsProjectDTO();
             lacmsProjectDTO.setKyId(kyId);
-            lacmsProjectDTO.setProjectName(sampleInfo.getProjectName());
+            lacmsProjectDTO.setProjectName(projectName);
             lacmsProjectDTO.setProjectLeader(vo.getProjectLeader());
             lacmsProjectDTO.setPl(leaderNickname);
-            lacmsProjectDTO.setEthicsCode(sampleInfo.getProjectNo());
+            lacmsProjectDTO.setEthicsCode(projectNo);
             lacmsProjectDTO.setProjectType("样本送检");
             lacmsProjectDTO.setProjectNum(projectNo);
             log.info("推送动物中心：flowId={}, param={}", id, JSON.toJSONString(lacmsProjectDTO));
@@ -387,7 +394,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
             log.warn("样本送检-动物中心同步配置未开启，不进行同步");
         }
 
-        log.info("样本送检项目 ({}) 同步成功", sampleInfo.getProjectName());
+        log.info("样本送检项目 ({}) 同步成功", projectName);
         getServiceByType(sampleInfo.getType()).afterExecute(id);
     }
 

jfcloud-gene-biz/src/main/resources/ftlTemplate/animalPathological.ftl

@@ -3645,7 +3645,7 @@
 									</w:r>
 									</#if>
 								</w:p>
-								<#if departLeaderAudit?? && projectManagementAudit.remarks??>
+								<#if projectManagementAudit?? && projectManagementAudit.remarks??>
 								<w:p w:rsidR="003011F1" w:rsidRDefault="00000000">
 									<w:pPr>
 										<w:pStyle w:val="TableText"/>