Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck

# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
#	src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
#	src/main/resources/mybatis/mapper/basic/UdiProductDao.xml

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -22,12 +22,14 @@ import com.glxp.api.entity.sync.SocketMsgEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.entity.thrsys.ThrSystemEntity;
+import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.basic.*;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicProductThirdSysResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
+import com.glxp.api.res.chs.YbHcflEntityResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.*;
 import com.glxp.api.service.inout.impl.IoCodeService;
@@ -46,6 +48,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -74,6 +77,8 @@ public class UdiRelevanceController extends BaseController {
     ProductInfoService productInfoService;
     @Resource
     UdiRelevanceDao udiRelevanceDao;
+    @Resource
+    ErpBasicClient erpBasicClient;
 
     //手持终端下载UDI产品信息
     @AuthRuleAnnotation("")
@@ -356,6 +361,11 @@ public class UdiRelevanceController extends BaseController {
         udiProductEntity.setBasicPrductRemak6(udiRelevanceSaveRequest.getBasicPrductRemak6());
         udiProductEntity.setBasicPrductRemak7(udiRelevanceSaveRequest.getBasicPrductRemak7());
         udiProductEntity.setBasicPrductRemak8(udiRelevanceSaveRequest.getBasicPrductRemak8());
+
+        udiProductEntity.setCatalogname1(udiRelevanceSaveRequest.getCatalogname1());
+        udiProductEntity.setCatalogname2(udiRelevanceSaveRequest.getCatalogname2());
+        udiProductEntity.setCatalogname3(udiRelevanceSaveRequest.getCatalogname3());
+        udiProductEntity.setMatrial(udiRelevanceSaveRequest.getMatrial());
 //        udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
         if (StrUtil.isNotEmpty(udiRelevanceSaveRequest.getOriginUuid())) {
             udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
@@ -770,4 +780,19 @@ public class UdiRelevanceController extends BaseController {
         return ResultVOUtils.success(udiProductEntities);
     }
 
+    //国家库医保编码获取医保耗材详情
+    @PostMapping("/udi/udirel/ybHcflDetail")
+    public BaseResponse ybHcflDetail(@RequestBody @Valid YbHcflDetailFilterRequest ybHcflDetailFilterRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        BaseResponse<PageSimpleResponse<YbHcflEntityResponse>> ybHcflDetail = erpBasicClient.getYbHcflDetail(ybHcflDetailFilterRequest);
+        PageSimpleResponse<YbHcflEntityResponse> data = ybHcflDetail.getData();
+        YbHcflEntityResponse entityResponse = new YbHcflEntityResponse();
+        if (data.getList().size() > 0){
+            entityResponse = data.getList().get(0);
+        }
+        return ResultVOUtils.success(entityResponse);
+    }
+
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -351,6 +352,34 @@ public class BasicProductsEntity {
     @TableField(value = "cphhhbh")
     private String cphhhbh;
 
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private String catalogname3;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
+
     public static final String COL_ID = "id";
 
     public static final String COL_UUID = "uuid";

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

@@ -1,6 +1,7 @@
 package com.glxp.api.entity.basic;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -105,5 +106,34 @@ public class UdiProductEntity {
      * 产品分类高值 ：1：高值耗材；2.普通耗材
      */
     private Integer hcType;
+
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private String catalogname3;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
+
     private String remark;
 }

src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java

@@ -333,4 +333,34 @@ public class ThrProductsAddDiEntity {
     private String nameCode;
 
 
+
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private String catalogname3;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
+
+
 }

src/main/java/com/glxp/api/http/ErpBasicClient.java

@@ -10,11 +10,13 @@ import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.api.entity.thrsys.ThrSystemEntity;
 import com.glxp.api.http.req.UdiwmsBusTypeRequest;
 import com.glxp.api.http.req.UdiwmsUnitRequest;
+import com.glxp.api.req.basic.YbHcflDetailFilterRequest;
 import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest;
 import com.glxp.api.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest;
 import com.glxp.api.req.thrsys.UdiwmsWarehouseRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.chs.YbHcflEntityResponse;
 import com.glxp.api.res.thrsys.ThrCorpsResponse;
 import com.glxp.api.res.thrsys.ThrProductsResponse;
 import com.glxp.api.res.thrsys.UdiwmsWarehouseDetail;
@@ -170,4 +172,26 @@ public class ErpBasicClient {
             return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");
         }
     }
+
+    /**
+     * 医保耗材详情
+     */
+    public BaseResponse<PageSimpleResponse<YbHcflEntityResponse>> getYbHcflDetail(YbHcflDetailFilterRequest ybHcflDetailFilterRequest) {
+        String url = "https://www.udims.com/UDI_DL_Server_test"+"/udchs/ybHcfl/list";
+        try {
+            ybHcflDetailFilterRequest.setLimit(1);
+            ybHcflDetailFilterRequest.setPage(1);
+            String specificationCode = ybHcflDetailFilterRequest.getSpecificationCode().substring(0, 15);
+            ybHcflDetailFilterRequest.setSpecificationCode(specificationCode);
+            String response = httpOkClient.uCloudPost(url, ybHcflDetailFilterRequest);
+            BaseResponse<PageSimpleResponse<YbHcflEntityResponse>> listBaseResponse =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<YbHcflEntityResponse>>>() {
+                    });
+            return listBaseResponse;
+        } catch (Exception e) {
+            log.error("获取患者处方信息", e);
+            return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
+        }
+    }
+
 }

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

@@ -1,5 +1,7 @@
 package com.glxp.api.req.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 //选入产品补充信息
@@ -31,4 +33,33 @@ public class SupplementRequest {
      * 产品分类高值 ：1：高值耗材；2.普通耗材
      */
     private Integer hcType;
+
+
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private String catalogname3;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
 }

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

@@ -25,4 +25,5 @@ public class UdiInfoExportRequest extends ListPageRequest {
     private String thirdId4;
     private String price;
     private SupplementRequest supplementRequest;
+
 }

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

@@ -1,5 +1,7 @@
 package com.glxp.api.req.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -89,6 +91,35 @@ public class UdiInfoRequest {
     private String mjfs;
     private String categoryName;
 
+
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private String catalogname3;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
+
     public void setCheck(Boolean check) {
         isCheck = check;
     }

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

@@ -1,5 +1,7 @@
 package com.glxp.api.req.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -112,4 +114,32 @@ public class UdiRelevanceSaveRequest {
     private Boolean groupBuy;           //是否集采产品
     private Boolean needCert;           //是否需要资质材料
     private String certIdFk;
+
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private String catalogname3;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
 }

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

@@ -0,0 +1,20 @@
+package com.glxp.api.req.basic;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+@Data
+public class YbHcflDetailFilterRequest {
+
+
+    @Length(
+            message = "医疗耗材分类代码最少15个字符"
+            , min = 15
+            , max = 50
+    )
+    private String specificationCode;
+
+    private Integer page;
+    private Integer limit;
+
+}

src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java

@@ -1,5 +1,7 @@
 package com.glxp.api.req.thrsys;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -61,4 +63,34 @@ public class AddThrDiProductsRequest {
     private Integer hcType;
 
 
+
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private String catalogname3;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
+
+
 }

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

@@ -1,5 +1,7 @@
 package com.glxp.api.res.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
@@ -144,6 +146,36 @@ public class UdiRelevanceResponse {
     private Boolean newNeedUpload;
 
 
+
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private String catalogname3;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
+
+
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
             return 1;

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

@@ -1,5 +1,7 @@
 package com.glxp.api.res.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -103,4 +105,33 @@ public class UdiRlSupResponse {
     private boolean groupBuy;           //是否集采产品
     private String cphhhbh;
     private Long uid;
+
+
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private String catalogname3;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
 }

src/main/java/com/glxp/api/res/chs/YbHcflEntityResponse.java

@@ -0,0 +1,163 @@
+package com.glxp.api.res.chs;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+    * 医保耗材分类
+    */
+@Data
+public class YbHcflEntityResponse implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+     * 医用耗材分类代码
+     */
+    @TableField(value = "specificationCode")
+    @ApiModelProperty(value="医用耗材分类代码")
+    private String specificationCode;
+
+    @TableField(value = "specificationId")
+    @ApiModelProperty(value="")
+    private Integer specificationId;
+
+    /**
+     * 三级分类代码
+     */
+    @TableField(value = "catalogcode")
+    @ApiModelProperty(value="三级分类代码")
+    private String catalogcode;
+
+    /**
+     * 一级分类名称(学科，品名）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    private String catalogname1;
+
+    /**
+     * 二级分类名称(用途、品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类名称(部位、功能、品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    private String catalogname3;
+
+    /**
+     * 医保通用代码
+     */
+    @TableField(value = "commonnamecode")
+    @ApiModelProperty(value="医保通用代码")
+    private String commonnamecode;
+
+    /**
+     * 医保通用名
+     */
+    @TableField(value = "commonname")
+    @ApiModelProperty(value="医保通用名")
+    private String commonname;
+
+    /**
+     * 材质代码
+     */
+    @TableField(value = "matrialcode")
+    @ApiModelProperty(value="材质代码 ")
+    private String matrialcode;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="耗材材质")
+    private String matrial;
+
+    /**
+     * 规格代码
+     */
+    @TableField(value = "characteristiccode")
+    @ApiModelProperty(value="规格代码")
+    private String characteristiccode;
+
+    /**
+     * 规格(特征、参数）
+     */
+    @TableField(value = "characteristic")
+    @ApiModelProperty(value="规格(特征、参数）")
+    private String characteristic;
+
+    /**
+     * 分开收费
+     */
+    @TableField(value = "separateCharges")
+    @ApiModelProperty(value="分开收费")
+    private String separateCharges;
+
+    /**
+     * 支付类型
+     */
+    @TableField(value = "paymentType")
+    @ApiModelProperty(value="支付类型")
+    private String paymentType;
+
+    /**
+     * 支付标准
+     */
+    @TableField(value = "paymentStandard")
+    @ApiModelProperty(value="支付标准")
+    private String paymentStandard;
+
+    /**
+     * 是否在用
+     */
+    @TableField(value = "isusing")
+    @ApiModelProperty(value="是否在用")
+    private String isusing;
+
+    /**
+     * 规格状态
+     */
+    @TableField(value = "specificationType")
+    @ApiModelProperty(value="规格状态")
+    private String specificationType;
+
+    /**
+     * 产品状态
+     */
+    @TableField(value = "productStatusS")
+    @ApiModelProperty(value="产品状态")
+    private String productStatusS;
+
+    /**
+     * 产品数量
+     */
+    @TableField(value = "productCount")
+    @ApiModelProperty(value="产品数量")
+    private String productCount;
+
+    @TableField(value = "compCount")
+    @ApiModelProperty(value="")
+    private String compCount;
+
+    @TableField(value = "regCount")
+    @ApiModelProperty(value="")
+    private String regCount;
+
+    @TableField(value = "goodsCount")
+    @ApiModelProperty(value="")
+    private String goodsCount;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/res/chs/YbHcxxEntityResponse.java

@@ -0,0 +1,155 @@
+package com.glxp.api.res.chs;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+    * 医保耗材信息
+    */
+@Data
+public class YbHcxxEntityResponse implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+     * 医用耗材代码
+     */
+    @TableField(value = "specificationCode")
+    @ApiModelProperty(value="医用耗材代码")
+    private String specificationCode;
+
+    /**
+     * 耗材分类代码(外键）
+     */
+    @TableField(value = "hcflCodeFk")
+    @ApiModelProperty(value="耗材分类代码(外键）")
+    private String hcflCodeFk;
+
+    /**
+     * 一级分类（学科，品类）
+     */
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="一级分类（学科，品类）")
+    private String catalogname1;
+
+    /**
+     * 二级分类（用途，品目）
+     */
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="二级分类（用途，品目）")
+    private String catalogname2;
+
+    /**
+     * 三级分类（部位，功能，品种）
+     */
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="三级分类（部位，功能，品种）")
+    private String catalogname3;
+
+    /**
+     * 规格（特征，参数）
+     */
+    @TableField(value = "characteristic")
+    @ApiModelProperty(value="规格（特征，参数）")
+    private String characteristic;
+
+    @TableField(value = "codeCount")
+    @ApiModelProperty(value="")
+    private String codeCount;
+
+    @TableField(value = "codeCounts")
+    @ApiModelProperty(value="")
+    private String codeCounts;
+
+    /**
+     * 医保通用名
+     */
+    @TableField(value = "commonname")
+    @ApiModelProperty(value="医保通用名")
+    private String commonname;
+
+    @TableField(value = "compCounts")
+    @ApiModelProperty(value="")
+    private String compCounts;
+
+    /**
+     * 耗材企业
+     */
+    @TableField(value = "companyName")
+    @ApiModelProperty(value="耗材企业")
+    private String companyName;
+
+    /**
+     * 材质
+     */
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="材质")
+    private String matrial;
+
+    @TableField(value = "model")
+    @ApiModelProperty(value="")
+    private String model;
+
+    @TableField(value = "proCounts")
+    @ApiModelProperty(value="")
+    private String proCounts;
+
+    @TableField(value = "prodCount")
+    @ApiModelProperty(value="")
+    private String prodCount;
+
+    @TableField(value = "productName")
+    @ApiModelProperty(value="")
+    private String productName;
+
+    @TableField(value = "productionCode")
+    @ApiModelProperty(value="")
+    private String productionCode;
+
+    @TableField(value = "regCount")
+    @ApiModelProperty(value="")
+    private String regCount;
+
+    @TableField(value = "regCounts")
+    @ApiModelProperty(value="")
+    private String regCounts;
+
+    @TableField(value = "regcardName")
+    @ApiModelProperty(value="")
+    private String regcardName;
+
+    @TableField(value = "regcardnm")
+    @ApiModelProperty(value="")
+    private String regcardnm;
+
+    /**
+     * 版本日期
+     */
+    @TableField(value = "releaseVersion")
+    @ApiModelProperty(value="版本日期")
+    private String releaseVersion;
+
+    @TableField(value = "specCount")
+    @ApiModelProperty(value="")
+    private String specCount;
+
+    @TableField(value = "specCounts")
+    @ApiModelProperty(value="")
+    private String specCounts;
+
+    @TableField(value = "specification")
+    @ApiModelProperty(value="")
+    private String specification;
+
+    @TableField(value = "totals")
+    @ApiModelProperty(value="")
+    private String totals;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/res/chs/YbHcxxGgEntityResponse.java

