From 691dfdea7f9502c1db1ceddffdf219c72e93ba53 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 4 Oct 2024 23:07:14 +0800 Subject: [PATCH] update --- src/main/java/a8k/service/appstate/AppA8kGStateService.java | 8 ++++++-- src/main/java/a8k/service/appstate/type/OptScanModule.java | 13 +++++++++++++ .../a8k/service/appstate/type/state/OptScanModuleState.java | 6 ++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 src/main/java/a8k/service/appstate/type/OptScanModule.java create mode 100644 src/main/java/a8k/service/appstate/type/state/OptScanModuleState.java diff --git a/src/main/java/a8k/service/appstate/AppA8kGStateService.java b/src/main/java/a8k/service/appstate/AppA8kGStateService.java index 6e2fcca..6cfbd1b 100644 --- a/src/main/java/a8k/service/appstate/AppA8kGStateService.java +++ b/src/main/java/a8k/service/appstate/AppA8kGStateService.java @@ -3,6 +3,7 @@ package a8k.service.appstate; import a8k.service.appdevicectrl.type.app_consumables_mgr_service.ConsumableState; import a8k.service.appstate.type.*; import a8k.service.appstate.type.state.A8kWorkState; +import a8k.service.appstate.type.state.OptScanModuleState; import a8k.type.tube_setting.TubeHolderSetting; import lombok.Data; import org.slf4j.Logger; @@ -30,12 +31,15 @@ public class AppA8kGStateService { EmergencyPosRunState emergencyPosRunState = new EmergencyPosRunState(); //孵育盘状态 IncubationPlateStatus incubationPlateStatus = new IncubationPlateStatus(); + //耗材状态 + ConsumableState consumableState = new ConsumableState(); + //光学模组状态 + OptScanModule optScanModule = new OptScanModule(); // // 耗材状态，试管配置，急诊位样本配置，均是前端提交的设置信息 // - //耗材状态 - ConsumableState consumableState = new ConsumableState(); + //试管配置 List tubeHolderSettings = new ArrayList<>(); diff --git a/src/main/java/a8k/service/appstate/type/OptScanModule.java b/src/main/java/a8k/service/appstate/type/OptScanModule.java new file mode 100644 index 0000000..81800cc --- /dev/null +++ b/src/main/java/a8k/service/appstate/type/OptScanModule.java @@ -0,0 +1,13 @@ +package a8k.service.appstate.type; + +import a8k.service.appstate.type.state.OptScanModuleState; +import a8k.type.type.BloodType; + +public class OptScanModule { + public OptScanModuleState state = OptScanModuleState.IDLE; //模块状态 + public BloodType bloodType = BloodType.WHOLE_BLOOD; //血液类型 + public String sampleBarcode = ""; //用于请求用户信息的条码ID + public String userid = ""; //用户输入的样本ID，不做逻辑，只做展示 + public Integer projIndex = 0; //项目代码 + +} diff --git a/src/main/java/a8k/service/appstate/type/state/OptScanModuleState.java b/src/main/java/a8k/service/appstate/type/state/OptScanModuleState.java new file mode 100644 index 0000000..bb297c4 --- /dev/null +++ b/src/main/java/a8k/service/appstate/type/state/OptScanModuleState.java @@ -0,0 +1,6 @@ +package a8k.service.appstate.type.state; + +public enum OptScanModuleState { + IDLE, + SCANNING, +}