From 2a9bac0e794aa5db1a625e90ea3a28df7340aea3 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Wed, 25 Dec 2024 18:24:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E5=85=A5=E8=8D=AF=E5=93=81=E5=B1=82?= =?UTF-8?q?=E7=BA=A7=E6=9F=A5=E8=AF=A2=E5=B0=B1=E4=B8=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=BA=93=E4=BA=86=20=20=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E5=88=B0=E7=9B=B4=E6=8E=A5=E5=8E=BB=E9=98=BF?= =?UTF-8?q?=E9=87=8C=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alihealth/AlihealthBusController.java | 28 ++++++++++--------- .../thrsys/ThirdAliDrugController.java | 1 + .../AlihealthThirdAliDrugInsertReqeust.java | 1 + 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java index 2d14e259..3b694772 100644 --- a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java +++ b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java @@ -112,23 +112,25 @@ public class AlihealthBusController extends BaseController { } List thirdAliDrugsListGjk = null; + if(alihealthThirdAliDrugInsertReqeust.getGjkSwitch()){ + try { + String response = HttpUtil.get(udiUrl + "/udiwms/aliDrug/getDrugLevelList", map); + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>() { + + }); + if (udiDlDeviceResponse != null + ) { + // 查询国家库是否有值 有值直接返回没值查询阿里接口 + thirdAliDrugsListGjk = udiDlDeviceResponse.getData().getList(); + } + } catch (Exception e) { + log.error("国家库查询阿里产品访问出现错误===" + e.getMessage()); - try { - String response = HttpUtil.get(udiUrl + "/udiwms/aliDrug/getDrugLevelList", map); - BaseResponse> udiDlDeviceResponse = - JSONObject.parseObject(response, new TypeReference>>() { - - }); - if (udiDlDeviceResponse != null - ) { - // 查询国家库是否有值 有值直接返回没值查询阿里接口 - thirdAliDrugsListGjk = udiDlDeviceResponse.getData().getList(); } - } catch (Exception e) { - log.error("国家库查询阿里产品访问出现错误===" + e.getMessage()); - } + if (thirdAliDrugsListGjk != null && thirdAliDrugsListGjk.size() > 0) { return ResultVOUtils.success(thirdAliDrugsListGjk); } else { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java index a9a377c6..35d34912 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java @@ -100,6 +100,7 @@ public class ThirdAliDrugController extends BaseController { alihealthThirdAliDrugInsertReqeust.setErpId(authAliUser.getErpid()); alihealthThirdAliDrugInsertReqeust.setAppSecret(authAliUser.getAppsecret()); alihealthThirdAliDrugInsertReqeust.setManufactory(thirdAliDrug.getManufacturer()); + alihealthThirdAliDrugInsertReqeust.setGjkSwitch(false); AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = new AlihealthKytDrugrescodeReqeust(); alihealthKytDrugrescodeReqeust.setPhysic_name(thirdAliDrug.getCpmctymc()); alihealthKytDrugrescodeReqeust.setApproval_licence_no(thirdAliDrug.getApprovalNum()); diff --git a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java index 3e0f00a5..0ceaee2f 100644 --- a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java @@ -8,6 +8,7 @@ public class AlihealthThirdAliDrugInsertReqeust { private String erpId; private String appSecret; private String manufactory; + private Boolean gjkSwitch = true; private AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust; }