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 7973c507..62598dc2 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -352,6 +352,10 @@ public class UdiProductEntity { @TableField(value = "zczbhhzbapzbhSys") private String zczbhhzbapzbhSys; + + + + public Integer getMyBhxjsl() { if (bhxjsl == null || bhxjsl == 0) return 1; diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 80542412..394e4d29 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -325,4 +325,24 @@ public class UdiRelevanceEntity { * 是否已经人工审核 0:未审核;1:已审核 */ private Integer manuReview; + + /** + * 是否已经人工审核 0:未审核;1:已审核 + */ + @TableField(value = "drugSellingPrice") + private String drugSellingPrice; + /** + * 药品售价 + */ + @TableField(value = "drugSellingPriceTime") + private Date drugSellingPriceTime; + /** + * 是否挂网 0 否 1 是 + */ + @TableField(value = "hangingNetType") + private Integer hangingNetType; + + + + } diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java index 614eb39e..86339257 100644 --- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java @@ -312,4 +312,21 @@ public class AddProductRequest { */ private Integer manuReview; private Integer bhxjsl; + + /** + * 是否已经人工审核 0:未审核;1:已审核 + */ + @TableField(value = "drugSellingPrice") + private String drugSellingPrice; + /** + * 药品售价 + */ + @TableField(value = "drugSellingPriceTime") + private Date drugSellingPriceTime; + /** + * 是否挂网 0 否 1 是 + */ + @TableField(value = "hangingNetType") + private Integer hangingNetType; + } 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 7532a4c4..81957aaa 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -341,4 +341,25 @@ public class UdiRelevanceResponse { */ private Integer manuReview; + + + + /** + * 是否已经人工审核 0:未审核;1:已审核 + */ + @TableField(value = "drugSellingPrice") + private String drugSellingPrice; + /** + * 药品售价 + */ + @TableField(value = "drugSellingPriceTime") + private Date drugSellingPriceTime; + /** + * 是否挂网 0 否 1 是 + */ + @TableField(value = "hangingNetType") + private Integer hangingNetType; + + + } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index c79ab085..39e45abe 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -232,6 +232,12 @@ public class UdiProductServiceImpl implements UdiProductService { udiRelevanceEntity.setManuReview(addProductRequest.getManuReview()); udiRelevanceEntity.setNotCodeType(addProductRequest.getNotCodeType()); udiRelevanceEntity.setUpdateTime(new Date()); + + + + udiRelevanceEntity.setDrugSellingPrice(addProductRequest.getDrugSellingPrice()); + udiRelevanceEntity.setDrugSellingPriceTime(addProductRequest.getDrugSellingPriceTime()); + udiRelevanceEntity.setHangingNetType(addProductRequest.getHangingNetType()); udiRelevanceDao.updateById(udiRelevanceEntity); updateLevelCount(udiRelevanceEntity); } else { diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 0eeaf655..a3405e21 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -1362,7 +1362,7 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'drugSellingPriceTime', ' datetime DEFAULT NULL COMMENT ''售价开始时间''', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'hangingNetType', - ' tinyint DEFAULT NULL COMMENT ''是否挂网''', + ' tinyint DEFAULT NULL COMMENT ''是否挂网 0 否 1 是''', 1);