update

README.md

@@ -47,6 +47,31 @@ TODO:
 ```
 
 ```
+    <!-- 耗材 -->
+    <!-- 添加样本 -->
+        
+    
+
+    入料:
+        while(true)
+        {
+            
+
+
+
+        }
+
+    <!-- startReaction -->
+
+
+
+
+
+
+
+```
+
+```
 
 第一层服务
     FrontEndEventRouter 前端事件路由器

src/main/java/a8k/dbservice/type/A8kProjIdCardDBIterm.java

@@ -1,19 +0,0 @@
-package a8k.dbservice.type;
-
-import a8k.type.projecttype.a8kidcard.A8kIdCardInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-//public class A8kProjIdCardDBIterm {
-//	public int     id;
-//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//	public Date    insertTime;
-//	public String  color;
-//	public String  projectName;
-//	public String  lotName; //唯一标识
-//	public Integer updateChipVersion;
-//
-//	public A8kIdCardInfo idcardinfo;
-//
-//}

src/main/java/a8k/service/app/SampleFormulaMgrService.java

@@ -4,10 +4,9 @@ import a8k.type.appret.AppRet;
 import a8k.controler.extapi.utils.ExtApiTab;
 import a8k.controler.extapi.utils.ExtApiFn;
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
-import a8k.type.sample_formula_mgr.A8kDeviceCfg;
-import a8k.type.sample_formula_mgr.EmergencyCfg;
+import a8k.type.sample_formula_mgr.A8kDeviceSampleCfg;
 import a8k.type.type.BloodType;
