1、每次选入有括号和罗马数字的等进行多次转换查询

2、查询睡眠写在接口上
3、药品选入层级增加连带选入 剔除已经存在的药品

src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java

@@ -13,15 +13,18 @@ import com.glxp.api.constant.RedissonCacheKey;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.controller.alihealth.AlihealthBusController;
 import com.glxp.api.entity.auth.AuthAliUser;
+import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.thrsys.ThirdAliDrug;
 import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust;
 import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust;
+import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.thrsys.FilterThrCorpRequest;
 import com.glxp.api.req.thrsys.ThirdAliDrugRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.collect.RelCodeDetailResponse;
 import com.glxp.api.res.thrsys.ThrCorpsResponse;
 import com.glxp.api.service.auth.AuthAliUserService;
+import com.glxp.api.service.basic.UdiProductService;
 import com.glxp.api.service.thrsys.ThirdAliDrugService;
 import com.glxp.api.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -33,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -45,6 +49,8 @@ public class ThirdAliDrugController extends BaseController {
     private AlihealthBusController alihealthBusController;
     @Resource
     private AuthAliUserService authAliUserService;
+    @Resource
+    private UdiProductService udiProductService;
 
     /**
      * 上传文件保存
@@ -74,6 +80,17 @@ public class ThirdAliDrugController extends BaseController {
         ) {
             return ResultVOUtils.success("查询参数不能为空");
         }
+        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
+        filterUdiRelRequest.setUuid(thirdAliDrug.getUuid());
+        List<UdiProductEntity> udiInfoEntities = udiProductService.filterAllUdiInfo(filterUdiRelRequest);
+        List<String> nameCodeIn = null;
+        if(udiInfoEntities!=null && udiInfoEntities.size() >0){
+            nameCodeIn = new ArrayList<>();
+            for (UdiProductEntity udiInfoEntity : udiInfoEntities) {
+                nameCodeIn.add(udiInfoEntity.getNameCode());
+            }
+        }
+        thirdAliDrug.setNameCodeIn(nameCodeIn);
         List<ThirdAliDrug> list = thirdAliDrugService.filterList(thirdAliDrug);
         if(list == null || list.size() == 0){
             AuthAliUser authAliUser = authAliUserService.getOne();

src/main/java/com/glxp/api/req/thrsys/ThirdAliDrugRequest.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class ThirdAliDrugRequest extends ListPageRequest {
@@ -153,6 +154,7 @@ public class ThirdAliDrugRequest extends ListPageRequest {
 
     private String uuid;
     private String ybbm;
+    private List<String> nameCodeIn;
 
 
 }

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

@@ -253,7 +253,6 @@ public class BasicBackUpdateProductService {
 //                        udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
 //                    }
                     try {
-                        Thread.sleep(600);
                         udiContrastService.createOnlyMainId(thrProductsEntity.getCode());
                     } catch (Exception e) {
 

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -615,16 +615,17 @@ public class UdiProductServiceImpl implements UdiProductService {
     private ThirdAliDrugService thirdAliDrugService;
     @Override
     public void saveOrUpadateLevelDrugAli(ThirdAliDrugRequest thirdAliDrugRequest) {
-        // 查询现在如果有码为空的就进行替代掉
-        List<UdiProductEntity> list = udiProductDao.selectList(
-                new QueryWrapper<UdiProductEntity>().eq("uuid", thirdAliDrugRequest.getUuid())
-        );
 
         ThrProductsEntity thrProductsEntity = thrProductsService.selectByCode(thirdAliDrugRequest.getYbbm());
-        ThirdAliDrug thirdAliDrug = thirdAliDrugService.getOne(
+        ThirdAliDrug thirdAliDrugServiceOne = thirdAliDrugService.getOne(
                 new QueryWrapper<ThirdAliDrug>().eq("nameCode",thirdAliDrugRequest.getNameCode()).last("limit 1")
         );
-
+        if(thirdAliDrugServiceOne != null){
+            List<ThirdAliDrug> thirdAliDrugList = thirdAliDrugService.list(
+                    new QueryWrapper<ThirdAliDrug>().eq("bzgg",thirdAliDrugServiceOne.getBzgg()).eq("packRatio",thirdAliDrugServiceOne.getPackRatio())
+            );
+            if(thirdAliDrugList != null && thirdAliDrugList.size() >0){
+                for (ThirdAliDrug thirdAliDrug : thirdAliDrugList) {
                     UdiProductEntity udiProductEntity = new UdiProductEntity();
 
                     BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
@@ -707,16 +708,13 @@ public class UdiProductServiceImpl implements UdiProductService {
                     udiProductEntity.setId(IdUtil.getSnowflakeNextId());
                     udiProductEntity.setCpmctymc(thirdAliDrug.getCpmctymc());
                     udiProductEntity.setZczbhhzbapzbh(thirdAliDrug.getApprovalNum());
-        if (list != null && list.size() == 1) {
-            if (StringUtils.isEmpty(udiProductEntity.getNameCode())) {
-                udiProductEntity.setId(list.get(0).getId());
-                udiProductDao.updateById(udiProductEntity);
-                return;
-            }
 
+                    udiProductService.insertUdiInfo(udiProductEntity);
+                }
+            }
         }
 
-        udiProductService.insertUdiInfo(udiProductEntity);
+
 
 //        }
 

src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java

@@ -111,10 +111,9 @@ public class AlihealthUtils {
         List<ThirdAliDrug> resultList = new ArrayList<>();
         AlihealthKytDrugrescodeReqeust drugRequest = request.getAlihealthKytDrugrescodeReqeust();
         String originalName = drugRequest.getPhysic_name();
-        BaseResponse<List<ThirdAliDrug>> baseResponse = null;
 
         // 尝试原始名称
-        baseResponse = tryInsertAndCollect(request, resultList);
+        BaseResponse<List<ThirdAliDrug>> listBaseResponse = tryInsertAndCollect(request, resultList);
 
         // 处理括号转换
         if (containsBrackets(originalName)) {
@@ -123,7 +122,7 @@ public class AlihealthUtils {
             AlihealthThirdAliDrugInsertReqeust tempRequest = new AlihealthThirdAliDrugInsertReqeust();
             BeanUtils.copyProperties(request, tempRequest);
             tempRequest.getAlihealthKytDrugrescodeReqeust().setPhysic_name(convertedName);
-            BaseResponse<List<ThirdAliDrug>> listBaseResponse = tryInsertAndCollect(tempRequest, resultList);
+             listBaseResponse = tryInsertAndCollect(tempRequest, resultList);
         }
 
         // 处理罗马数字转换
@@ -133,14 +132,14 @@ public class AlihealthUtils {
             AlihealthThirdAliDrugInsertReqeust tempRequest = new AlihealthThirdAliDrugInsertReqeust();
             BeanUtils.copyProperties(request, tempRequest);
             tempRequest.getAlihealthKytDrugrescodeReqeust().setPhysic_name(convertedName);
-            BaseResponse<List<ThirdAliDrug>> listBaseResponse = tryInsertAndCollect(tempRequest, resultList);
+            listBaseResponse = tryInsertAndCollect(tempRequest, resultList);
         }
 
         // 设置结果
         if (!resultList.isEmpty()) {
-            baseResponse.setData(resultList);
+            ResultVOUtils.success(resultList);
         }
-        return baseResponse;
+        return listBaseResponse;
     }
 
     // 辅助方法
@@ -203,11 +202,12 @@ public class AlihealthUtils {
                 && org.apache.commons.lang3.StringUtils.isNotEmpty(alihealthThirdAliDrugInsertReqeust.getAppSecret())
         ) {
             try {
-                AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust2 = new AlihealthKytDrugrescodeReqeust();
-                BeanUtils.copyProperties(alihealthKytDrugrescodeReqeust,alihealthKytDrugrescodeReqeust2);
-                Map map = alihealthUtils.disposeSign(alihealthKytDrugrescodeReqeust2, alihealthThirdAliDrugInsertReqeust.getAppSecret());
+                Thread.sleep(600);
+                AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeustNew = new AlihealthKytDrugrescodeReqeust();
+                BeanUtils.copyProperties(alihealthKytDrugrescodeReqeust,alihealthKytDrugrescodeReqeustNew);
+                Map map = alihealthUtils.disposeSign(alihealthKytDrugrescodeReqeustNew, alihealthThirdAliDrugInsertReqeust.getAppSecret());
                 String json = HttpUtil.get(alihealthUrl, map);
-                log.error("阿里健康接口调用成功===" + json);
+                log.error("阿里健康接口调用结果===" + json);
                 alihealthKytDrugrescodeResponse = new AlihealthKytDrugrescodeResponse(json);
 
             } catch (Exception e) {

src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml

@@ -85,6 +85,13 @@
             <if test="approvalNum != '' and approvalNum != null">
                 AND approvalNum = #{approvalNum}
             </if>
+            <if test="nameCodeIn != null">
+                AND nameCode NOT IN
+                <foreach collection="nameCodeIn" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+
         </where>
         order by cpmctymc,approvalNum,packRatio,packLevel
     </select>