LIS专业组和仪器增加默认值

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

@@ -11,6 +11,7 @@ import com.github.jfcloud.gene.lis.vo.CheckItem;
 import com.github.jfcloud.gene.lis.vo.DepItem;
 import com.github.jfcloud.gene.lis.vo.DeptUserItem;
 import com.github.jfcloud.gene.lis.vo.DictItem;
+import com.github.jfcloud.gene.sample.vo.CheckItemSerumVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -34,8 +35,12 @@ public class SampleLisController {
 
     @Operation(summary = "获取检测指标")
     @GetMapping("/target")
-    public R<List<CheckItem>> getLisItem(@RequestParam Long machineId,
+    public R<List<CheckItem>> getLisItem(@RequestParam(required = false) Integer machineId,
                                          @RequestParam(required = false) String name) {
+        if (machineId == null) {
+            machineId = new CheckItemSerumVo().getLisMachineId();
+        }
+
         String sql = "select di.id, di.name, mi.eng_name, mi.unit 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=" + machineId;

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

@@ -40,16 +40,16 @@ public class CheckItemSerumVo {
     private String lisPetTypeName;
 
     @Schema(description = "lis专业组id")
-    private Integer lisProfId;
+    private Integer lisProfId = 1000000002;
 
     @Schema(description = "lis专业组")
-    private String lisProfName;
+    private String lisProfName = "普检室";
 
     @Schema(description = "lis仪器id")
-    private Integer lisMachineId;
+    private Integer lisMachineId = 1000000001;
 
     @Schema(description = "lis仪器")
-    private String lisMachineName;
+    private String lisMachineName = "日立(HITACHI) 3110";
 
     /**
      * 检测指标