From 845bfafdb6d261e790d5cb964dc6846a1afb3fa9 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sat, 5 Apr 2025 15:24:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=89=E5=85=A5=E8=8D=AF=E5=93=81?=
 =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/UdiContrastController.java          |  6 +++++-
 .../glxp/api/http/sync/SpGetHttpClient.java   | 21 +++++++++++++++++++
 .../api/service/thrsys/YbDrugService.java     |  5 ++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
index 25c3348d5..f019bde60 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
+import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
@@ -118,7 +119,10 @@ public class UdiContrastController {
                     BasicProductsCreateDto basicProductsCreateDto = new BasicProductsCreateDto();
                     basicProductsCreateDto.setMainId(thirdId);
                     basicProductsCreateDto.setAddCodeRelMark(false);
-                    udiContrastService.createOnlyMainId(basicProductsCreateDto);
+                    BaseResponse response = udiContrastService.createOnlyMainId(basicProductsCreateDto);
+                    if (response.getCode() != ResultEnum.SUCCESS.getCode()) {
+                        return response;
+                    }
                 }
             }
             if (StrUtil.isNotBlank(buffer.toString())) {
diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
index 5c9cc573f..5923b731b 100644
--- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
+++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
@@ -20,6 +20,8 @@ import com.glxp.api.entity.sync.SyncEditTypeEntity;
 import com.glxp.api.entity.system.SyncDataSetEntity;
 import com.glxp.api.entity.thrsys.CodeRel;
 import com.glxp.api.entity.thrsys.ThirdAliDrug;
+import com.glxp.api.entity.thrsys.ThrSystemEntity;
+import com.glxp.api.entity.thrsys.YbDrug;
 import com.glxp.api.idc.service.FileService;
 import com.glxp.api.req.alihealth.AlihealthRelCodeInsertReqeust;
 import com.glxp.api.req.alihealth.AlihealthYljgCodedetailReqeust;
@@ -29,6 +31,7 @@ import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust;
 import com.glxp.api.req.basic.BasicDataRequest;
 import com.glxp.api.req.basic.DeleteBasicDataRequest;
 import com.glxp.api.req.basic.ProductInfoFilterRequest;
+import com.glxp.api.req.basic.YbDrugDetailFilterRequest;
 import com.glxp.api.req.inout.RefreshInoiceRequest;
 import com.glxp.api.req.inout.ReviewFinishRequest;
 import com.glxp.api.req.inout.ReviewSpmsRequest;
@@ -762,4 +765,22 @@ public class SpGetHttpClient {
         }
         return response;
     }
+
+    /**
+     * 医保药品详情
+     */
+    public BaseResponse<PageSimpleResponse<YbDrug>> getYbDrugDetail(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) {
+
+        String json = JSONUtil.toJsonStr(ybHcflDetailFilterRequest);
+        String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/spms/udchs/ybDrug/list", json, buildHeader());
+        BaseResponse<PageSimpleResponse<YbDrug>> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<PageSimpleResponse<YbDrug>>>() {
+
+                });
+
+        if(response == null){
+            return ResultVOUtils.error("访问供应商平台访问不到");
+        }
+        return response;
+    }
 }
diff --git a/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java b/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java
index 70042a569..5a9d77c34 100644
--- a/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java
+++ b/src/main/java/com/glxp/api/service/thrsys/YbDrugService.java
@@ -5,6 +5,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.dao.thrsys.YbDrugMapper;
 import com.glxp.api.entity.thrsys.YbDrug;
 import com.glxp.api.http.ErpBasicClient;
+import com.glxp.api.http.sync.SpGetHttpClient;
 import com.glxp.api.req.basic.YbDrugDetailFilterRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +23,8 @@ public class YbDrugService {
     YbDrugMapper ybDrugMapper;
     @Resource
     ErpBasicClient erpBasicClient;
+    @Resource
+    SpGetHttpClient spGetHttpClient;
 
     public List<YbDrug> getList(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) {
         ybHcflDetailFilterRequest.setPage(1);
@@ -30,7 +33,7 @@ public class YbDrugService {
         if (CollUtil.isEmpty(list)){
             List<YbDrug> list1 = new ArrayList<>();
             try {
-                BaseResponse<PageSimpleResponse<YbDrug>> ybDrugDetail = erpBasicClient.getYbDrugDetail(ybHcflDetailFilterRequest);
+                BaseResponse<PageSimpleResponse<YbDrug>> ybDrugDetail = spGetHttpClient.getYbDrugDetail(ybHcflDetailFilterRequest);
                 PageSimpleResponse<YbDrug> data = ybDrugDetail.getData();
                 list1 = data.getList();
             }catch (Exception e){