@@ -0,0 +1,249 @@
+package com.glxp.api.res.chs;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+    * 医保耗材信息规格
+    */
+@Data
+public class YbHcxxGgEntityResponse implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "addTime")
+    @ApiModelProperty(value="创建时间")
+    private String addTime;
+
+    /**
+     * 创建用户ID
+     */
+    @TableField(value = "addUserId")
+    @ApiModelProperty(value="创建用户ID")
+    private String addUserId;
+
+    /**
+     * 创建用户名称
+     */
+    @TableField(value = "addUserName")
+    @ApiModelProperty(value="创建用户名称")
+    private String addUserName;
+
+    @TableField(value = "auditRemark")
+    @ApiModelProperty(value="")
+    private String auditRemark;
+
+    @TableField(value = "auditUserId")
+    @ApiModelProperty(value="")
+    private String auditUserId;
+
+    @TableField(value = "auditUserName")
+    @ApiModelProperty(value="")
+    private String auditUserName;
+
+    /**
+     * 耗材分类编码（C010101）
+     */
+    @TableField(value = "catalogCode")
+    @ApiModelProperty(value="耗材分类编码（C010101）")
+    private String catalogCode;
+
+    @TableField(value = "catalogname1")
+    @ApiModelProperty(value="")
+    private String catalogname1;
+
+    @TableField(value = "catalogname2")
+    @ApiModelProperty(value="")
+    private String catalogname2;
+
+    @TableField(value = "catalogname3")
+    @ApiModelProperty(value="")
+    private String catalogname3;
+
+    @TableField(value = "characteristic")
+    @ApiModelProperty(value="")
+    private String characteristic;
+
+    @TableField(value = "codeOld")
+    @ApiModelProperty(value="")
+    private String codeOld;
+
+    /**
+     * 医保耗材分类编码（C01010100101001039410000001）
+     */
+    @TableField(value = "codeShow")
+    @ApiModelProperty(value="医保耗材分类编码（C01010100101001039410000001）")
+    private String codeShow;
+
+    @TableField(value = "commonname")
+    @ApiModelProperty(value="")
+    private String commonname;
+
+    /**
+     * 企业名称
+     */
+    @TableField(value = "companyName")
+    @ApiModelProperty(value="企业名称")
+    private String companyName;
+
+    @TableField(value = "dataType")
+    @ApiModelProperty(value="")
+    private String dataType;
+
+    /**
+     * 规格型号编码
+     */
+    @TableField(value = "ggxhCode")
+    @ApiModelProperty(value="规格型号编码")
+    private String ggxhCode;
+
+    /**
+     * 产品ID
+     */
+    @TableField(value = "goodsid")
+    @ApiModelProperty(value="产品ID")
+    private String goodsid;
+
+    @TableField(value = "isUsing")
+    @ApiModelProperty(value="")
+    private String isUsing;
+
+    /**
+     * 上一次更新时间
+     */
+    @TableField(value = "lastUpdateTime")
+    @ApiModelProperty(value="上一次更新时间")
+    private String lastUpdateTime;
+
+    /**
+     * 上一次更新用户ID
+     */
+    @TableField(value = "lastUpdateUserId")
+    @ApiModelProperty(value="上一次更新用户ID")
+    private String lastUpdateUserId;
+
+    /**
+     * 上一个更新人（胡海燕(shenhe_haiyan)）
+     */
+    @TableField(value = "lastUpdateUserName")
+    @ApiModelProperty(value="上一个更新人（胡海燕(shenhe_haiyan)）")
+    private String lastUpdateUserName;
+
+    @TableField(value = "mapingCode")
+    @ApiModelProperty(value="")
+    private String mapingCode;
+
+    @TableField(value = "matrial")
+    @ApiModelProperty(value="")
+    private String matrial;
+
+    /**
+     * 规格
+     */
+    @TableField(value = "model")
+    @ApiModelProperty(value="规格")
+    private String model;
+
+    /**
+     * 旧注册证
+     */
+    @TableField(value = "oldregcardnm")
+    @ApiModelProperty(value="旧注册证")
+    private String oldregcardnm;
+
+    /**
+     * 产品名称
+     */
+    @TableField(value = "productName")
+    @ApiModelProperty(value="产品名称")
+    private String productName;
+
+    /**
+     * 产品id
+     */
+    @TableField(value = "productid")
+    @ApiModelProperty(value="产品id")
+    private String productid;
+
+    /**
+     * 产品编码
+     */
+    @TableField(value = "productionCode")
+    @ApiModelProperty(value="产品编码")
+    private String productionCode;
+
+    /**
+     * 注册备案产品名称
+     */
+    @TableField(value = "regcardName")
+    @ApiModelProperty(value="注册备案产品名称")
+    private String regcardName;
+
+    /**
+     * 注册备案产品ID
+     */
+    @TableField(value = "regcardid")
+    @ApiModelProperty(value="注册备案产品ID")
+    private String regcardid;
+
+    /**
+     * 注册备案号
+     */
+    @TableField(value = "regcardnm")
+    @ApiModelProperty(value="注册备案号")
+    private String regcardnm;
+
+    /**
+     * 注册备案人
+     */
+    @TableField(value = "registrant")
+    @ApiModelProperty(value="注册备案人")
+    private String registrant;
+
+    /**
+     * 注册备案人ID
+     */
+    @TableField(value = "relationId")
+    @ApiModelProperty(value="注册备案人ID")
+    private String relationId;
+
+    @TableField(value = "relationStatus")
+    @ApiModelProperty(value="")
+    private String relationStatus;
+
+    @TableField(value = "releaseVersion")
+    @ApiModelProperty(value="")
+    private String releaseVersion;
+
+    /**
+     * 型号
+     */
+    @TableField(value = "specification")
+    @ApiModelProperty(value="型号")
+    private String specification;
+
+    /**
+     * 型号规格编码（C0101010010100103941）
+     */
+    @TableField(value = "specificationCode")
+    @ApiModelProperty(value="型号规格编码（C0101010010100103941）")
+    private String specificationCode;
+
+    /**
+     * udi-di
+     */
+    @TableField(value = "udiCode")
+    @ApiModelProperty(value="udi-di")
+    private String udiCode;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -189,7 +189,11 @@
                  allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
                  basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
                  basicPrductRemak8, updateTime
