扫码问题，器械处方扫码教研问题

src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java

@@ -356,5 +356,4 @@ public class IoCollectOrderCodeManController extends BaseController {
     }
 
 
-
 }

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -235,6 +235,9 @@ public class IoCodeTempController extends BaseController {
         String originCode = addEnterCodeRequest.getOriginCode();
         if (originCode == null)
             originCode = "";
+        if (addEnterCodeRequest.getCode().contains(originCode)) {
+            addEnterCodeRequest.setCode(addEnterCodeRequest.getCode().replace(originCode, ""));
+        }
         code = originCode + addEnterCodeRequest.getCode();
         String newCode = addEnterCodeRequest.getCode();
 

src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java

@@ -273,6 +273,11 @@ public class IoCollectOrderBiz implements Serializable {
     @TableField(value = "remark10")
     private String remark10;
 
+    /**
+     * 组套编码/医保编码/术士套包编码
+     */
+    @TableField(value = "checkCode")
+    private String checkCode;
 
     /**
      * 取货确认状态
@@ -303,5 +308,7 @@ public class IoCollectOrderBiz implements Serializable {
 
     @TableField(exist = false)
     private String queueCode;
+
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizBackup.java

@@ -223,6 +223,10 @@ public class IoCollectOrderBizBackup implements Serializable {
     private String remark9;
     @TableField(value = "remark10")
     private String remark10;
-
+    /**
+     * 组套编码/医保编码/术士套包编码
+     */
+    @TableField(value = "checkCode")
+    private String checkCode;
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/collect/IoCollectOrderBizOrigin.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
@@ -263,7 +265,11 @@ public class IoCollectOrderBizOrigin implements Serializable {
     @ApiModelProperty(value = "替换码")
     private String replaceCode;
 
-
+    /**
+     * 组套编码/医保编码/术士套包编码
+     */
+    @TableField(value = "checkCode")
+    private String checkCode;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -640,7 +640,18 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
     public IoCollectOrderBiz vailByBatchNo(List<UdiRelevanceResponse> udiRelevanceResponses, List<IoCollectOrderBiz> collectOrderBizs, UdiEntity udiEntity) {
         for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
             for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
-                if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId()) && (StrUtil.emptyIfNull(collectOrderBiz.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo())))) {
+
+
+//                增加医保编码/组套编码等校验
+                if (StrUtil.isNotEmpty(collectOrderBiz.getCheckCode())) {
+
+                    if ((StrUtil.emptyIfNull(collectOrderBiz.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo())))
+                            && (StrUtil.emptyIfNull(collectOrderBiz.getCheckCode()).contains(StrUtil.emptyIfNull(udiRelevanceResponse.getYbbm())))) {
+                        collectOrderBiz.setRelId(udiRelevanceResponse.getId());
+                        return collectOrderBiz;
+                    }
+
+                } else if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId()) && (StrUtil.emptyIfNull(collectOrderBiz.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo())))) {
                     return collectOrderBiz;
                 }
             }
@@ -652,7 +663,12 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         List<IoCollectOrderBiz> addList = new ArrayList<>();
         for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
             for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
-                if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId())) {
+                if (StrUtil.isNotEmpty(collectOrderBiz.getCheckCode())) {
+                    if (StrUtil.emptyIfNull(collectOrderBiz.getCheckCode()).contains(StrUtil.emptyIfNull(udiRelevanceResponse.getYbbm()))) {
+                        collectOrderBiz.setRelId(udiRelevanceResponse.getId());
+                        return collectOrderBiz;
+                    }
+                } else if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId())) {
                     addList.add(collectOrderBiz);
                 }
             }