-import a8k.type.sample_formula_mgr.SampleTubeCfg;
+import a8k.type.sample_formula_mgr.SampleFormula;
 import a8k.type.sample_formula_mgr.SampleTubeHolderCfg;
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import org.springframework.stereotype.Component;
@@ -15,22 +14,21 @@ import org.springframework.stereotype.Component;
 @Component
 @ExtApiTab(cfg = ExtApiTabConfig.SampleFormulaMgrService)
 public class SampleFormulaMgrService {
-	A8kDeviceCfg deviceCfg = new A8kDeviceCfg();
+	A8kDeviceSampleCfg deviceCfg = new A8kDeviceSampleCfg();
 
 	static class ORDER {
-		static final int getA8kDeviceCfg     = 1;
-		static final int addCfg              = 2;
-		static final int removeCfg           = 3;
-		static final int activeCfg           = 4;
-		static final int updateTubeUsrCfg    = 5;
+		static final int getA8kDeviceCfg = 1;
+		static final int addCfg = 2;
+		static final int removeCfg = 3;
+		static final int activeCfg = 4;
+		static final int updateTubeUsrCfg = 5;
 		static final int clearTubeProjectCfg = 6;
-		static final int addTubeProjectCode  = 7;
-		static final int setTubeBloodType    = 8;
-		static final int getEmergencyCfg     = 9;
-		static final int addEmergencyCfg     = 10;
+		static final int addTubeProjectCode = 7;
+		static final int setTubeBloodType = 8;
+		static final int getEmergencyCfg = 9;
+		static final int addEmergencyCfg = 10;
 	}
 
-
 	private SampleTubeHolderCfg dbFindCfg(String tubeHolderCfgUUID) {
 		for (SampleTubeHolderCfg cfg : deviceCfg.cfgs) {
 			if (cfg.uuid.equals(tubeHolderCfgUUID)) {
@@ -44,7 +42,7 @@ public class SampleFormulaMgrService {
 		deviceCfg.cfgs.removeIf(cfg -> cfg.uuid.equals(tubeHolderCfgUUID));
 	}
 
-	private SampleTubeCfg dbFindTubeCfg(String tubeHolderCfgUUID, Integer tubeIndex) {
+	private SampleFormula dbFindTubeCfg(String tubeHolderCfgUUID, Integer tubeIndex) {
 		SampleTubeHolderCfg cfg = dbFindCfg(tubeHolderCfgUUID);
 		if (cfg == null) {
 			return null;
@@ -56,7 +54,7 @@ public class SampleFormulaMgrService {
 	// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 	@ExtApiFn(name = "获取设备配置", group = "基础", order = ORDER.getA8kDeviceCfg)
-	public A8kDeviceCfg getA8kDeviceCfg() {
+	public A8kDeviceSampleCfg getA8kDeviceCfg() {
 		return deviceCfg;
 	}
 
@@ -73,7 +71,6 @@ public class SampleFormulaMgrService {
 		return AppRet.success();
 	}
 
-
 	@ExtApiFn(name = "激活<试管架>配置", group = "试管架", order = ORDER.activeCfg)
 	public AppRet<SampleTubeHolderCfg> activeCfg(String tubeHolderCfgUUID, Boolean active) {
 		SampleTubeHolderCfg cfg = dbFindCfg(tubeHolderCfgUUID);
@@ -84,52 +81,50 @@ public class SampleFormulaMgrService {
 		return AppRet.success();
 	}
 
-
 	@ExtApiFn(name = "修改<试管>用户信息配置", group = "试管", order = ORDER.updateTubeUsrCfg)
-	public AppRet<SampleTubeCfg> updateTubeUsrCfg(String uuid, Integer tubeIndex, String udpid, String barcodeid) {
+	public AppRet<SampleFormula> updateTubeUsrCfg(String uuid, Integer tubeIndex, String udpid, String barcodeid) {
 		SampleTubeHolderCfg cfg = dbFindCfg(uuid);
 		assert cfg != null;
 		cfg.tubeCfgs.get(tubeIndex).barcodeid = barcodeid;
-		cfg.tubeCfgs.get(tubeIndex).udpid     = udpid;
+		cfg.tubeCfgs.get(tubeIndex).udpid = udpid;
 		return AppRet.success(cfg.tubeCfgs.get(tubeIndex));
 	}
 
-
 	@ExtApiFn(name = "清除<试管>项目信息", group = "试管", order = ORDER.clearTubeProjectCfg)
-	public AppRet<SampleTubeCfg> clearTubeProjectCfg(String uuid, Integer tubeIndex) {
+	public AppRet<SampleFormula> clearTubeProjectCfg(String uuid, Integer tubeIndex) {
 		SampleTubeHolderCfg cfg = dbFindCfg(uuid);
 		assert cfg != null;
-		cfg.tubeCfgs.get(tubeIndex).projectCodes.clear();
+		cfg.tubeCfgs.get(tubeIndex).bindProjIndex.clear();
 		cfg.tubeCfgs.get(tubeIndex).bloodType = BloodType.WHOLE_BLOOD;
 		return AppRet.success(cfg.tubeCfgs.get(tubeIndex));
 	}
 
 	@ExtApiFn(name = "添加<试管>项目信息", group = "试管", order = ORDER.addTubeProjectCode)
-	public AppRet<SampleTubeCfg> addTubeProjectCode(String uuid, Integer tubeIndex, String pjc) {
+	public AppRet<SampleFormula> addTubeProjectCode(String uuid, Integer tubeIndex, Integer projIndex) {
 		SampleTubeHolderCfg cfg = dbFindCfg(uuid);
 		assert cfg != null;
-		SampleTubeCfg tubeCfg = new SampleTubeCfg();
-		tubeCfg.projectCodes.add(pjc);
+		SampleFormula tubeCfg = new SampleFormula();
+		tubeCfg.bindProjIndex.add(projIndex);
 		cfg.tubeCfgs.add(tubeCfg);
 		return AppRet.success(tubeCfg);
 	}
 
 	@ExtApiFn(name = "设置<试管>血型", group = "试管", order = ORDER.setTubeBloodType)
-	public AppRet<SampleTubeCfg> setTubeBloodType(String uuid, Integer tubeIndex, BloodType bloodType) {
-		SampleTubeCfg tubeCfg = dbFindTubeCfg(uuid, tubeIndex);
+	public AppRet<SampleFormula> setTubeBloodType(String uuid, Integer tubeIndex, BloodType bloodType) {
+		SampleFormula tubeCfg = dbFindTubeCfg(uuid, tubeIndex);
 		assert tubeCfg != null;
 		tubeCfg.bloodType = bloodType;
 		return AppRet.success();
 	}
 
-	@ExtApiFn(name = "获取<急诊位>配置", group = "急诊位", order = ORDER.getEmergencyCfg)
-	public AppRet<EmergencyCfg> getEmergencyCfg() {
-		return AppRet.success(deviceCfg.emergencyCfg);
-	}
+	// @ExtApiFn(name = "获取<急诊位>配置", group = "急诊位", order = ORDER.getEmergencyCfg)
+	// public AppRet<EmergencyCfg> getEmergencyCfg() {
+	// return AppRet.success(deviceCfg.emergencyCfg);
+	// }
 
-	@ExtApiFn(name = "添加<急诊位>配置", group = "急诊位", order = ORDER.addEmergencyCfg)
-	public AppRet<EmergencyCfg> addEmergencyCfg(EmergencyCfg cfg) {
-		deviceCfg.emergencyCfg = cfg;
-		return AppRet.success(deviceCfg.emergencyCfg);
-	}
+	// @ExtApiFn(name = "添加<急诊位>配置", group = "急诊位", order = ORDER.addEmergencyCfg)
+	// public AppRet<EmergencyCfg> addEmergencyCfg(EmergencyCfg cfg) {
+	// deviceCfg.emergencyCfg = cfg;
+	// return AppRet.success(deviceCfg.emergencyCfg);
+	// }
 }

src/main/java/a8k/type/sample_formula_mgr/A8kDeviceCfg.java → src/main/java/a8k/type/sample_formula_mgr/A8kDeviceSampleCfg.java

@@ -3,7 +3,7 @@ package a8k.type.sample_formula_mgr;
 import java.util.ArrayList;
 import java.util.List;
 
-public class A8kDeviceCfg {
+public class A8kDeviceSampleCfg {
 	//配置
 	public List<SampleTubeHolderCfg> cfgs         = new ArrayList<>();
 	public EmergencyCfg              emergencyCfg = null;

src/main/java/a8k/type/sample_formula_mgr/EmergencyCfg.java

@@ -7,13 +7,7 @@ import java.util.List;
 public class EmergencyCfg {
 	public String       udpid;   //用户输入的样本ID，不做逻辑，只做展示
 	public String       barcodeid; //用于请求用户信息的条码ID
-	public List<String> projectCodes; //项目编码,用于查找项目相关信息
 	public BloodType    bloodType = BloodType.WHOLE_BLOOD; //血型
 
-	public String projectCodes0;
-	public String projectCodes1;
-	public String projectCodes2;
-	public String projectCodes3;
-	public String projectCodes4;
-	public String projectCodes5;
+	public List<Integer> bindProjIndex;
 }

src/main/java/a8k/type/sample_formula_mgr/SampleFormula.java

@@ -0,0 +1,15 @@
+package a8k.type.sample_formula_mgr;
+
+import a8k.type.type.BloodType;
+
+import java.util.List;
+
+public class SampleFormula {
+	public String tubeHolderUUID;
+	public int    tubeIndex;
+
+	public String        udpid;   //用户输入的样本ID，不做逻辑，只做展示
+	public String        barcodeid; //用于请求用户信息的条码ID
+	public List<Integer> bindProjIndex; //项目编码,标明需要做的项目
+	public BloodType     bloodType = BloodType.WHOLE_BLOOD; //血型
+}

src/main/java/a8k/type/sample_formula_mgr/SampleTubeCfg.java

@@ -1,15 +0,0 @@
-package a8k.type.sample_formula_mgr;
-
-import a8k.type.type.BloodType;
-
-import java.util.List;
-
-public class SampleTubeCfg {
-	public String tubeHolderUUID;
-	public int    tubeIndex;
-
-	public String       udpid;   //用户输入的样本ID，不做逻辑，只做展示
-	public String       barcodeid; //用于请求用户信息的条码ID
-	public List<String> projectCodes; //项目编码,用于查找项目相关信息
-	public BloodType    bloodType = BloodType.WHOLE_BLOOD; //血型
-}

src/main/java/a8k/type/sample_formula_mgr/SampleTubeHolderCfg.java

@@ -9,12 +9,12 @@ public class SampleTubeHolderCfg {
 	public String                   uuid           = UUID.randomUUID().toString(); //唯一标识
 	public Boolean                  active         = false;//是否激活
 	public A8kTubeType              tubeHolderType = A8kTubeType.BloodTube; //试管架类型
-	public ArrayList<SampleTubeCfg> tubeCfgs       = new ArrayList<>(); //试管配置
+	public ArrayList<SampleFormula> tubeCfgs       = new ArrayList<>(); //试管配置
 	public Integer                  index          = 0;//试管架索引
 
 	public SampleTubeHolderCfg() {
 		for (int i = 0; i < 10; i++) {
-			var tubeCfg = new SampleTubeCfg();
+			var tubeCfg = new SampleFormula();
 			tubeCfg.tubeHolderUUID = uuid;
 			tubeCfg.tubeIndex      = i;
 			tubeCfgs.add(tubeCfg);