Browse Source

动物样本附件调整,不显示null

陈长荣 2 months ago
parent
commit
066cf1df45

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

@@ -210,7 +210,9 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
                 //加急
                 item.setQuick(WhetherEnum.getLabel(item.getQuick()));
                 //年龄
-                item.setAge(item.getAge() + AgeUnitEnum.getLabel(item.getAgeUnit()));
+                if (StrUtil.isNotBlank(item.getAge()) && StrUtil.isNotBlank(item.getAgeUnit())) {
+                    item.setAge(item.getAge() + AgeUnitEnum.getLabel(item.getAgeUnit()));
+                }
                 //检测指标
                 if (StrUtil.isNotBlank(item.getTarget())) {
                     String target = Stream.of(item.getTarget().split(","))

+ 2 - 0
jfcloud-gene-biz/src/main/resources/ftlTemplate/animalSampleTesting.ftl

@@ -1432,6 +1432,7 @@
 								<w:tcPr>
 									<w:tcW w:w="8393" w:type="dxa"/>
 								</w:tcPr>
+                                <#if !(sampleAnimal.specialDetectionParameters??)>
 								<w:p w14:paraId="760DED01" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRDefault="00000000">
 									<w:pPr>
 										<w:rPr>
@@ -1454,6 +1455,7 @@
 										<w:t>备注:上述指标都没有的情况下填写栏</w:t>
 									</w:r>
 								</w:p>
+                                </#if>
 								${sampleAnimal.specialDetectionParameters!}
 							</w:tc>
 						</w:tr>