From 952171b06822c850727626fc4ddbb0b9a03e85cc Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 7 Nov 2024 17:05:39 +0800
Subject: [PATCH] =?UTF-8?q?11/7=20=E4=BE=9B=E5=BA=94=E5=95=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=8D=AF=E5=93=81=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thrsys/ThrProductsAddDiController.java    |  3 ++
 .../entity/thrsys/ThrProductsAddDiEntity.java | 45 +++++++++++++++++++
 src/main/resources/schemas/schema_v2.4.sql    | 29 +++++++++++-
 3 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
index 2b788af6..e4dce925 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
@@ -490,6 +490,9 @@ public class ThrProductsAddDiController {
         thrProductsAdddiEntity.setStatus(1); //未审核
         thrProductsAdddiEntity.setType(2);
         thrProductsAdddiEntity.setCustomerId(Long.parseLong(customerId));
+        if (thrProductsAdddiEntity.getProductsType() == 2){
+            thrProductsAdddiEntity.setMajorStatus(1);
+        }
         thrProductsAddDiService.insertThrProducts(thrProductsAdddiEntity);
 
 
diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java
index e36e6d8f..4f574784 100644
--- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java
+++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java
@@ -409,10 +409,55 @@ public class ThrProductsAddDiEntity {
     @TableField(value = "productsType")
     private Integer productsType;
 
+
     /**
      * 内部物资编码
      */
     @TableField(value = "internalMaterialCode")
     @ApiModelProperty(value = "'内部物资编码'")
     private String internalMaterialCode;
+
+    @TableField(value = "bzgg")
+    @ApiModelProperty(value = "'包装材质'")
+    private String bzgg;
+
+    @TableField(value = "prepnUnit")
+    @ApiModelProperty(value = "'剂型'")
+    private String prepnUnit;
+
+    @TableField(value = "prepnSpec")
+    @ApiModelProperty(value = "'制剂规格'")
+    private String prepnSpec;
+
+    @TableField(value = "packMatrial")
+    @ApiModelProperty(value = "'包装材质'")
+    private String packMatrial;
+
+
+    /**
+     *   3:普通药品 2特殊药品制剂 1特殊药品原料药 9:未分类
+     */
+    @TableField(value = "physicType")
+    @ApiModelProperty(value = "'药品类型'")
+    private Integer physicType;
+
+    /**
+     *   1:中药 2:化学药 3:生物制品
+     */
+    @TableField(value = "majorType")
+    @ApiModelProperty(value = "'药品分类'")
+    private Integer majorType;
+
+
+    /**
+     *   1:在用 0:停用
+     */
+    @TableField(value = "majorStatus")
+    @ApiModelProperty(value = "'药品状态'")
+    private Integer majorStatus;
+
+
+
+
+
 }
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index b47ba074..552e246e 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -1066,4 +1066,31 @@ CREATE TABLE if not exists `third_ali_drug`
 ) ENGINE = InnoDB
   CHARACTER SET = utf8mb4
   COLLATE = utf8mb4_0900_ai_ci
-  ROW_FORMAT = Dynamic;
\ No newline at end of file
+  ROW_FORMAT = Dynamic;
+
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'bzgg',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''包装规格''',
+                         1);
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'prepnUnit',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''剂型''',
+                         1);
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'prepnSpec',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''制剂规格''',
+                         1);
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'packMatrial',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''包装材质''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'physicType',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''药品类型:3:普通药品 2特殊药品制剂 1特殊药品原料药 9:未分类''',
+                         1);
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'majorType',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''药品分类:1:中药 2:化学药 3:生物制品''',
+                         1);
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'majorStatus',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''药品状态: 1:在用 0:停用''',
+                         1);
+
+
+
+