LIS系统查询控制器路径调整

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/lis/config/LisDb.java

@@ -3,6 +3,7 @@ package com.github.jfcloud.gene.lis.config;
 import cn.hutool.db.Db;
 import cn.hutool.db.Entity;
 import cn.hutool.db.ds.simple.SimpleDataSource;
+import cn.hutool.db.sql.SqlFormatter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,7 +32,7 @@ public class LisDb {
         if (dataSource == null) {
             throw new RuntimeException("LIS数据库未配置");
         }
-        log.info("LIS查询：{}", sql);
+        log.info("【LIS查询】：\n{}", SqlFormatter.format(sql));
         return Db.use(dataSource).query(sql);
     }
 }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/controller/SampleCheckItemSerumController.java → jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/lis/controller/SampleCheckItemSerumController.java

@@ -1,7 +1,8 @@
-package com.github.jfcloud.gene.sample.controller;
+package com.github.jfcloud.gene.lis.controller;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Entity;
+import com.github.jfcloud.common.annotation.WebApiLog;
 import com.github.jfcloud.common.core.util.R;
 import com.github.jfcloud.gene.lis.config.LisDb;
 import com.github.jfcloud.gene.lis.constants.LisDictType;
@@ -25,9 +26,10 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Slf4j
-@Tag(name = "样本送检申请单-血清")
+@Tag(name = "样本送检-LIS")
+@WebApiLog
 @RestController
-@RequestMapping("/sample/check/item/serum")
+@RequestMapping("/sample/lis")
 @RequiredArgsConstructor
 public class SampleCheckItemSerumController {
 

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

@@ -2,7 +2,8 @@ ALTER TABLE `jfcloud_gene`.`sample_check_order`
     ADD COLUMN `send_org_id` BIGINT NULL COMMENT '送检机构ID' AFTER `send_user_name`;
 ALTER TABLE `jfcloud_gene`.`sample_check_order`
     ADD COLUMN `send_org_name` VARCHAR(255) NULL COMMENT '送检机构名称' AFTER `send_org_id`;
-
+ALTER TABLE `jfcloud_gene`.`sample_check_order`
+    ADD COLUMN `ext_data` TEXT NULL COMMENT '附加数据' ;
 
 CREATE TABLE sample_check_item_serum
 (
@@ -11,19 +12,25 @@ CREATE TABLE sample_check_item_serum
     code_prefix        varchar(255) NULL COMMENT '样本编号前缀',
     code_suffix        varchar(255) NULL COMMENT '样本编号后缀',
 
-    type               VARCHAR(20) COMMENT '样本类型',
-    sex                VARCHAR(10) COMMENT '性别',
+    lis_sample_type_id        int COMMENT 'lis样本类型id',
+    lis_sample_type_name      VARCHAR(20) COMMENT 'lis样本类型',
+    lis_sex_id         int COMMENT 'lis性别id',
+    lis_sex_name       VARCHAR(10) COMMENT 'lis性别',
     age                VARCHAR(10) COMMENT '年龄',
-    animal_species     varchar(255) NULL COMMENT '动物种类',
-    professional_group VARCHAR(255) COMMENT '专业组',
-    instrument         VARCHAR(255) COMMENT '仪器名称',
+    lis_pet_type_id     int NULL COMMENT 'lis动物种类id',
+    lis_pet_type_name    varchar(20) NULL COMMENT 'lis动物种类',
+    lis_dep_id int NULL COMMENT 'lis科室id，HT_INFO_DEP',
+    lis_prof_id int NULL COMMENT 'lis专业组id，HT_INFO_PROF',
+    lis_prof_name VARCHAR(255) COMMENT 'lis专业组',
+    lis_machine_id int NULL COMMENT 'lis仪器id，HT_INFO_MACHINE',
+    lis_machine_name VARCHAR(255) COMMENT 'lis仪器',
 
-    target             varchar(255) NULL COMMENT '检测指标',
+    target             TEXT NULL COMMENT '检测指标',
     num                varchar(255) NULL COMMENT '样本数量',
     volume             varchar(255) NULL COMMENT '送检样本体积',
     apply_date         varchar(255) NULL COMMENT '申请日期',
     send_date          varchar(255) NULL COMMENT '送检日期',
-    quick              varchar(255) NULL COMMENT '加急',
+    quick              char(1) NULL COMMENT '加急 0否 1是',
     need_back          varchar(255) NULL COMMENT '样本需返还',
     remark             text COMMENT '备注或其他需求',
     create_by          varchar(64)  NOT NULL COMMENT '创建人',