From 3d535fd0e10e6b8e7b987dc862601168027093b4 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 25 Mar 2024 10:07:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8C=BB=E4=BF=9D?= =?UTF-8?q?=E8=80=97=E6=9D=90=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 25 ++ .../api/entity/basic/BasicProductsEntity.java | 29 ++ .../api/entity/basic/UdiProductEntity.java | 30 +++ .../com/glxp/api/http/ErpBasicClient.java | 24 ++ .../req/basic/UdiRelevanceSaveRequest.java | 30 +++ .../req/basic/YbHcflDetailFilterRequest.java | 20 ++ .../api/res/basic/UdiRelevanceResponse.java | 32 +++ .../api/res/chs/YbHcflEntityResponse.java | 163 ++++++++++++ .../api/res/chs/YbHcxxEntityResponse.java | 155 +++++++++++ .../api/res/chs/YbHcxxGgEntityResponse.java | 249 ++++++++++++++++++ .../mybatis/mapper/basic/UdiProductDao.xml | 24 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 6 +- src/main/resources/schemas/schema_v2.3.sql | 16 ++ 13 files changed, 800 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/basic/YbHcflDetailFilterRequest.java create mode 100644 src/main/java/com/glxp/api/res/chs/YbHcflEntityResponse.java create mode 100644 src/main/java/com/glxp/api/res/chs/YbHcxxEntityResponse.java create mode 100644 src/main/java/com/glxp/api/res/chs/YbHcxxGgEntityResponse.java diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 32ec631f..4f0a6267 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/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> ybHcflDetail = erpBasicClient.getYbHcflDetail(ybHcflDetailFilterRequest); + PageSimpleResponse data = ybHcflDetail.getData(); + YbHcflEntityResponse entityResponse = new YbHcflEntityResponse(); + if (data.getList().size() > 0){ + entityResponse = data.getList().get(0); + } + return ResultVOUtils.success(entityResponse); + } + } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java index 38372aac..a8831b2b 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java +++ b/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"; diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index e7490de5..44d20344 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/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,4 +106,33 @@ 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; + } diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index a01dbe85..69cb2705 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/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> 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> listBaseResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return listBaseResponse; + } catch (Exception e) { + log.error("获取患者处方信息", e); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); + } + } + } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index 3b106013..9c0b31fd 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/req/basic/YbHcflDetailFilterRequest.java b/src/main/java/com/glxp/api/req/basic/YbHcflDetailFilterRequest.java new file mode 100644 index 00000000..f22ca578 --- /dev/null +++ b/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; + +} diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index d9323b18..2f99275d 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/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 lombok.Data; import java.math.BigDecimal; @@ -137,6 +139,36 @@ public class UdiRelevanceResponse { private String categoryName; 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 int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { return 1; diff --git a/src/main/java/com/glxp/api/res/chs/YbHcflEntityResponse.java b/src/main/java/com/glxp/api/res/chs/YbHcflEntityResponse.java new file mode 100644 index 00000000..11dcaf03 --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/glxp/api/res/chs/YbHcxxEntityResponse.java b/src/main/java/com/glxp/api/res/chs/YbHcxxEntityResponse.java new file mode 100644 index 00000000..f957de2c --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/glxp/api/res/chs/YbHcxxGgEntityResponse.java b/src/main/java/com/glxp/api/res/chs/YbHcxxGgEntityResponse.java new file mode 100644 index 00000000..5a8bce8d --- /dev/null +++ b/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; +} diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 279da12d..85304dc4 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/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}) @@ -706,6 +714,18 @@ categoryName=#{categoryName}, + + catalogname1=#{catalogname1}, + + + catalogname2=#{catalogname2}, + + + catalogname3=#{catalogname3}, + + + matrial=#{matrial}, + where uuid = #{uuid} diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 6abeb5b2..ae4beb10 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/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 diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index f7ee1231..ea7b4b80 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/src/main/resources/schemas/schema_v2.3.sql @@ -740,4 +740,20 @@ VALUES (38032, 16, '1', 1, 'auditTime', '审核时间', 'text', '', NULL, '', NU +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); +