动物样本送检附件委托书、申请单

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

@@ -165,6 +165,9 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
         JSONObject sampleAnimalObj = JSON.parseObject(JSON.toJSONStringWithDateFormat(sampleAnimal, DatePattern.NORM_DATETIME_PATTERN));
         dataMap.put("sampleAnimal", sampleAnimalObj);
 
+        //申请时间
+        sampleInfoObj.put("applyTime", DateUtil.format(sampleInfo.getApplyTime(), DatePattern.NORM_DATE_PATTERN));
+
         //检测人员
         if (StrUtil.isNotEmpty(sampleInfo.getInspector())) {
             String inspectorName = JSON.parseArray(sampleInfo.getInspector())
@@ -173,7 +176,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
                         JSONObject obj = (JSONObject) item;
                         return obj.getString("name");
                     })
-                    .collect(Collectors.joining(" "));
+                    .collect(Collectors.joining("、"));
             sampleInfoObj.put("inspectorName", inspectorName);
         }
 

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

@@ -761,7 +761,7 @@
 										<w:rPr>
 											<w:rFonts w:hint="default"/>
 										</w:rPr>
-										<w:t xml:space="preserve">${sampleInfo.projectNo!} ${sampleInfo.projectName!}</w:t>
+										<w:t xml:space="preserve">${sampleInfo.projectNo!} / ${sampleInfo.projectName!}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -2509,7 +2509,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.commission?? && sampleAnimal.commission.pig??>
+										<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('猪')>
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -2581,7 +2581,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.commission?? && sampleAnimal.commission.rodent?? >
+										<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('啮齿') >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -2653,7 +2653,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.commission?? && sampleAnimal.commission.monkey?? >
+										<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('猴') >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -2725,7 +2725,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.commission?? && sampleAnimal.commission.dog?? >
+										<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('狗') >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -2797,7 +2797,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.commission?? && sampleAnimal.commission.material?? >
+										<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('物料') >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -2870,7 +2870,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.commission?? && sampleAnimal.commission.cat?? >
+										<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('猫') >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -2943,7 +2943,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.commission?? && sampleAnimal.commission.goat?? >
+										<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('羊') >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -3038,7 +3038,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.order?? && sampleAnimal.order.elisa?? >
+										<#if sampleAnimal.scientificSampleType?? && sampleAnimal.scientificSampleType?contains('ELISA') >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -3125,7 +3125,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.order?? && sampleAnimal.order.urine?? >
+										<#if sampleAnimal.scientificSampleType?? && sampleAnimal.scientificSampleType?contains('尿常规') >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -3213,7 +3213,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.order?? && sampleAnimal.order.blood?? >
+										<#if sampleAnimal.scientificSampleType?? && sampleAnimal.scientificSampleType?contains('血常规') >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -3301,7 +3301,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.order?? && sampleAnimal.order.serum?? >
+										<#if sampleAnimal.scientificSampleType?? && sampleAnimal.scientificSampleType?contains('血清') >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -3325,7 +3325,7 @@
 							</w:rPr>
 						</w:pPr>
 					</w:p>
-					<#if sampleAnimal.commission?? && sampleAnimal.commission.pig?? >
+					<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('猪') >
 					<w:p w14:paraId="76563201" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRPr="00CD5243" w:rsidRDefault="00000000" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>
@@ -3777,7 +3777,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										<#if sampleAnimal.commission.pig?? && purification.source?contains('血清')>
+										<#if sampleAnimal.commission.pig?? >
 											<w:sym w:font="Wingdings 2" w:char="F052"/>
 										<#else >
 											<w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -4148,7 +4148,7 @@
 					</w:tbl>
 					<w:p w14:paraId="70440EA1" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRDefault="004E7E5D"/>
 					</#if>
-					<#if sampleAnimal.commission?? && sampleAnimal.commission.rodent?? >
+					<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('啮齿') >
 					<w:p w14:paraId="7EADC47E" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRPr="00CD5243" w:rsidRDefault="00000000" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>
@@ -5488,7 +5488,7 @@
 					</w:tbl>
 					<w:p w14:paraId="1ED947B4" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRDefault="004E7E5D"/>
 					</#if>
-					<#if sampleAnimal.commission?? && sampleAnimal.commission.monkey?? >
+					<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('猴') >
 					<w:p w14:paraId="0EF0A11E" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRPr="00CD5243" w:rsidRDefault="00000000" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>
