From ee596447563c439e5df2d926fe383670f7727f5a Mon Sep 17 00:00:00 2001 From: qiuyt Date: Fri, 6 Dec 2024 18:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=92=8C=E6=95=B0=E6=8D=AE=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 | 22 ++++++++++--------- .../com/glxp/mipsdl/service/yb/YbClient.java | 10 ++++----- 2 files changed, 16 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 cfed992..b0429da 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1672,7 +1672,7 @@ public class CtqyyClient extends CommonHttpClient { if (matchBusType(busType, buyType_3501)) { optionUploadCollectOrder3501(ioCollectOrder); } else if (matchBusType(busType, buyType_3502)) { - optionUploadCollectOrder3502(ioCollectOrder); + return optionUploadCollectOrder3502(ioCollectOrder); } else if (matchBusType(busType, buyType_3505)) { optionUploadCollectOrder3505(ioCollectOrder); } else if (matchBusType(busType, buyType_3506)) { @@ -2168,16 +2168,16 @@ public class CtqyyClient extends CommonHttpClient { } - public void optionUploadCollectOrder3502(IoCollectOrder ioCollectOrder) { - List bizList = ioCollectOrder.getBizList(); + public BaseResponse optionUploadCollectOrder3502(IoCollectOrder ioCollectOrder) { + List bizList = ioCollectOrder.getCollectOrderBizResponseList(); if (CollUtil.isNotEmpty(bizList)) { List collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList(); List kcbg3502Requests = new ArrayList<>(); for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) { BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId()); String itemCode = basicUdirelEntity.getMainId(); - for (IoCollectOrderBiz item : bizList) { - if (item.getNameCode().equals(itemCode)) { + for (CollectOrderBizResponse item : bizList) { + if (item.getYbbm().equals(itemCode)) { String[] codes = collectOrderBizResponse.getFinishUdiCode().split(","); List drugTraceList = new ArrayList<>(); // 遍历fruits数组 @@ -2194,13 +2194,13 @@ public class CtqyyClient extends CommonHttpClient { // TODO: 2024/9/10 字段未完全正确对应 Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder() .med_list_codg(item.getYbbm()) - .inv_chg_type(item.getRemark7()) + .inv_chg_type("test") .fixmedins_hilist_id(item.getThrCode()) .fixmedins_hilist_name(item.getCpmctymc()) - .fixmedins_bchno(item.getRemark5()) - .pric(item.getRemark1()) + .fixmedins_bchno("test") + .pric("1.11") .cnt(item.getActCount()) - .rx_flag(item.getRemark6()) + .rx_flag("test") .inv_chg_time(item.getUpdateTime()) .inv_chg_opter_name(ioCollectOrder.getCreateUser()) .memo(item.getRemark()) @@ -2214,7 +2214,9 @@ public class CtqyyClient extends CommonHttpClient { baseKcbg3502Request.setSelinfoDetail(kcbg3502Requests); String jsonStr = JSONUtil.toJsonStr(baseKcbg3502Request); JSONObject dataJson = JSONObject.parseObject(jsonStr); - ybClient.ybPost("3502A", dataJson); + return ybClient.ybPost("3502A", dataJson); + }else { + return ResultVOUtils.error(500,"上传医保数据为空请核实"); } } 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 0fd02e8..0f0a6e4 100644 --- a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java +++ b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java @@ -47,7 +47,7 @@ public class YbClient { * @param data * @return */ - public ChsMedicalResponse ybPost(String apiNo, JSONObject data) { + public BaseResponse ybPost(String apiNo, JSONObject data) { log.info("[" + apiNo + "]医保接口请求参数:" + data); ThrYbSetup thrYbSetup = thrYbSetupService.getSetUp(); @@ -76,12 +76,10 @@ public class YbClient { req.setInput(data); req.setSignNo(thrYbSetup.getSignNo()); log.info("【" + apiNo + "】医保接口请求参数:" + JSONObject.toJSONString(req)); - ChsMedicalResponse resp = client.execute(req); - return resp; - } catch (ZephyrApiException e) { - e.printStackTrace(); + return ResultVOUtils.success("【" + apiNo + "】上传医保成功"); + } catch (Exception e) { + return ResultVOUtils.success("【" + apiNo + "】上传医保失败"+e.getMessage()); } - return null; } /**