动物样本送检附件交接备注字段调整

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

@@ -81,6 +81,10 @@ public class SampleAnimal extends BaseEntity {
     @Size(max = 255)
     private String handoverRemark;
 
+    @Schema(description = "交接备注信息（其他）")
+    @Size(max = 255)
+    private String handoverRemarkOther;
+
     @Schema(description = "病原样本类型")
     @Size(max = 255)
     private String pathogenSampleType;
@@ -97,13 +101,4 @@ public class SampleAnimal extends BaseEntity {
 
     @Schema(description = "样本需返还")
     private String needBack;
-
-    @Schema(description = "样本需稀释")
-    private String needDilution;
-
-    @Schema(description = "需纸质报告")
-    private String needPaper;
-
-    @Schema(description = "24小时急检")
-    private String quick24;
 }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/vo/SampleAnimalVo.java

@@ -70,6 +70,10 @@ public class SampleAnimalVo {
     @Size(max = 255)
     private String handoverRemark;
 
+    @Schema(description = "交接备注信息（其他）")
+    @Size(max = 255)
+    private String handoverRemarkOther;
+
     @Schema(description = "病原样本类型")
     @Size(max = 255)
     private String pathogenSampleType;
@@ -87,15 +91,6 @@ public class SampleAnimalVo {
     @Schema(description = "样本需返还")
     private String needBack;
 
-    @Schema(description = "样本需稀释")
-    private String needDilution;
-
-    @Schema(description = "需纸质报告")
-    private String needPaper;
-
-    @Schema(description = "24小时急检")
-    private String quick24;
-
     @Schema(description = "委托列表")
     private CommissionObjVo commission = new CommissionObjVo();
 

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

@@ -2468,7 +2468,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-                                        ${myCheck((sampleAnimal.needDilution)! == "1")}
+                                        ${myJsonFilter(animalImage.handoverRemark, '', 'comma_contain', '样本需稀释', 'check')}
 									</w:r>
 									<w:r>
 										<w:rPr>
@@ -2495,7 +2495,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										${myCheck((sampleAnimal.needPaper)! == "1")}
+                                        ${myJsonFilter(animalImage.handoverRemark, '', 'comma_contain', '需要纸质报告', 'check')}
 									</w:r>
 									<w:r>
 										<w:rPr>
@@ -2522,7 +2522,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										${myCheck((sampleAnimal.quick24)! == "1")}
+										${myJsonFilter(animalImage.handoverRemark, '', 'comma_contain', '24h急检', 'check')}
 									</w:r>
 									<w:r>
 										<w:rPr>
@@ -2560,7 +2560,7 @@
 											<w:sz w:val="24"/>
 											<w:szCs w:val="24"/>
 										</w:rPr>
-										${myCheck(sampleAnimal.handoverRemark?has_content)}
+										${myJsonFilter(animalImage.handoverRemark, '', 'comma_contain', '其他', 'check')}
 									</w:r>
 									<w:r>
 										<w:rPr>

jfcloud-gene-biz/src/main/resources/sql/ddl-20250916.sql

@@ -1,6 +1,4 @@
 ALTER TABLE jfcloud_gene.sample_animal ADD lis_sample_type_id varchar(100) NULL COMMENT 'LIS样本类型id';
 ALTER TABLE jfcloud_gene.sample_animal ADD lis_sample_type_name varchar(100) NULL COMMENT 'LIS样本类型名称';
-ALTER TABLE jfcloud_gene.sample_animal ADD need_back CHAR(1) NULL COMMENT '样本需返还：0否 1是';
-ALTER TABLE jfcloud_gene.sample_animal ADD need_dilution CHAR(1) NULL COMMENT '样本需稀释：0否 1是';
-ALTER TABLE jfcloud_gene.sample_animal ADD need_paper CHAR(1) NULL COMMENT '需纸质报告：0否 1是';
-ALTER TABLE jfcloud_gene.sample_animal ADD quick24 CHAR(1) NULL COMMENT '24小时急检：0否 1是';
+ALTER TABLE jfcloud_gene.sample_animal ADD handover_remark_other varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '交接备注信息（其他）';
+