数据清洗字段添加

src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java

@@ -314,4 +314,15 @@ public class UdiRelevanceEntity {
     @TableField(value = "detailSort")
     private Integer detailSort;
 
+    /**
+     * 无码类型 0、默认不是无码类型；1、部分早期未赋予追溯码；5、最小包装无追溯码；6、无追溯码；7、其他原因
+     */
+    private Integer notCodeType;
+
+    /**
+     * 是否已经人工审核  0：未审核；1：已审核
+     */
+    private Integer manuReview;
+
+
 }

src/main/java/com/glxp/api/entity/basic/YbNotCode.java

@@ -5,29 +5,29 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
-    * 医保无码信息表
+ * 医保无码信息表
-    */
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class YbNotCode {
     /**
-    * 国家医保目录编码
+     * 国家医保目录编码
-    */
+     */
     private String ybbm;
 
     /**
-    * 机构编码
+     * 机构编码
-    */
+     */
     private String organizationcode;
 
     /**
-    * 无码类型
+     * 无码类型
      * 1、部分早期未赋予追溯码
      * 5、最小包装无追溯码
      * 6、无追溯码
      * 7、其他原因
      * 0、默认不是无码类型
-    */
+     */
     private Integer notcodetype;
 }

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -281,7 +281,13 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                                 splitCodeEntity.setRemainCount(-unTagCount);
                                 splitCodeService.updateById(splitCodeEntity);
                             } else {
-                                IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder().code(item.getUdiCode()).errUdiCode(item.getUdiCode()).orderId(item.getOrderIdFk()).action(collectOrder.getBusType()).relId(item.getRelId()).nameCode(item.getNameCode()).batchNo(item.getBatchNo()).produceDate(item.getProductDate()).expireDate(item.getExpireDate()).serialNo(item.getSerialNo()).scanCount(item.getScanCount()).totalCount(item.getScanCount()).workPlaceCode(putWorkPlaceCode).status(2).fifoSplit(1).createTime(new Date()).updateTime(new Date()).remainCount(item.getRemainCount()).build();
+                                IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder()
+                                        .code(item.getUdiCode()).errUdiCode(item.getUdiCode())
+                                        .orderId(item.getOrderIdFk())
+                                        .action(collectOrder.getBusType()).relId(item.getRelId()).nameCode(item.getNameCode())
+                                        .batchNo(item.getBatchNo()).produceDate(item.getProductDate()).expireDate(item.getExpireDate()).serialNo(item.getSerialNo())
+                                        .scanCount(item.getScanCount()).totalCount(item.getScanCount()).workPlaceCode(putWorkPlaceCode)
+                                        .status(2).fifoSplit(1).createTime(new Date()).updateTime(new Date()).remainCount(item.getRemainCount()).build();
                                 this.decorateUnpackExpireTime(ioSplitCodeEntity);
                                 splitCodeService.save(ioSplitCodeEntity);
                             }
@@ -669,6 +675,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         for (IoSplitFifoCodeEntity splitFifoCodeEntity : splitFifoCodeEntities) {
             IoSplitCodeEntity splitCodeEntity = new IoSplitCodeEntity();
             BeanUtils.copyProperties(splitFifoCodeEntity, splitCodeEntity);
+            splitCodeEntity.setWorkPlaceCode(splitFifoCodeEntity.getWorkPlaceCode());
 
             count = IntUtil.value(splitFifoCodeEntity.getTotalCount()) + count;
             splitCodeEntity.setRemainCount(splitCodeEntity.getTotalCount());

src/main/resources/schemas/schema_v2.4.sql

@@ -5445,6 +5445,12 @@ CALL Pro_Temp_ColumnWork('io_order', 'fifoSplitTag',
 CALL Pro_Temp_ColumnWork('io_collect_set', 'drugDealConfirm',
                          ' tinyint NULL DEFAULT b''0''COMMENT ''是否允许取药整单确认''',
                          1);
+
+
+
+CALL Pro_Temp_ColumnWork('basic_udirel', 'manuReview',
+                         'tinyint NULL DEFAULT b''0'' COMMENT ''是否已人工审核''', 1);
+
 CALL Pro_Temp_ColumnWork('basic_udirel', 'notCodeType',
                          ' tinyint NULL DEFAULT b''0''COMMENT ''无码类型''',
                          1);