7/29 1.1 更改药品

src/main/java/com/glxp/api/controller/basic/UdiContrastController.java

@@ -327,8 +327,9 @@ public class UdiContrastController {
     @PostMapping("/udi/udirel/updatetDrug")
     public BaseResponse updatetDrug(@RequestBody AddProductRequest addProductRequest) {
         UdiProductEntity udiProductEntity = new UdiProductEntity();
+        udiProductEntity.setPrice(addProductRequest.getPrice().toString());
         BeanUtils.copyProperties(addProductRequest, udiProductEntity);
-        udiProductService.updateUdiInfo(udiProductEntity);
+        boolean b = udiProductService.updateUdiInfo(udiProductEntity);
         return ResultVOUtils.success();
 
     }

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**

src/main/java/com/glxp/api/req/basic/AddProductRequest.java

@@ -254,4 +254,6 @@ public class AddProductRequest {
      */
     private String bzgg;
     private String packRatio;
+    private String uuid;
+    private String nameCode;
 }

src/main/resources/mybatis/mapper/basic/UdiProductDao.xml

@@ -541,6 +541,51 @@
             <if test="categoryName != null">
                 categoryName=#{categoryName},
             </if>
+            <if test="requireScanCode != null">
+                requireScanCode=#{requireScanCode},
+            </if>
+            <if test="bzgg != null">
+                bzgg=#{bzgg},
+            </if>
+            <if test="levelUnit != null">
+                levelUnit=#{levelUnit},
+            </if>
+            <if test="prepnUnit != null">
+                prepnUnit=#{prepnUnit},
+            </if>
+            <if test="prepnSpec != null">
+                prepnSpec=#{prepnSpec},
+            </if>
+            <if test="specialCode != null">
+                specialCode=#{specialCode},
+            </if>
+            <if test="storageCondition != null">
+                storageCondition=#{storageCondition},
+            </if>
+            <if test="transportCondition != null">
+                transportCondition=#{transportCondition},
+            </if>
+            <if test="indate != null">
+            indate=#{indate},
+            </if>
+            <if test="useAttribute != null">
+                useAttribute=#{useAttribute},
+            </if>
+            <if test="majorType != null">
+                majorType=#{majorType},
+            </if>
+            <if test="majorStatus != null">
+                majorStatus=#{majorStatus},
+            </if>
+            <if test="physicType != null">
+                physicType=#{physicType},
+            </if>
+            <if test="medicareType != null">
+                medicareType=#{medicareType},
+            </if>
+            <if test="packMatrial != null">
+                packMatrial=#{packMatrial},
+            </if>
         </trim>
         WHERE nameCode = #{nameCode}
           and uuid = #{uuid}

src/main/resources/schemas/schema_v2.4.sql

@@ -3877,7 +3877,7 @@ CREATE TABLE IF NOT EXISTS `sys_workplace`
 
 
 CALL Pro_Temp_ColumnWork('basic_products', 'productsType',
-                         ' tinyint NULL DEFAULT NULL COMMENT ''产品类型 1:药品 2:耗材''',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''产品类型 1:耗材 2:药品''',
                          1);
 
 
@@ -4069,3 +4069,4 @@ CALL Pro_Temp_ColumnWork('io_order', 'productType',
                          ' tinyint NULL DEFAULT NULL COMMENT ''产品类型(1.耗材，2.药品)''',
                          1);
 
+