From ca86297063975c2609bd1ebd235d70f1f857600a Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 11 Nov 2024 18:41:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=8C=BB=E4=BF=9D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=83=BD=E5=8A=A0=E4=B8=8A=E9=80=9A=E8=BF=87=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB=E8=8E=B7=E5=8F=96=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 49 ++++++++++++++----- .../mipsdl/client/scpwxyy/ScpwxyyClient.java | 42 ++++++++++------ .../mipsdl/client/yxfuyy/YxfyyyClient.java | 48 +++++++++++++----- .../service/basic/RelCodeDetailService.java | 2 + 4 files changed, 101 insertions(+), 40 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 a12b283..3e29e50 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -51,6 +51,7 @@ import com.glxp.mipsdl.res.ctqyy.CtBaseResponse; import com.glxp.mipsdl.res.ctqyy.ThrOrderResponse; import com.glxp.mipsdl.res.udiwms.*; import com.glxp.mipsdl.service.auth.AuthWarehouseService; +import com.glxp.mipsdl.service.basic.RelCodeDetailService; import com.glxp.mipsdl.service.order.OrderUploadLogService; import com.glxp.mipsdl.service.system.SysParamConfigService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; @@ -147,6 +148,8 @@ public class CtqyyClient extends CommonHttpClient { VInsurNationGoodsReturnMapper vInsurNationGoodsReturnMapper; @Resource private ThrProductsDao thrProductsDao; + @Resource + private RelCodeDetailService relCodeDetailService; /** * 拼接xml请求头 @@ -668,7 +671,7 @@ public class CtqyyClient extends CommonHttpClient { .selectList(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, orderEntity.getBillNo()) .eq(IoOrderInvoiceEntity::getBindRlFk, i.getBindRlFk()) .eq(StrUtil.isNotEmpty(i.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, i.getBatchNo()). - groupBy(IoOrderInvoiceEntity::getInvoiceEncode)); + groupBy(IoOrderInvoiceEntity::getInvoiceEncode)); if (CollectionUtil.isNotEmpty(invoiceList)) { fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(",")); if (invoiceList.get(0).getInvoiceDate() != null) @@ -1974,9 +1977,14 @@ public class CtqyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } Xsck3505Request xsck3505Request = Xsck3505Request.builder() .med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG()) @@ -2043,9 +2051,14 @@ public class CtqyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } // TODO: 2024/9/10 字段未完全正确对应 Pcsc3501Request pcsc3501Request = Pcsc3501Request.builder() @@ -2088,9 +2101,14 @@ public class CtqyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } // TODO: 2024/9/10 字段未完全正确对应 Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder() @@ -2138,9 +2156,14 @@ public class CtqyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } // TODO: 2024/9/10 字段未完全正确对应 Xsth3506Request xsth3506Request = Xsth3506Request.builder() diff --git a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java index 0e3f83b..8cb016d 100644 --- a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java @@ -1815,7 +1815,7 @@ public class ScpwxyyClient extends CommonHttpClient { for (String code : codes) { if (StrUtil.isNotBlank(code)) { List relCodeDetailList = relCodeDetailService.getAllNext(code); - if(relCodeDetailList!=null && relCodeDetailList.size() >0 ){ + if (relCodeDetailList != null && relCodeDetailList.size() > 0) { for (RelCodeDetail relCodeDetail : relCodeDetailList) { DrugInfoRequest request = new DrugInfoRequest(); request.setDrug_trac_codg(relCodeDetail.getCurCode()); @@ -1875,10 +1875,10 @@ public class ScpwxyyClient extends CommonHttpClient { JSONObject dataJson = JSONObject.parseObject(jsonStr); - return ybClient.ybPostScyh("3505A", dataJson); + return ybClient.ybPostScyh("3505A", dataJson); - }else { - return ResultVOUtils.error(500,"未上传医保视图数据查不到"); + } else { + return ResultVOUtils.error(500, "未上传医保视图数据查不到"); } } @@ -1898,9 +1898,14 @@ public class ScpwxyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } // TODO: 2024/9/10 字段未完全正确对应 Pcsc3501Request pcsc3501Request = Pcsc3501Request.builder() @@ -1943,9 +1948,14 @@ public class ScpwxyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } // TODO: 2024/9/10 字段未完全正确对应 Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder() @@ -1993,9 +2003,14 @@ public class ScpwxyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } // TODO: 2024/9/10 字段未完全正确对应 Xsth3506Request xsth3506Request = Xsth3506Request.builder() @@ -2028,7 +2043,6 @@ public class ScpwxyyClient extends CommonHttpClient { } - BaseXsth3506Request baseXsth3506Request = new BaseXsth3506Request(); baseXsth3506Request.setSelinfoDetail(xsth3506Requests); String jsonStr = JSONUtil.toJsonStr(baseXsth3506Request); diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java index 8c2eda6..fcc4a52 100644 --- a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java @@ -52,6 +52,7 @@ import com.glxp.mipsdl.res.PageSimpleResponse; import com.glxp.mipsdl.res.ctqyy.CtBaseResponse; import com.glxp.mipsdl.res.udiwms.*; import com.glxp.mipsdl.service.auth.AuthWarehouseService; +import com.glxp.mipsdl.service.basic.RelCodeDetailService; import com.glxp.mipsdl.service.order.OrderUploadLogService; import com.glxp.mipsdl.service.system.SysParamConfigService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; @@ -132,7 +133,8 @@ public class YxfyyyClient extends CommonHttpClient { private VYpzsIoInfoMapper vYpzsIoInfoMapper; @Resource private YbClient ybClient; - + @Resource + private RelCodeDetailService relCodeDetailService; /** * 拼接xml请求头 * @@ -1803,9 +1805,14 @@ public class YxfyyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } Xsck3505Request xsck3505Request = Xsck3505Request.builder() .med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG()) @@ -1872,9 +1879,14 @@ public class YxfyyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } // TODO: 2024/9/10 字段未完全正确对应 Pcsc3501Request pcsc3501Request = Pcsc3501Request.builder() @@ -1917,9 +1929,14 @@ public class YxfyyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } // TODO: 2024/9/10 字段未完全正确对应 Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder() @@ -1967,9 +1984,14 @@ public class YxfyyyClient extends CommonHttpClient { List drugTraceList = new ArrayList<>(); // 遍历fruits数组 for (String code : codes) { - DrugInfoRequest request = new DrugInfoRequest(); - request.setDrug_trac_codg(code); - drugTraceList.add(request); + 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); + } + } } // TODO: 2024/9/10 字段未完全正确对应 Xsth3506Request xsth3506Request = Xsth3506Request.builder() diff --git a/src/main/java/com/glxp/mipsdl/service/basic/RelCodeDetailService.java b/src/main/java/com/glxp/mipsdl/service/basic/RelCodeDetailService.java index 468398f..372f8ca 100644 --- a/src/main/java/com/glxp/mipsdl/service/basic/RelCodeDetailService.java +++ b/src/main/java/com/glxp/mipsdl/service/basic/RelCodeDetailService.java @@ -46,4 +46,6 @@ public class RelCodeDetailService extends ServiceImpl