企业医疗信息完善

cert
1178634255 2 years ago
parent 4809c6bf13
commit 45918578c3

@ -106,6 +106,7 @@ public class UdiRelController extends BaseController {
basicUdiRelEntity.setCompanyIdFk(udiSelectRequest.getCompanyId());
basicUdiRelEntity.setUpdateTime(new Date());
basicUdiRelEntity.setUpdateUser(userId);
basicUdiRelEntity.setCompanyType(basicUdiRelRequest.getCompanyType());
basicUdiRelEntity.setId(IdUtil.getSnowflakeNextId());
basicUdiRelService.save(basicUdiRelEntity);

@ -8,44 +8,53 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* UDI
*/
@Data
@ApiModel(value = "UDI医疗器械信息字典表")
@TableName(value = "basic_udi_product")
public class BasicUdiProductEntity implements Serializable {
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
*
*/
@ApiModelProperty(value = "标识")
@TableField(value = "nameCode")
private String nameCode;
/**
*
*/
@ApiModelProperty(value = "包装比例")
@TableField(value = "packRatio")
private String packRatio;
/**
*
*/
@ApiModelProperty(value = "包装级别")
@TableField(value = "packLevel")
private String packLevel;
/**
*
*/
@ApiModelProperty(value = "包含下级数量")
@TableField(value = "bhxjsl")
private Integer bhxjsl;
/**
*
*/
@ApiModelProperty(value = "包含最小销售包装数量")
@TableField(value = "bhzxxsbzsl")
private Integer bhzxxsbzsl;
@ -53,207 +62,241 @@ public class BasicUdiProductEntity implements Serializable {
* 使:
* 使
*/
@ApiModelProperty(value = " * 最小包装单元内包含使用单元数量:\n" +
" * 最小销售标识包含使用单元数量")
@TableField(value = "zxxsbzbhsydysl")
private Integer zxxsbzbhsydysl;
/**
*
*/
@ApiModelProperty(value = "包含下级产品编码")
@TableField(value = "bhxjcpbm")
private String bhxjcpbm;
/**
*
*/
@ApiModelProperty(value = "包装层级")
@TableField(value = "bzcj")
private String bzcj;
/**
* ERPID
*/
@ApiModelProperty(value = "ERPID")
@TableField(value = "thirdProductNo")
private String thirdProductNo;
/**
* 1.2
*/
@ApiModelProperty(value = " 1.器械2药品")
@TableField(value = "addType")
private Integer addType;
/**
* key
*/
@ApiModelProperty(value = "国家库key")
@TableField(value = "deviceRecordKey")
private String deviceRecordKey;
/**
* 使
*/
@ApiModelProperty(value = "以使用单元数量入库")
@TableField(value = "isUseDy")
private Integer isUseDy;
/**
* ERP
*/
@ApiModelProperty(value = " ERP产品名")
@TableField(value = "thirdProductName")
private String thirdProductName;
/**
*
*/
@ApiModelProperty(value = "产品名称,通用名称")
@TableField(value = "cpmctymc")
private String cpmctymc;
/**
*
*/
@ApiModelProperty(value = "产品类别")
@TableField(value = "cplb")
private String cplb;
/**
*
*/
@ApiModelProperty(value = "分类编码")
@TableField(value = "flbm")
private String flbm;
/**
*
*/
@ApiModelProperty(value = "规格型号")
@TableField(value = "ggxh")
private String ggxh;
/**
*
*/
@ApiModelProperty(value = "器械类别")
@TableField(value = "qxlb")
private String qxlb;
/**
*
*/
@ApiModelProperty(value = "统一社会信用代码证号")
@TableField(value = "tyshxydm")
private String tyshxydm;
/**
* /
*/
@ApiModelProperty(value = "注册/备案人名称")
@TableField(value = "ylqxzcrbarmc")
private String ylqxzcrbarmc;
/**
* "/
*/
@ApiModelProperty(value = "注册/备案证号,")
@TableField(value = "zczbhhzbapzbh")
private String zczbhhzbapzbh;
/**
* /
*/
@ApiModelProperty(value = "注册/备案人名称英文名称")
@TableField(value = "ylqxzcrbarywmc")
private String ylqxzcrbarywmc;
/**
* 使
*/
@ApiModelProperty(value = "使用单元产品标识")
@TableField(value = "sydycpbs")
private String sydycpbs;
/**
* UUID
*/
@ApiModelProperty(value = "UUID主键")
@TableField(value = "uuid")
private String uuid;
/**
*
*/
@ApiModelProperty(value = "上级产品标识")
@TableField(value = "sjcpbm")
private String sjcpbm;
/**
*
*/
@ApiModelProperty(value = "历史版本号,最高为最新")
@TableField(value = "versionNumber")
private Integer versionNumber;
/**
* 1.2使3.4
*/
@ApiModelProperty(value = "表示类型1.主标识2使用单元标识3.本体标识4包装标识")
@TableField(value = "diType")
private Integer diType;
/**
*
*/
@ApiModelProperty(value = "生产标识是否包含批号")
@TableField(value = "scbssfbhph")
private String scbssfbhph;
/**
*
*/
@ApiModelProperty(value = "生产标识是否包含序列号")
@TableField(value = "scbssfbhxlh")
private String scbssfbhxlh;
/**
*
*/
@ApiModelProperty(value = "生产标识是否包含生产日期")
@TableField(value = "scbssfbhscrq")
private String scbssfbhscrq;
/**
*
*/
@ApiModelProperty(value = "生产标识是否包含失效日期")
@TableField(value = "scbssfbhsxrq")
private String scbssfbhsxrq;
/**
*
*/
@ApiModelProperty(value = "医保编码")
@TableField(value = "ybbm")
private String ybbm;
/**
*
*/
@ApiModelProperty(value = "商品名称")
@TableField(value = "spmc")
private String spmc;
@ApiModelProperty(value = "产品合格证编号")
@TableField(value = "cphhhbh")
private String cphhhbh;
@ApiModelProperty(value = "产品描述")
@TableField(value = "cpms")
private String cpms;
@ApiModelProperty(value = "产品标识别码条形码名称")
@TableField(value = "cpbsbmtxmc")
private String cpbsbmtxmc;
/**
*
*/
@ApiModelProperty(value = "是否是最新记录")
@TableField(value = "isNewest")
private Boolean isNewest;
/**
*
*/
@ApiModelProperty(value = "更新时间")
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@ApiModelProperty(value = "产品类型")
@TableField(value = "cplx")
private String cplx;
/**
*
*/
@ApiModelProperty(value = "耗材或者设备")
@TableField(value = "hchzsb")
private String hchzsb;
/**
* / 1 0
*/
@ApiModelProperty(value = "是否为包类产品/组套类产品; 1 是 0 否")
@TableField(value = "sfwblztlcp")
private String sfwblztlcp;
@ -261,60 +304,77 @@ public class BasicUdiProductEntity implements Serializable {
* MR 0 1 28
* 3 MR
*/
@ApiModelProperty(value = " 共振MR 安全相关信息; 0 安全 1 条件安全, 28\n" +
" * 不安全 3 说明书或标签上面不包括 MR 安全信息")
@TableField(value = "cgzmraqxgxx")
private String cgzmraqxgxx;
/**
* 使:0 1
*/
@ApiModelProperty(value = "标记为一次性使用:0 否, 1 是")
@TableField(value = "sfbjwycxsy")
private String sfbjwycxsy;
/**
* 使
*/
@ApiModelProperty(value = "最大重复使用次数")
@TableField(value = "zdcfsycs")
private String zdcfsycs;
/**
* :1 0
*/
@ApiModelProperty(value = "是否为已灭菌产品:1 是 0 否")
@TableField(value = "sfwwjbz")
private String sfwwjbz;
/**
* 使:1 0
*/
@ApiModelProperty(value = "使用前是否需要进行灭菌:1 是 0 否")
@TableField(value = "syqsfxyjxmj")
private String syqsfxyjxmj;
/**
*
*/
@ApiModelProperty(value = "灭菌方式")
@TableField(value = "mjfs")
private String mjfs;
/**
*
*/
@ApiModelProperty(value = "其他信息的网址链接")
@TableField(value = "qtxxdwzlj")
private String qtxxdwzlj;
/**
*
*/
@ApiModelProperty(value = "分类编码对应分类名称")
@TableField(value = "categoryName")
private String categoryName;
@ApiModelProperty(value = "制造商")
@TableField(value = "manufactory")
private String manufactory;
@ApiModelProperty(value = "计量单位名称")
@TableField(value = "measname")
private String measname;
@ApiModelProperty(value = "备注")
@TableField(value = "remark")
private String remark;
@ApiModelProperty(value = "更新时间")
@TableField(value = "updateUser")
private Long updateUser;
/**
* 1./2./3.
*/
@ApiModelProperty(value = "生产数据对接方1.生产企业/2.代理商/3.购买方)")
private Integer companyType;
private static final long serialVersionUID = 1L;
}

@ -18,6 +18,8 @@ public class FilterUdiRelRequest extends ListPageRequest {
private String entireCpmctymc;
@ApiModelProperty(value = "名称编码")
private String nameCode;
@ApiModelProperty(value = "公司类型")
private Integer companyType;
@ApiModelProperty(value = "uuid")
private String uuid;
@ApiModelProperty(value = "原始UUID")

@ -1,16 +1,19 @@
package com.glxp.api.req.basic;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class UdiSelectRequest {
@ApiModelProperty(value = "产品")
List<BasicUdiRelRequest> products;
@ApiModelProperty(value = "企业ID")
private Long companyId;
@ApiModelProperty(value = "密钥")
private String key;
@ApiModelProperty(value = "密钥")
private List<String> keys;

@ -1,107 +1,163 @@
package com.glxp.api.res.basic;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ApiModel("基本UDI关联响应")
@Data
public class BasicUdiRelResponse {
@ApiModelProperty(value = "主键")
private Long id;
/**
* uuid
*/
@ApiModelProperty(value = "国家库uuid")
private String uuid;
/**
* ID
*/
@ApiModelProperty(value = "企业信息ID外键")
private Long companyIdFk;
/**
*
*/
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
*
*/
@ApiModelProperty(value = "备注")
private String remark;
/**
*
*/
@ApiModelProperty(value = "更新人")
private String updateUser;
private Integer companyType;
@ApiModelProperty(value = "公司类型")
private Integer companyType;
@ApiModelProperty(value = "公司名称")
private String companyName;
@ApiModelProperty(value = "标识")
private String nameCode;
@ApiModelProperty(value = "包装比例")
private String packRatio;
@ApiModelProperty(value = "包装级别")
private String packLevel;
@ApiModelProperty(value = "包含下级数量")
private Integer bhxjsl;
@ApiModelProperty(value = "包含最小销售包装数量")
private Integer bhzxxsbzsl;
@ApiModelProperty(value = "最小包装单元内包含使用单元数量:最小销售标识包含使用单元数量")
private Integer zxxsbzbhsydysl;
@ApiModelProperty(value = "包含下级产品编码")
private String bhxjcpbm;
@ApiModelProperty(value = "上级产品标识")
private String sjcpbm; //
@ApiModelProperty(value = "包装层级")
private String bzcj;
@ApiModelProperty(value = "ERPID")
private String thirdProductNo;
@ApiModelProperty(value = "ERP产品名")
private String thirdProductName;
@ApiModelProperty(value = "1.器械2药品")
private String addType;
@ApiModelProperty(value = "国家库key")
private String deviceRecordKey;
@ApiModelProperty(value = "以使用单元数量入库")
private Integer isUseDy;
@ApiModelProperty(value = "产品名称,通用名称")
private String cpmctymc;
@ApiModelProperty(value = "产品类别")
private String cplb;
@ApiModelProperty(value = "分类编码")
private String flbm;
@ApiModelProperty(value = "规格型号")
private String ggxh;
@ApiModelProperty(value = "器械类别")
private String qxlb;
@ApiModelProperty(value = "统一社会信用代码证号")
private String tyshxydm;
@ApiModelProperty(value = "注册/备案人名称")
private String ylqxzcrbarmc;
@ApiModelProperty(value = "注册/备案证号")
private String zczbhhzbapzbh;
@ApiModelProperty(value = "注册/备案人名称英文名称")
private String ylqxzcrbarywmc;
@ApiModelProperty(value = "使用单元产品标识")
private String sydycpbs;
@ApiModelProperty(value = "历史版本号,最高为最新")
private Integer versionNumber;
@ApiModelProperty(value = "表示类型1.主标识2使用单元标识3.本体标识4包装标识")
private Integer diType;
@ApiModelProperty(value = "生产标识是否包含批号")
private String scbssfbhph;
@ApiModelProperty(value = "生产标识是否包含序列号")
private String scbssfbhxlh;
@ApiModelProperty(value = "生产标识是否包含生产日期")
private String scbssfbhscrq;
@ApiModelProperty(value = "生产标识是否包含失效日期")
private String scbssfbhsxrq;
@ApiModelProperty(value = "医保编码")
private String ybbm;
@ApiModelProperty(value = "商品名称")
private String spmc;
@ApiModelProperty(value = "产品合同编号")
private String cphhhbh;
@ApiModelProperty(value = "产品描述")
private String cpms;
@ApiModelProperty(value = "")
private String cpbsbmtxmc;
@ApiModelProperty(value = "批次号")
private String batchNo;
@ApiModelProperty(value = "生产日期")
private String produceDate;
@ApiModelProperty(value = "过期日期")
private String expireDate;
@ApiModelProperty(value = "是否是最新记录")
private Boolean isNewest;
@ApiModelProperty(value = "产品类型")
private String cplx;
@ApiModelProperty(value = "耗材或者设备")
private String hchzsb;
@ApiModelProperty(value = "是否为包类产品/组套类产品; 1 是 0 否")
private String sfwblztlcp;
@ApiModelProperty(value = "共振MR 安全相关信息; 0 安全 1 条件安全, 28不安全 3 说明书或标签上面不包括 MR 安全信息")
private String cgzmraqxgxx;
@ApiModelProperty(value = "标记为一次性使用:0 否, 1 是")
private String sfbjwycxsy;
@ApiModelProperty(value = "最大重复使用次数")
private String zdcfsycs;
@ApiModelProperty(value = "是否为已灭菌产品:1 是 0 否")
private String sfwwjbz;
@ApiModelProperty(value = "使用前是否需要进行灭菌:1 是 0 否")
private String syqsfxyjxmj;
@ApiModelProperty(value = "其他信息的网址链接")
private String qtxxdwzlj;
@ApiModelProperty(value = "灭菌方式")
private String mjfs;
@ApiModelProperty(value = "代理开始日期")
private Date agengtStartDate;
@ApiModelProperty(value = "代理结束日期")
private Date agengtEndDate;
@ApiModelProperty(value = "测量名称")
private String measname;
@ApiModelProperty(value = "制造商")
private String manufactory;
}

Loading…
Cancel
Save