宠物食品检测附件签名图片下标按单元格排序

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/entity/SampleCheckItemSerum.java

@@ -48,9 +48,6 @@ public class SampleCheckItemSerum extends BaseEntity {
     @Schema(description = "lis动物种类")
     private String lisPetTypeName;
 
-    @Schema(description = "lis科室id，HT_INFO_DEP")
-    private Integer lisDepId;
-
     @Schema(description = "lis专业组id，HT_INFO_PROF")
     private Integer lisProfId;
 

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/util/ExcelImageService.java

@@ -14,6 +14,7 @@ import org.docx4j.openpackaging.parts.SpreadsheetML.WorksheetPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -61,6 +62,7 @@ public class ExcelImageService {
         StringBuilder sb = new StringBuilder();
         sb.append("<xdr:wsDr xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">");
 
+        imageList.sort(Comparator.comparing(ExcelImage::getLocation));
         for (int i = 1; i <= imageList.size(); i++) {
             ExcelImage excelImage = imageList.get(i - 1);