@@ -6535,7 +6535,7 @@
 					</w:tbl>
 					<w:p w14:paraId="339B9CBF" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRDefault="004E7E5D"/>
 					</#if>
-					<#if sampleAnimal.commission?? && sampleAnimal.commission.dog?? >
+					<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('狗') >
 					<w:p w14:paraId="2E8E9822" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRPr="00CD5243" w:rsidRDefault="00000000" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>
@@ -7583,7 +7583,7 @@
 					</w:tbl>
 					<w:p w14:paraId="14ACDBFB" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRDefault="004E7E5D" />
 					</#if>
-					<#if sampleAnimal.commission?? && sampleAnimal.commission.material?? >
+					<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('物料') >
 					<w:p w14:paraId="04E5AF8E" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRPr="00CD5243" w:rsidRDefault="00000000" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>
@@ -8396,7 +8396,7 @@
 					</w:tbl>
 					<w:p w14:paraId="3798140B" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRDefault="004E7E5D" />
 					</#if>
-					<#if sampleAnimal.commission?? && sampleAnimal.commission.cat?? >
+					<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('猫') >
 					<w:p w14:paraId="7FB2EF05" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRPr="00CD5243" w:rsidRDefault="00000000" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>
@@ -9450,7 +9450,7 @@
 					</w:tbl>
 					<w:p w14:paraId="30D2787F" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRDefault="004E7E5D" />
 					</#if>
-					<#if sampleAnimal.commission?? && sampleAnimal.commission.goat?? >
+					<#if sampleAnimal.pathogenSampleType?? && sampleAnimal.pathogenSampleType?contains('羊') >
 					<w:p w14:paraId="782C4A70" w14:textId="77777777" w:rsidR="004E7E5D" w:rsidRPr="00CD5243" w:rsidRDefault="00000000" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>
@@ -10499,7 +10499,7 @@
 					</w:tbl>
 					<w:p />
 					</#if>
-					<#if sampleAnimal.order?? && sampleAnimal.order.elisa?? >
+					<#if sampleAnimal.scientificSampleType?? && sampleAnimal.scientificSampleType?contains('ELISA') >
 					<w:p w14:paraId="77E6874E" w14:textId="46F5DC18" w:rsidR="00CD5243" w:rsidRDefault="00CD5243" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>
@@ -12790,7 +12790,7 @@
 					</w:tbl>
 					<w:p w14:paraId="668B0FB5" w14:textId="77777777" w:rsidR="00CD5243" w:rsidRDefault="00CD5243" w:rsidP="00CD5243"/>
 					</#if>
-					<#if sampleAnimal.order?? && sampleAnimal.order.urine?? >
+					<#if sampleAnimal.scientificSampleType?? && sampleAnimal.scientificSampleType?contains('尿常规') >
 					<w:p w14:paraId="7C114218" w14:textId="007958BF" w:rsidR="00CD5243" w:rsidRDefault="00CD5243" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>
@@ -14570,7 +14570,7 @@
 					</w:tbl>
 					<w:p w14:paraId="0CC2AF35" w14:textId="77777777" w:rsidR="00CD5243" w:rsidRDefault="00CD5243" w:rsidP="00CD5243"/>
 					</#if>
-					<#if sampleAnimal.order?? && sampleAnimal.order.blood?? >
+					<#if sampleAnimal.scientificSampleType?? && sampleAnimal.scientificSampleType?contains('血常规') >
 					<w:p w14:paraId="367BE7C4" w14:textId="1DEF55F8" w:rsidR="00CD5243" w:rsidRDefault="00CD5243" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>
@@ -16096,7 +16096,7 @@
 					</w:tbl>
 					<w:p w14:paraId="184367B9" w14:textId="77777777" w:rsidR="00CD5243" w:rsidRDefault="00CD5243" w:rsidP="00CD5243"/>
 					</#if>
-					<#if sampleAnimal.order?? && sampleAnimal.order.serum?? >
+					<#if sampleAnimal.scientificSampleType?? && sampleAnimal.scientificSampleType?contains('血清') >
 					<w:p w14:paraId="180FDCFA" w14:textId="3FB2C772" w:rsidR="00CD5243" w:rsidRDefault="00CD5243" w:rsidP="00CD5243">
 						<w:pPr>
 							<w:pStyle w:val="3"/>