-                        , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName)
+                        , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName,
+                catalogname1,
+                catalogname2,
+                catalogname3,
+                matrial)
         values (#{id}, #{uuid},
                 #{originUuid},
                 #{nameCode},
@@ -242,7 +246,11 @@
                 #{basicPrductRemak7},
                 #{basicPrductRemak8}, #{updateTime}
                        , #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs},
-                #{categoryName})
+                #{categoryName},
+                #{catalogname1},
+                #{catalogname2},
+                #{catalogname3},
+                #{matrial})
     </insert>
 
     <insert id="insertUdiInfos" parameterType="java.util.List">
@@ -706,6 +714,18 @@
             <if test="categoryName != null">
                 categoryName=#{categoryName},
             </if>
+            <if test="catalogname1 != null">
+                catalogname1=#{catalogname1},
+            </if>
+            <if test="catalogname2 != null">
+                catalogname2=#{catalogname2},
+            </if>
+            <if test="catalogname3 != null">
+                catalogname3=#{catalogname3},
+            </if>
+            <if test="matrial != null">
+                matrial=#{matrial},
+            </if>
 
             <if test="remark != null">
                 remark=#{remark},
@@ -899,6 +919,19 @@
             <if test="categoryName != null">
                 categoryName=#{categoryName},
             </if>
+            <if test="catalogname1 != null">
+            catalogname1=#{catalogname1},
+        </if>
+            <if test="catalogname2 != null">
+                catalogname2=#{catalogname2},
+            </if>
+            <if test="catalogname3 != null">
+                catalogname3=#{catalogname3},
+            </if>
+            <if test="matrial != null">
+                matrial=#{matrial},
+            </if>
+
         </trim>
         where id = #{id}
     </update>
@@ -1090,6 +1123,23 @@
             <if test="categoryName != null">
                 categoryName=#{categoryName},
             </if>
+
+
+            <if test="catalogname1 != null">
+                catalogname1=#{catalogname1},
+            </if>
+
+            <if test="catalogname2 != null">
+                catalogname2=#{catalogname2},
+            </if>
+
+            <if test="catalogname3 != null">
+                catalogname3=#{catalogname3},
+            </if>
+
+            <if test="matrial != null">
+                matrial=#{matrial},
+            </if>
         </trim>
         WHERE uuid = #{uuid}
     </update>

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

@@ -466,7 +466,11 @@
                basic_products.categoryName,
                basic_products.groupBuy,
                basic_products.basicPrductRemak8,
-               basic_products.cphhhbh
+               basic_products.cphhhbh,
+        basic_products.catalogname1,
+        basic_products.catalogname2,
+        basic_products.catalogname3,
+        basic_products.matrial
         FROM basic_products
                      inner JOIN basic_udirel
                 ON basic_products.uuid = basic_udirel.uuid

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

@@ -115,7 +115,11 @@
                basic_products.cphhhbh,
                basic_udirel.groupBuy,
                basic_udirel.id   as uid,
-               basic_corp.name      companyName
+               basic_corp.name      companyName,
+        basic_products.catalogname1,
+        basic_products.catalogname2,
+        basic_products.catalogname3,
+        basic_products.matrial
         FROM company_product_relevance
                      inner JOIN basic_udirel
                 ON company_product_relevance.udiRlIdFk = basic_udirel.id

src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -16,7 +16,11 @@
                                          qxlb, tyshxydm, zczbhhzbapzbh,
                                          ylqxzcrbarmc, ylqxzcrbarywmc, updateTime,
                                          supName, model, `standard`,
-                                         qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType,attributeType,hcType)
+                                         qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType,attributeType,hcType,
+                                        catalogname1,
+                                        catalogname2,
+                                        catalogname3,
+                                        matrial)
                 values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{item.uuid},
