血清送检申请单字段根据lis调整

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

@@ -52,7 +52,7 @@ public class SampleCheckItemSerumController {
     }
 
     @Operation(summary = "获取机构")
-    @GetMapping("/dept")
+    @GetMapping("/dep")
     public R<List<DeptItem>> getLisDept(@RequestParam(required = false) String name) {
         String sql = "select dep.id, dep.name, dict.sub_class_name as dep_name from dbo.HT_INFO_DEP dep " +
                 "left join dbo.HT_BAS_DICT dict on dep.dep_type = dict.sub_class_no and dict.class_no = 1154 " +
@@ -70,13 +70,13 @@ public class SampleCheckItemSerumController {
     }
 
     @Operation(summary = "获取机构下医生")
-    @GetMapping("/dept/doc")
-    public R<List<DeptUserItem>> getLisDeptUser(@RequestParam Integer deptId, @RequestParam(required = false) String name) {
-        String sql = "select hbpu.dep_id as dept_id, hiue.user_id, hiue.name, hiue.email " +
+    @GetMapping("/dep/doc")
+    public R<List<DeptUserItem>> getLisDeptUser(@RequestParam Integer depId, @RequestParam(required = false) String name) {
+        String sql = "select hbpu.dep_id, hiue.user_id, hiue.name, hiue.email " +
                 "from HT_BAS_DEP_USER hbpu " +
                 "left join HT_INFO_USER_EXTEND hiue on hbpu.USER_ID = hiue.USER_ID " +
                 "where hbpu.STATUS =1 and hbpu.DEP_ID =%d and hiue.JOB_LEVEL =1 "; //JOB_LEVEL=1表示医生
-        sql = String.format(sql, deptId);
+        sql = String.format(sql, depId);
         if (StrUtil.isNotBlank(name)) {
             sql += "and hiue.name like '%" + name + "%'";
         }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/lis/vo/DeptUserItem.java

@@ -8,7 +8,7 @@ import lombok.Data;
 public class DeptUserItem {
 
     @Schema(description = "机构id")
-    private Long deptId;
+    private Long depId;
 
     @Schema(description = "用户id")
     private Long userId;

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

@@ -13,7 +13,6 @@ import lombok.EqualsAndHashCode;
 public class SampleCheckItemSerum extends BaseEntity {
 
     @TableId(type = IdType.AUTO)
-    @Schema(description = "主键ID")
     private Integer id;
 
     @Schema(description = "送检申请单id")
@@ -25,23 +24,41 @@ public class SampleCheckItemSerum extends BaseEntity {
     @Schema(description = "样本编号后缀")
     private String codeSuffix;
 
-    @Schema(description = "样本类型")
-    private String type;
+    @Schema(description = "lis样本类型id")
+    private Integer lisSampleTypeId;
 
-    @Schema(description = "性别")
-    private String sex;
+    @Schema(description = "lis样本类型")
+    private String lisSampleTypeName;
+
+    @Schema(description = "lis性别id")
+    private Integer lisSexId;
+
+    @Schema(description = "lis性别")
+    private String lisSexName;
 
     @Schema(description = "年龄")
     private String age;
 
-    @Schema(description = "动物种类")
-    private String animalSpecies;
+    @Schema(description = "lis动物种类id")
+    private Integer lisPetTypeId;
+
+    @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;
+
+    @Schema(description = "lis专业组")
+    private String lisProfName;
 
-    @Schema(description = "专业组")
-    private String professionalGroup;
+    @Schema(description = "lis仪器id，HT_INFO_MACHINE")
+    private Integer lisMachineId;
 
-    @Schema(description = "仪器名称")
-    private String instrument;
+    @Schema(description = "lis仪器")
+    private String lisMachineName;
 
     @Schema(description = "检测指标")
     private String target;

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

@@ -72,4 +72,9 @@ public class SampleCheckOrder extends BaseEntity {
     private Long receiveUserId;
 
     private String receiveUserName;
+
+    /**
+     * 附加数据
+     */
+    private String extData;
 }

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

@@ -15,23 +15,38 @@ public class CheckItemSerumVo {
     @Schema(description = "样本编号后缀")
     private String codeSuffix;
 
-    @Schema(description = "样本类型")
-    private String type;
+    @Schema(description = "lis样本类型id")
+    private Integer lisSampleTypeId;
 
-    @Schema(description = "性别")
-    private String sex;
+    @Schema(description = "lis样本类型")
+    private String lisSampleTypeName;
 
-    @Schema(description = "年龄")
+    @Schema(description = "lis性别id")
+    private Integer lisSexId;
+
+    @Schema(description = "lis性别")
+    private String lisSexName;
+
+    @Schema(description = "年龄，1y2m3d")
     private String age;
 
-    @Schema(description = "动物种类")
-    private String animalSpecies;
+    @Schema(description = "lis动物种类id")
+    private Integer lisPetTypeId;
+
+    @Schema(description = "lis动物种类")
+    private String lisPetTypeName;
+
+    @Schema(description = "lis专业组id")
+    private Integer lisProfId;
+
+    @Schema(description = "lis专业组")
+    private String lisProfName;
 
-    @Schema(description = "专业组")
-    private String professionalGroup;
+    @Schema(description = "lis仪器id")
+    private Integer lisMachineId;
 
-    @Schema(description = "仪器名称")
-    private String instrument;
+    @Schema(description = "lis仪器")
+    private String lisMachineName;
 
     /**
      * 检测指标

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

@@ -19,7 +19,6 @@ CREATE TABLE sample_check_item_serum
     age                VARCHAR(10) 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',