|
@@ -418,8 +418,9 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
|
|
|
}
|
|
|
|
|
|
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();
|