新增耗材分类

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

@@ -108,6 +108,11 @@ public class UdiRelevanceEntity {
      */
     @TableField(value = "attributeType")
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    @TableField(value = "hcType")
+    private Integer hcType;
     /**
      * 是否允许多次使用出库
      */

src/main/java/com/glxp/api/req/basic/AddProductRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.api.req.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -52,6 +53,12 @@ public class AddProductRequest {
     @JsonProperty("attributeType")
     @NotEmpty(message = "产品属性必填！")
     private Integer attributeType;
+    /**
+     * 耗材分类高值 ：1：高值耗材；2.普通耗材
+     */
+    @JsonProperty("hcType")
+    @NotEmpty(message = "耗材分类必填！")
+    private Integer hcType;
 
     /**
      * 医疗器械注册人

src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java

@@ -58,6 +58,10 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 耗材分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private String corpId;
     private String billType;
     private String manufactory;

src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java

@@ -54,6 +54,10 @@ public class FilterUdiInfoRequest extends ListPageRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 耗材分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private String corpId;
     private String billType;
 

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -59,6 +59,10 @@ public class FilterUdiRelRequest extends ListPageRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 耗材分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private String corpId;
     private String billType;
 

src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java

@@ -38,6 +38,10 @@ public class UdiRelevanceRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 耗材分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private String supName;
     private String originUuid;
     private String price;

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -30,6 +30,10 @@ public class UdiRelevanceSaveRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 耗材分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
 
     private Boolean useMuti;
     private Integer useNum;

src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java

@@ -66,6 +66,10 @@ public class CompanyProductRelevanceResponse {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 耗材分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private String scbssfbhph;
     private String scbssfbhxlh;
     private String scbssfbhscrq;

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -31,6 +31,10 @@ public class UdiRelevanceResponse {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 耗材分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private Boolean useMuti;
     private Integer useNum;
     private String supName;

src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java

@@ -68,6 +68,10 @@ public class UdiInfoResponse {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 耗材分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private boolean isDisable;
     private boolean useMuti;
 

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -247,7 +247,7 @@ public class UdiProductServiceImpl implements UdiProductService {
         udiRelevanceEntity.setNeedCert(false);
         udiRelevanceEntity.setPurType(1);
         udiRelevanceEntity.setAttributeType(addProductRequest.getAttributeType());
-
+        udiRelevanceEntity.setHcType(addProductRequest.getHcType());
         // TODO: 2024/2/27 初始化其他字段
         setUpdateInfo(udiProductEntity,udiRelevanceEntity);
 

src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml

@@ -100,7 +100,7 @@
                basic_udirel.mainId,
                basic_udirel.isAdavence,
                basic_udirel.purType,
-               basic_udirel.attributeType,
+               basic_udirel.attributeType,basic_udirel.hcType,
                basic_products.scbssfbhph,
                basic_products.scbssfbhxlh,
                basic_products.scbssfbhscrq,

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1228,7 +1228,7 @@
         INTO basic_udirel
         (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
         isLock,
-        lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+        lockStatus, isAdavence,purType,attributeType,hcType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
         createUser,
         updateUser,
         remark, useExpireTime, dispatch, groupBuy, needCert)
@@ -1245,7 +1245,7 @@
         #{isDisable},
         #{isLock},
         #{lockStatus},
-        #{isAdavence},#{purType},#{attributeType},
+        #{isAdavence},#{purType},#{attributeType},#{hcType},
         #{useMuti},
         #{useNum},
         #{supName},
@@ -1264,7 +1264,7 @@
         INTO basic_udirel
         (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
         isLock,
-        lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+        lockStatus, isAdavence,purType,attributeType, hcType,useMuti, useNum, supName, createTime, updateTime, modifyTime,
         createUser,
         updateUser,
         remark, useExpireTime, dispatch, groupBuy, needCert)
@@ -1281,7 +1281,7 @@
         #{isDisable},
         #{isLock},
         #{lockStatus},
-        #{isAdavence},#{purType},#{attributeType},
+        #{isAdavence},#{purType},#{attributeType},#{hcType},
         #{useMuti},
         #{useNum},
         #{supName},
@@ -1361,6 +1361,9 @@
             <if test="attributeType != null">
                 attributeType=#{attributeType},
             </if>
+            <if test="hcType != null">
+                hcType=#{hcType},
+            </if>
             <if test="useMuti != null">
                 useMuti=#{useMuti},
             </if>
@@ -1440,7 +1443,7 @@
         into basic_udirel
         (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
         isLock,
-        lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+        lockStatus, isAdavence,purType,attributeType,hcType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
         createUser,
         updateUser,
         remark, useExpireTime, dispatch, groupBuy, needCert)
@@ -1460,7 +1463,7 @@
             #{item.isDisable},
             #{item.isLock},
             #{item.lockStatus},
-            #{item.isAdavence},#{item.purType},#{item.attributeType},
+            #{item.isAdavence},#{item.purType},#{item.attributeType},#{item.hcType},
             #{item.useMuti},
             #{item.useNum},
             #{item.supName},

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -47,7 +47,7 @@
                basic_udirel.mainId,
                basic_udirel.isAdavence,
                basic_udirel.purType,
-               basic_udirel.attributeType,
+               basic_udirel.attributeType,basic_udirel.hcType,
                basic_udirel.lowStockNum,
                basic_udirel.overStockNum,
                basic_udirel.recentDateTime,

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

@@ -506,7 +506,7 @@ SET FOREIGN_KEY_CHECKS = 1;
 CALL Pro_Temp_ColumnWork('thr_corp', 'kfdm', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'purType', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'attributeType', 'tinyint', 1);
-
+CALL Pro_Temp_ColumnWork('basic_udirel', 'hcType', 'tinyint', 1);
 
 INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`,
                                      `sort`, `localEdit`)