@@ -42,7 +46,11 @@
                     , #{item.flbm}, #{item.qxlb}, #{item.tyshxydm}, #{item.zczbhhzbapzbh}
                     , #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.updateTime}, #{item.supName}, #{item.model}
                     , #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type},
-             #{item.deviceRecordKey}, #{item.groupBuy}, #{item.purType},#{item.attributeType},#{item.hcType})
+             #{item.deviceRecordKey}, #{item.groupBuy}, #{item.purType},#{item.attributeType},#{item.hcType},
+            #{catalogname1},
+            #{catalogname2},
+            #{catalogname3},
+            #{matrial})
         </foreach>
     </insert>
 

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

@@ -744,5 +744,36 @@ VALUES (38032, 16, '1', 1, 'auditTime', '审核时间', 'text', '', NULL, '', NU
         NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 
+CALL Pro_Temp_ColumnWork('basic_products', 'catalogname1',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''一级分类名称(学科，品名）''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('basic_products', 'catalogname2',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''二级分类名称(用途、品目）''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('basic_products', 'catalogname3',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''三级分类名称(部位、功能、品种）''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('basic_products', 'matrial',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''耗材材质''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'catalogname1',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''一级分类名称(学科，品名）''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'catalogname2',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''二级分类名称(用途、品目）''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'catalogname3',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''三级分类名称(部位、功能、品种）''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'matrial',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''耗材材质''',
+                         1);
 
 CALL Pro_Temp_ColumnWork('basic_udirel', 'newNeedUpload', 'tinyint NULL DEFAULT NULL COMMENT ''是否系统新增产品需要上传''', 1);