diff --git a/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java b/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java index 76e83c936..43a33d73e 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java @@ -686,6 +686,13 @@ public class BasicInsDrugEntity implements Serializable { @ApiModelProperty(value="传输数据ID") private String transferDataId; + /** + * 制剂规格 + */ + @TableField(value = "prepnSpec") + @ApiModelProperty(value="制剂规格") + private String prepnSpec; + /** * 生效时间 */ diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java index 90ef4f0d5..824ec5b89 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java @@ -246,4 +246,18 @@ public class ThrProductsEntity { @TableField(value = "productType") private Integer productType; + /** + * 制剂规格 + */ + @TableField(value = "prepnSpec") + @ApiModelProperty(value="制剂规格") + private String prepnSpec; + + /** + * 制剂规格 + */ + @TableField(value = "prepnUnit") + @ApiModelProperty(value="制剂单位") + private String prepnUnit; + } diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index ca17f9ec8..c76c8951d 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4332,3 +4332,7 @@ CALL Pro_Temp_ColumnWork('sys_workplace_document', 'monopoly', CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'autoTagStatus', 'tinyint NULL DEFAULT 1 COMMENT ''自动赋码状态:1:无法自动赋码;2:可以自动赋码;3:可以自动赋码,但是数量不足''', 1); + +CALL Pro_Temp_ColumnWork('basic_ins_drug', 'prepnSpec', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''采集规格''', + 1);