From b57aaeb5cc90ca970f7c8a765d0d267504171f00 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 1 Apr 2024 15:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thrsys/ThrProductsAddDiController.java    |  2 ++
 .../entity/thrsys/ThrProductsAddDiEntity.java | 11 +++++-----
 .../mapper/thrsys/ThrProductsAddDiDao.xml     | 22 +++++++++----------
 3 files changed, 18 insertions(+), 17 deletions(-)

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 80e9174f..f7660d8c 100644
--- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java
@@ -230,10 +230,12 @@ public class ThrProductsAddDiController {
                     udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
                     udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
                     udiProductEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
+                    //todo 添加医保耗材分类
                     udiRelevanceEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
                     udiRelevanceEntity.setPurType(thrProductsAddDiResponse.getPurType());
                     udiRelevanceEntity.setAttributeType(thrProductsAddDiResponse.getAttributeType());
                     udiRelevanceEntity.setHcType(thrProductsAddDiResponse.getHcType());
+
                     udiProductEntity.setNameCode(null);
                     udiProductService.updateUdiInfoByUuid(udiProductEntity);
                     UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
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 7d377e0b..695815b8 100644
--- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java
+++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java
@@ -300,7 +300,7 @@ public class ThrProductsAddDiEntity {
     /**
      * 产品分类高值 ：1：高值耗材；2.普通耗材
      */
-    @TableField(value = "attributeType")
+    @TableField(value = "hcType")
     private Integer hcType;
 
     /**
@@ -333,33 +333,32 @@ public class ThrProductsAddDiEntity {
     private String nameCode;
 
 
-
     /**
      * 一级分类名称(学科，品名）
      */
     @TableField(value = "catalogname1")
-    @ApiModelProperty(value="一级分类名称(学科，品名）")
+    @ApiModelProperty(value = "一级分类名称(学科，品名）")
     private String catalogname1;
 
     /**
      * 二级分类名称(用途、品目）
      */
     @TableField(value = "catalogname2")
-    @ApiModelProperty(value="二级分类名称(用途、品目）")
+    @ApiModelProperty(value = "二级分类名称(用途、品目）")
     private String catalogname2;
 
     /**
      * 三级分类名称(部位、功能、品种）
      */
     @TableField(value = "catalogname3")
-    @ApiModelProperty(value="三级分类名称(部位、功能、品种）")
+    @ApiModelProperty(value = "三级分类名称(部位、功能、品种）")
     private String catalogname3;
 
     /**
      * 耗材材质
      */
     @TableField(value = "matrial")
-    @ApiModelProperty(value="耗材材质")
+    @ApiModelProperty(value = "耗材材质")
     private String matrial;
 
 
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
index efbf58bf..573c7317 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
@@ -16,11 +16,12 @@
                                          qxlb, tyshxydm, zczbhhzbapzbh,
                                          ylqxzcrbarmc, ylqxzcrbarywmc, updateTime,
                                          supName, model, `standard`,
-                                         qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType,attributeType,hcType,
-                                        catalogname1,
-                                        catalogname2,
-                                        catalogname3,
-                                        matrial)
+                                         qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType, attributeType,
+                                         hcType,
+                                         catalogname1,
+                                         catalogname2,
+                                         catalogname3,
+                                         matrial)
                 values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{item.uuid},
@@ -46,11 +47,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.catalogname1},
-            #{item.catalogname2},
-            #{item.catalogname3},
-            #{item.matrial})
+             #{item.deviceRecordKey}, #{item.groupBuy}, #{item.purType}, #{item.attributeType}, #{item.hcType},
+             #{item.catalogname1},
+             #{item.catalogname2},
+             #{item.catalogname3},
+             #{item.matrial})
         </foreach>
     </insert>
 
@@ -144,7 +145,6 @@
             <if test="hcType != null">
                 `hcType`=#{hcType},
             </if>
-
         </trim>
         WHERE id = #{id}
     </update>