From f469754e17fac1c3aa3e6a83929c546c34eef0d3 Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 18 Nov 2024 20:54:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E6=96=B9=E5=8D=95=E5=88=86=E6=B5=81?= =?UTF-8?q?=EF=BC=8C=E5=8D=95=E6=8D=AE=E8=AF=BB=E5=8F=96=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/constant/BusTypeConstant.java | 12 ++++++------ .../collect/IoCollectOriginController.java | 8 ++++---- src/main/java/com/glxp/api/http/ErpBasicClient.java | 6 ++++-- .../glxp/api/service/collect/DownloadFactory.java | 6 +++--- .../api/service/collect/IoCollectOrderService.java | 2 +- .../service/inout/impl/IoCodeLostServiceImpl.java | 11 +++++++---- 6 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/BusTypeConstant.java b/src/main/java/com/glxp/api/constant/BusTypeConstant.java index c172a327b..23fd786db 100644 --- a/src/main/java/com/glxp/api/constant/BusTypeConstant.java +++ b/src/main/java/com/glxp/api/constant/BusTypeConstant.java @@ -1,16 +1,16 @@ package com.glxp.api.constant; public enum BusTypeConstant { - YPCF002("药品处方单","YPCF002"), - QXCF001("器械处方单","QXCF001"), - CGJH001("采购计划","CGJH001"), - LYRK("领药入库","LYRK"), - GMRK("购买入库","GMRK"), - LYCK("领药出库","LYCK"), + QXCF001("器械处方单", "QXCF001"), + CGJH001("采购计划", "CGJH001"), + LYRK("领药入库", "LYRK"), + GMRK("购买入库", "GMRK"), + LYCK("领药出库", "LYCK"), ; private String name; private String busType; + BusTypeConstant(String name, String busType) { this.name = name; this.busType = busType; diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index 1921a4106..9d3aeae37 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -73,7 +73,7 @@ public class IoCollectOriginController extends BaseController { String busType = collectOrderRequest.getBusType(); if (StrUtil.isBlank(busType)) return ResultVOUtils.error("请选择业务名称"); - if (busType.equals(BusTypeConstant.YPCF002.getBusType())) { + if (busType.startsWith("YPCF")) { GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest(); getSickPrescribeRequest.setLimit(collectOrderRequest.getLimit()); getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo()); @@ -90,7 +90,7 @@ public class IoCollectOriginController extends BaseController { BaseResponse> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest); return baseResponse; - }else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) { + } else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) { GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest(); getSickPrescribeRequest.setLimit(collectOrderRequest.getLimit()); getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo()); @@ -107,7 +107,7 @@ public class IoCollectOriginController extends BaseController { BaseResponse> baseResponse = erpBasicClient.getPrescribeQx(getSickPrescribeRequest); return baseResponse; - }else if (busType.contains("SC")) { + } else if (busType.contains("SC")) { FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setStatus(10); filterOrderRequest.setAction(busType); @@ -122,7 +122,7 @@ public class IoCollectOriginController extends BaseController { filterOrderRequest.setKeyWords(collectOrderRequest.getKeyWords()); BaseResponse> baseResponse = ioCollectOrderService.selectImportUdi(filterOrderRequest); return baseResponse; - }else { + } else { FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); filterThrOrderRequest.setLimit(collectOrderRequest.getLimit()); filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo()); diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index 3c78e90bc..f83c3042e 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -218,6 +218,7 @@ public class ErpBasicClient { return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); } } + public BaseResponse> getPrescribeQx(GetSickPrescribeRequest getSickPrescribeRequest) { ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(getSickPrescribeRequest.getThirdSys()); String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getPrescribesQx"; @@ -445,7 +446,7 @@ public class ErpBasicClient { public BaseResponse> getYbDrugDetail(YbDrugDetailFilterRequest ybHcflDetailFilterRequest) { // String url = "https://www.udims.com/UDI_DL_Server_test" + "/udchs/ybDrug/list"; ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId"); - String url = basicThirdSysEntity.getThridUrl() + "/udchs/ybDrug/list"; + String url = basicThirdSysEntity.getThridUrl() + "/udchs/ybDrug/list"; try { String response = httpOkClient.uCloudPost(url, ybHcflDetailFilterRequest); BaseResponse> listBaseResponse = @@ -478,12 +479,13 @@ public class ErpBasicClient { } } //TODO 阿超改==校验码是和下级所有码否传过了逻辑还没写 + /** * 校验码是和下级所有码否上传医保过了(返回的list就是码已经重复上传到医保的了) */ public BaseResponse collectOrderCheckCodeUploading(List codeList) { ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId"); - String url = basicThirdSysEntity.getThridUrl() + "/udiwms/relCode/checkCode"; + String url = basicThirdSysEntity.getThridUrl() + "/udiwms/relCode/checkCode"; try { String response = httpOkClient.uCloudPost(url, codeList); BaseResponse listBaseResponse = diff --git a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java index d914bbc85..aaeb76a39 100644 --- a/src/main/java/com/glxp/api/service/collect/DownloadFactory.java +++ b/src/main/java/com/glxp/api/service/collect/DownloadFactory.java @@ -36,11 +36,11 @@ public class DownloadFactory { if (busType == null) { return ResultVOUtils.error("下载失败，未配置业务类型"); } - if (busType.equals(BusTypeConstant.YPCF002.getBusType())) { + if (busType.startsWith("YPCF")) { return ypcf002Download.downloadOrder(collectOrderRequest); - }else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) { + } else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) { return qxcf001Download.downloadOrder(collectOrderRequest); - }else if (busType.contains("SC")) { + } else if (busType.contains("SC")) { return ioCollectOrderService.importUdi(collectOrderRequest); } else { return thrOrderDownload.downloadOrder(collectOrderRequest); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 4e285964b..5b555548d 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -655,7 +655,7 @@ public class IoCollectOrderService extends ServiceImpl codeLostEntities = codeLostEntityMapper.selectList(new QueryWrapper().like("code", code).last("limit 1")); - if (CollUtil.isNotEmpty(codeLostEntities)) { - return codeLostEntities.get(0); - } + RelCodeDetailResponse codeRelEntity = relCodeDetailService.findByCode(code); if (codeRelEntity != null) { IoCodeLostEntity udiEntity = new IoCodeLostEntity(); @@ -63,6 +60,12 @@ public class IoCodeLostServiceImpl extends ServiceImpl codeLostEntities = codeLostEntityMapper.selectList(new QueryWrapper().like("code", code).last("limit 1")); + if (CollUtil.isNotEmpty(codeLostEntities)) { + return codeLostEntities.get(0); + } + return null; }