From afb741a7dfd8350140f37e3c09b42dc72ea09e98 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 20 Jan 2025 12:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=87=87=E8=B4=AD=E5=8D=9535?= =?UTF-8?q?02=20=E6=B9=96=E9=87=8C=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E8=BF=87=E6=9D=A5=20(=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E6=8A=8A=E6=B2=A1=E8=AF=95=E8=BF=87=E7=9A=84=E5=8C=BB=E4=BF=9D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=85=8D=E7=BD=AE=E5=8C=B9=E9=85=8D=E5=85=88?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BA=86=20=E6=80=95=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=87=8D=E6=96=B0=E9=97=AE=E9=A2=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 38 ++++++++++++------- .../com/glxp/mipsdl/service/yb/YbClient.java | 11 ++++-- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index ad55b25..025a2fd 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -80,10 +80,13 @@ import java.util.stream.Collectors; @Slf4j @Service(value = "100011HttpClient") public class CtqyyClient extends CommonHttpClient { - private final String[] buyType_3501 = {"24"}; - private final String[] buyType_3502 = {"SC72889572632899", "6", "5", "4", "1", "16", "12", "28", "35"}; - private final String[] buyType_3505 = {"QXCF001", "YPCF002"}; - private final String[] buyType_3506 = {"YPTH001"}; + // 目前只有3502调通过上传医保 其他先不配置怕自动上传出问题 + private final String[] buyType_3501 = {}; + private final String[] buyType_3502 = {"SC72889572632899"}; + private final String[] buyType_3505 = {}; + +// private final String[] buyType_3505 = {"QXCF001", "YPCF002"}; + private final String[] buyType_3506 = {}; @Resource AuthWarehouseUserMapper authWarehouseUserMapper; @Resource @@ -2074,9 +2077,12 @@ public class CtqyyClient extends CommonHttpClient { if (StrUtil.isNotBlank(code)) { List relCodeDetailList = relCodeDetailService.getAllNext(code); if (relCodeDetailList != null && relCodeDetailList.size() > 0) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + for (RelCodeDetail relCodeDetail : relCodeDetailList) { + DrugInfoRequest request = new DrugInfoRequest(); + request.setDrug_trac_codg(relCodeDetail.getCurCode()); + drugTraceList.add(request); + } + } } } @@ -2148,9 +2154,12 @@ public class CtqyyClient extends CommonHttpClient { if (StrUtil.isNotBlank(code)) { List relCodeDetailList = relCodeDetailService.getAllNext(code); if (relCodeDetailList != null && relCodeDetailList.size() > 0) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + for (RelCodeDetail relCodeDetail : relCodeDetailList) { + DrugInfoRequest request = new DrugInfoRequest(); + request.setDrug_trac_codg(relCodeDetail.getCurCode()); + drugTraceList.add(request); + } + } } } @@ -2282,9 +2291,12 @@ public class CtqyyClient extends CommonHttpClient { if (StrUtil.isNotBlank(code)) { List relCodeDetailList = relCodeDetailService.getAllNext(code); if (relCodeDetailList != null && relCodeDetailList.size() > 0) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + for (RelCodeDetail relCodeDetail : relCodeDetailList) { + DrugInfoRequest request = new DrugInfoRequest(); + request.setDrug_trac_codg(relCodeDetail.getCurCode()); + drugTraceList.add(request); + } + } } } diff --git a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java index a737c1c..91dffc4 100644 --- a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java +++ b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java @@ -83,13 +83,18 @@ public class YbClient { if(resp.getIsSuccess() == true && org.apache.commons.lang3.StringUtils.isNotEmpty(resp.getAppid()) && "0".equals(resp.getInfCode()) - && org.apache.commons.lang3.StringUtils.isEmpty(resp.getErrMsg()) + ){ - return ResultVOUtils.success("【" + apiNo + "】上传医保成功"); + if(apiNo.equals("3505A") && "成功".equals(resp.getErrMsg())){ + return ResultVOUtils.success("【" + apiNo + "】上传医保成功"); - } + }else if(apiNo.equals("3502A") && org.apache.commons.lang3.StringUtils.isEmpty(resp.getErrMsg())){ + return ResultVOUtils.success("【" + apiNo + "】上传医保成功"); + } + + } return ResultVOUtils.error(500,"【" + apiNo + "】上传医保失败==="+resp.getErrMsg()); } catch (Exception e) {