From 12070e3c36123d5a5157aa270fe04c55d9b5cd86 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 5 Sep 2024 14:58:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?9/5=20=20=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=A2=9E=E5=8A=A0=E5=88=B6=E5=89=82=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E5=92=8C=E5=88=B6=E5=89=82=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/entity/thrsys/ThrProductsEntity.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

From 3157887c6ab4ac11993c7f10d74575b5b99de497 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 5 Sep 2024 15:01:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E4=BA=A7=E5=93=81=20=E5=88=B6=E5=89=82=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E5=92=8C=E5=88=B6=E5=89=82=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/entity/thrsys/BasicInsDrugEntity.java     | 7 +++++++
 1 file changed, 7 insertions(+)

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;
+
     /**
      * 生效时间
      */

From 40e1e228c501d23ec22c0e8351d1722660523d4a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 5 Sep 2024 15:03:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/schemas/schema_v2.4.sql | 4 ++++
 1 file changed, 4 insertions(+)

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);