药品信息编辑以及层级包装数量换算

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

@@ -326,20 +326,40 @@ public class UdiContrastController {
 
     }
 
+    @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/updatetDrug")
     public BaseResponse updatetDrug(@RequestBody AddProductRequest addProductRequest) {
         AddProductRequest udiRelevanceEntity = udiProductService.addDrug(addProductRequest);
         return ResultVOUtils.success(udiRelevanceEntity);
     }
 
+    @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/updateLevelDrug")
     public BaseResponse updateLevelDrug(@RequestBody UpdateLevelDrugRequest updateLevelDrugRequest) {
         udiProductService.saveOrUpadateLevelDrug(updateLevelDrugRequest);
         return ResultVOUtils.success("更新成功");
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/udirel/calculateDistCount")
+    public BaseResponse calculateDistCount(@RequestBody UdiProductEntity udiProductEntity) {
+        UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
+        udiProductService.calculateDistCount(udiProductEntity, udiRelevanceEntity);
+        return ResultVOUtils.success(udiRelevanceEntity);
+    }
+
 
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/udirel/calculateUseCount")
+    public BaseResponse calculateUseCount(@RequestBody UdiProductEntity udiProductEntity) {
+        UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
+        udiProductService.calculateUseCount(udiProductEntity, udiRelevanceEntity);
+        return ResultVOUtils.success(udiRelevanceEntity);
     }
 
 
+    @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/drug/delLevel")
     public BaseResponse delLevel(@RequestBody AddProductRequest addProductRequest) {
         boolean b = udiProductService.deleteByNameCode(addProductRequest.getNameCode());

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

@@ -1,6 +1,8 @@
 package com.glxp.api.entity.basic;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +17,7 @@ import java.util.Date;
 @Data
 @TableName("basic_products")
 public class UdiProductEntity {
-
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
     @TableField(value = "uuid")
     private String uuid;

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

@@ -264,4 +264,13 @@ public class AddProductRequest {
 
 
     private Long id;
+
+    private String distributeLevelDi;
+    private String distributeLevelUnit;
+    private Integer distributeLevelCount;
+    private String useLevelDi;
+    private String useLevelUnit;
+    private Integer useLeverCount;
+
+
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -220,7 +220,6 @@ public class UdiRelevanceResponse {
     private Integer physicType;
 
 
-
     /**
      * 包装规格
      */
@@ -235,6 +234,12 @@ public class UdiRelevanceResponse {
     private Integer majorType;
     private Integer medicareType;
 
+    private String distributeLevelDi;
+    private String distributeLevelUnit;
+    private Integer distributeLevelCount;
+    private String useLevelDi;
+    private String useLevelUnit;
+    private Integer useLeverCount;
 
 
     public int getBhzxxsbzsl() {

src/main/java/com/glxp/api/service/basic/UdiProductService.java

@@ -253,6 +253,7 @@ public class UdiProductService {
             List<UdiProductEntity> udiProductEntities = udiProductDao.findByUuids(udiRelevanceEntity.getUuid());
             for (UdiProductEntity udiProductEntity : udiProductEntities) {
                 addProductRequest.setNameCode(udiProductEntity.getNameCode());
+                addProductRequest.setId(udiProductEntity.getId());
                 BeanUtils.copyProperties(addProductRequest, udiProductEntity);
                 udiProductEntity.setCpmctymc(addProductRequest.getCpmctymc());
                 udiProductEntity.setProductsType(2);
@@ -263,6 +264,16 @@ public class UdiProductService {
                     udiProductEntity.setDiType(1);
                 }
                 udiProductDao.updateById(udiProductEntity);
+
+                //修改关联表
+                udiRelevanceEntity.setUseLeverCount(addProductRequest.getUseLeverCount());
+                udiRelevanceEntity.setUseLevelDi(addProductRequest.getUseLevelDi());
+                udiRelevanceEntity.setUseLevelUnit(addProductRequest.getUseLevelUnit());
+                udiRelevanceEntity.setDistributeLevelDi(addProductRequest.getDistributeLevelDi());
+                udiRelevanceEntity.setDistributeLevelUnit(addProductRequest.getDistributeLevelUnit());
+                udiRelevanceEntity.setDistributeLevelCount(addProductRequest.getDistributeLevelCount());
+                udiRelevanceDao.updateById(udiRelevanceEntity);
+
             }
         } else {
             udiRelevanceEntity = new UdiRelevanceEntity();
@@ -354,7 +365,7 @@ public class UdiProductService {
      * 根据当前层级标识计算流通拆零数量
      */
     public void calculateDistCount(UdiProductEntity udiProductEntity, UdiRelevanceEntity udiRelevanceEntity) {
-        List<UdiProductEntity> udiProductEntities = udiProductDao.findByOriginUuid(udiProductEntity.getUuid());
+        List<UdiProductEntity> udiProductEntities = udiProductDao.findByUuids(udiProductEntity.getUuid());
         CountWrapper xjCountWrapper = new CountWrapper();
         findUltimateEntity(udiProductEntity, udiProductEntities, xjCountWrapper);
         udiRelevanceEntity.setDistributeLevelDi(udiProductEntity.getNameCode());
@@ -366,7 +377,7 @@ public class UdiProductService {
      * 根据当前层级标识计算使用拆零数量
      */
     public void calculateUseCount(UdiProductEntity udiProductEntity, UdiRelevanceEntity udiRelevanceEntity) {
-        List<UdiProductEntity> udiProductEntities = udiProductDao.findByOriginUuid(udiProductEntity.getUuid());
+        List<UdiProductEntity> udiProductEntities = udiProductDao.findByUuids(udiProductEntity.getUuid());
         CountWrapper xjCountWrapper = new CountWrapper();
         findUltimateEntity(udiProductEntity, udiProductEntities, xjCountWrapper);
         udiRelevanceEntity.setUseLevelDi(udiProductEntity.getNameCode());
@@ -374,7 +385,7 @@ public class UdiProductService {
         udiRelevanceEntity.setUseLeverCount(xjCountWrapper.getCount());
     }
 
-    public static UdiProductEntity findUltimateEntity(UdiProductEntity udiProductEntity, List<UdiProductEntity> udiProductEntities, CountWrapper xjCountWrapper) {
+    public UdiProductEntity findUltimateEntity(UdiProductEntity udiProductEntity, List<UdiProductEntity> udiProductEntities, CountWrapper xjCountWrapper) {
         if (StrUtil.isEmpty(udiProductEntity.getBhxjcpbm())) {
             xjCountWrapper.addCount(udiProductEntity.getBhxjsl());
             return udiProductEntity;