动物样本检测的血清检测申请模版调整

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/handler/MyCheck.java

@@ -1,6 +1,8 @@
 package com.github.jfcloud.gene.handler;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.BooleanUtil;
+import freemarker.template.TemplateBooleanModel;
 import freemarker.template.TemplateMethodModelEx;
 import freemarker.template.TemplateModelException;
 
@@ -19,7 +21,10 @@ public class MyCheck implements TemplateMethodModelEx {
         if (content == null) {
             return getChecked(false);
         }
-        return getChecked(Boolean.parseBoolean(content.toString()));
+        if (content instanceof TemplateBooleanModel) {
+            return getChecked(((TemplateBooleanModel) content).getAsBoolean());
+        }
+        return getChecked(BooleanUtil.toBoolean(content.toString()));
     }
 
     /**

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

@@ -88,4 +88,22 @@ public class SampleAnimal extends BaseEntity {
     @Schema(description = "科研项目送检样本类型")
     @Size(max = 255)
     private String scientificSampleType;
+
+    @Schema(description = "LIS样本类型id")
+    private Long lisSampleTypeId;
+
+    @Schema(description = "LIS样本类型名称")
+    private String lisSampleTypeName;
+
+    @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/service/biz/SampleAnimalServiceImpl.java

@@ -216,12 +216,12 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
                     if (lisDictItemMap.containsKey(item.getLisMachineId())) {
                         dictItemMap = lisDictItemMap.get(item.getLisMachineId());
                     } else {
-                        String sql = "select di.id, di.name from dbo.HT_MACHINE_ITEM mi " +
+                        String sql = "select di.id, di.name, mi.eng_name from dbo.HT_MACHINE_ITEM mi " +
                                 "left join dbo.HT_DICT_ITEM di on mi.ITEM_ID = di.ID " +
                                 "where mi.status=1 and mi.machine_id=" + item.getLisMachineId();
                         List<Entity> entities = lisDb.query(sql);
                         dictItemMap = entities.stream()
-                                .collect(Collectors.toMap(e -> e.getStr("id"), e -> e.getStr("name")));
+                                .collect(Collectors.toMap(e -> e.getStr("id"), e -> e.getStr("eng_name")));
                         lisDictItemMap.put(item.getLisMachineId(), dictItemMap);
                     }
 

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

@@ -78,6 +78,24 @@ public class SampleAnimalVo {
     @Size(max = 255)
     private String scientificSampleType;
 
+    @Schema(description = "LIS样本类型id")
+    private Long lisSampleTypeId;
+
+    @Schema(description = "LIS样本类型名称")
+    private String lisSampleTypeName;
+
+    @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/sql/ddl-20250916.sql

@@ -0,0 +1,6 @@
+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是';