Kaynağa Gözat

样本送检 动物影像附件调整超声其他要求

陈长荣 2 ay önce
ebeveyn
işleme
0ae58af92b

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

@@ -31,6 +31,7 @@ import com.github.jfcloud.gene.sample.vo.*;
 import com.github.jfcloud.gene.sys.service.DBSystemPropertiesService;
 import com.github.jfcloud.gene.util.WordDataService;
 import com.github.jfcloud.gene.util.WordUtil;
+import com.github.jfcloud.rich.config.WordConfig;
 import com.github.jfcloud.rich.vo.HtmlParseVo;
 import com.github.jfcloud.rich.word.WordNodeFactory;
 import lombok.RequiredArgsConstructor;
@@ -157,7 +158,7 @@ public class SampleAnimalImagingServiceImpl extends ServiceImpl<SampleAnimalImag
         ultrasound.setImageRequirements(imgParseVo.getContent());
         images.addAll(imgParseVo.getImageCache());
         //MicroCT-图片要求
-        HtmlParseVo ctImgParseVo = WordNodeFactory.html2xml(animalImagingVo.getMicroCt().getImageRequirements());
+        HtmlParseVo ctImgParseVo = WordNodeFactory.html2xml(animalImagingVo.getMicroCt().getImageRequirements(), new WordConfig().setMaxImageWidth(400));
         animalImagingVo.getMicroCt().setImageRequirements(ctImgParseVo.getContent());
         images.addAll(ctImgParseVo.getImageCache());
         //建模信息

+ 3 - 3
jfcloud-gene-biz/src/main/resources/ftlTemplate/animalImaging.ftl

@@ -4380,7 +4380,7 @@
 											<w:sz w:val="21"/>
 											<w:szCs w:val="21"/>
 										</w:rPr>
-										<w:t xml:space="preserve">${animalImage.researchGroup!}</w:t>
+										<w:t xml:space="preserve">${animalImage.ultrasound.otherData!}</w:t>
 									</w:r>
 								</w:p>
 							</w:tc>
@@ -6031,8 +6031,8 @@
 										<w:rPr>
 											<w:rFonts w:hint="default"/>
 											<w:kern w:val="0"/>
-											<w:sz w:val="24"/>
-											<w:szCs w:val="24"/>
+											<w:sz w:val="21"/>
+											<w:szCs w:val="21"/>
 											<w:u w:val="single"/>
 										</w:rPr>
 										<w:t xml:space="preserve"> ${animalImage.microCt.dataRequirementsOther!} </w:t>