lis同步标本类型

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/lis/constants/LisDictType.java

@@ -5,7 +5,7 @@ package com.github.jfcloud.gene.lis.constants;
  */
 public enum LisDictType {
     LIS_SEX(1002, "性别"),
-    LIS_SAMPLE_TYPE(1038, "标本类型"),
+    LIS_SAMPLE_TYPE(-1, "标本类型"),
     LIS_PET_TYPE(1193, "宠物类型"),
 
     ;

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

@@ -122,12 +122,21 @@ public class SampleLisController {
     @Operation(summary = "获取字典", description = "type说明：LIS_SEX性别 LIS_SAMPLE_TYPE样本类型 LIS_PET_TYPE动物类型 ")
     @GetMapping("/dict")
     public R<List<DictItem>> getLisDict(@RequestParam String type) {
-        String sql = "select sub_class_no, sub_class_name from dbo.HT_BAS_DICT where class_no=%s and status=1 ";
-        sql = String.format(sql, LisDictType.valueOf(type).getClassNo());
+        LisDictType lisDictType = LisDictType.valueOf(type);
+
+        String sql;
+        if (lisDictType == LisDictType.LIS_SAMPLE_TYPE) {
+            //如果是标本类型，需要特殊处理
+            sql = "select id, name from dbo.HT_DICT_SAMPLE order by id desc";
+        } else {
+            //查询字典
+            sql = "select sub_class_no as id, sub_class_name as name from dbo.HT_BAS_DICT where class_no=%s and status=1 ";
+            sql = String.format(sql, lisDictType.getClassNo());
+        }
 
         List<Entity> entities = lisDb.query(sql);
         List<DictItem> dictItems = entities.stream()
-                .map(entity -> new DictItem(entity.getInt("sub_class_no"), entity.getStr("sub_class_name")))
+                .map(entity -> new DictItem(entity.getInt("id"), entity.getStr("name")))
                 .collect(Collectors.toList());
         return R.ok(dictItems);
     }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/lis/entity/HtScienceApply.java

@@ -120,7 +120,7 @@ public class HtScienceApply {
     private Date deliverTime;
 
     /**
-     * 标本ID，HT_DICT_SAMPLE 固定1000000002血清
+     * 标本ID，HT_DICT_SAMPLE 1000000002血清
      */
     private String sampleId = "1000000002";
 
@@ -145,9 +145,9 @@ public class HtScienceApply {
     private String beginNo;
 
     /**
-     * 登记状态 1
+     * 登记状态 0待提交
      */
-    private Integer status = 1;
+    private Integer status = 0;
 
     /**
      * 样本编号 HKYBKY20250326-14-15（HKYBKY+日期+当天编号最大值+（当天编号最大值+样本数））

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/lis/service/LisSyncService.java

@@ -88,6 +88,7 @@ public class LisSyncService {
             scienceApply.setCreateTime(checkOrder.getCreateTime());
             scienceApply.setSex(item.getLisSexId());
             scienceApply.setAge(Integer.parseInt(item.getAge()));
+            scienceApply.setSampleId(item.getLisSampleTypeId().toString());
             scienceApply.setFastFlag(Integer.parseInt(item.getQuick()));
             scienceApply.setApplyDep(serum.getSendOrgId().toString());
             scienceApply.setApplyDocId(serum.getSendUserId().toString());

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

@@ -25,7 +25,7 @@ public class SampleCheckItemSerum extends BaseEntity {
     private String codeSuffix;
 
     @Schema(description = "lis样本类型id")
-    private Integer lisSampleTypeId;
+    private Long lisSampleTypeId;
 
     @Schema(description = "lis样本类型")
     private String lisSampleTypeName;

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

@@ -16,7 +16,7 @@ public class CheckItemSerumVo {
     private String codeSuffix;
 
     @Schema(description = "lis样本类型id")
-    private Integer lisSampleTypeId;
+    private Long lisSampleTypeId;
 
     @Schema(description = "lis样本类型")
     private String lisSampleTypeName;