UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 增加医保耗材信息接口调用

Browse Source
dev_test1.0
chenhc 2 years ago
parent 3d535fd0e1
commit dc060dc2c9
10 changed files with 216 additions and 3 deletions
Show Stats Download Patch File Download Diff File

30
src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java
Unescape Escape View File

@ -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;
}

31
src/main/java/com/glxp/api/req/basic/SupplementRequest.java
Unescape Escape View File

@ -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;
}

1
src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java
Unescape Escape View File

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

31
src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java
Unescape Escape View File

@ -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;
}

32
src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java
Unescape Escape View File

@ -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;
}

31
src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
Unescape Escape View File

@ -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;
}

30
src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
Unescape Escape View File

@ -915,6 +915,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>
@ -1106,6 +1119,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>

6
src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
Unescape Escape View File

@ -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

12
src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
Unescape Escape View File

@ -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>

15
src/main/resources/schemas/schema_v2.3.sql
Unescape Escape View File

@ -756,4 +756,19 @@ 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);

Write Preview
Loading…
Cancel
Save