From 6a6312ca41a627e09638e615fc8aa0dd5b9db690 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 20 Jan 2025 11:28:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A6=87=E5=B9=BC=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/client/hlfyyy/HlfyyyClient.java | 21 ++++++++++--------- .../com/glxp/mipsdl/service/yb/YbClient.java | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java index be69f53..7f604e2 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -2064,17 +2064,18 @@ public class HlfyyyClient extends CommonHttpClient { public BaseResponse optionUploadCollectOrder3502(IoCollectOrder ioCollectOrder) { +// List bizList = ioCollectOrder.getCollectOrderBizResponseList(); 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()); + for (CollectOrderBizResponse item : bizList) { + BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(item.getRelId()); String itemCode = basicUdirelEntity.getMainId(); - for (CollectOrderBizResponse item : bizList) { - if (item.getYbbm().equals(itemCode)) { - String[] codes = collectOrderBizResponse.getFinishUdiCode().split(","); - String nameCode = collectOrderBizResponse.getNameCode(); +// for (CollectOrderBizResponse item : collectOrderBizResponseList) { +// if (item.getYbbm().equals(itemCode)) { + String[] codes = item.getFinishUdiCode().split(","); + String nameCode = item.getNameCode(); BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne( new QueryWrapper().eq("nameCode",nameCode).last("limit 1") ); @@ -2097,7 +2098,7 @@ public class HlfyyyClient extends CommonHttpClient { } // 级别为2的产品码不可能只有一个 if(packLevel >1 && codeList.size() <2){ - return ResultVOUtils.error(500,"大包装码关联关系拉取不到请检查"); + return ResultVOUtils.error(500,"大包装码关联关系拉取不到请检查"+code); } } } @@ -2128,8 +2129,8 @@ public class HlfyyyClient extends CommonHttpClient { .trdn_flag("0") .drugtracinfo(drugTraceList).build(); kcbg3502Requests.add(kcbg3502Request); - } - } +// } +// } } BaseKcbg3502Request baseKcbg3502Request = new BaseKcbg3502Request(); baseKcbg3502Request.setInvinfoDetail(kcbg3502Requests); 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 a0f8467..0330565 100644 --- a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java +++ b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java @@ -76,9 +76,9 @@ public class YbClient { req.setInput(data); req.setSignNo(thrYbSetup.getSignNo()); log.error("【" + apiNo + "】医保接口请求参数：" + JSONObject.toJSONString(req)); -// ChsMedicalResponse resp = client.execute(req); -// log.error("【" + apiNo + "】医保接口返回结果：" + JSONObject.toJSONString(resp)); - ChsMedicalResponse resp = new ChsMedicalResponse(); + ChsMedicalResponse resp = client.execute(req); + log.error("【" + apiNo + "】医保接口返回结果：" + JSONObject.toJSONString(resp)); +// ChsMedicalResponse resp = new ChsMedicalResponse(); log.error("aaaa"); if(resp.getIsSuccess() == true