From d1751384b1583506fa27ddad5c61670b16666374 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 6 Jan 2025 19:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E5=8C=BB=E4=BF=9D=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E7=94=A8=E5=A4=9A=E7=A0=81=E8=A1=A8=E8=8E=B7=E5=8F=96=E9=98=BF?= =?UTF-8?q?=E9=87=8C=E8=8D=AF=E5=93=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/udchs/CodeRelController.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/udidl/admin/controller/udchs/CodeRelController.java b/src/main/java/com/glxp/udidl/admin/controller/udchs/CodeRelController.java index ff78b36..7ab4b92 100644 --- a/src/main/java/com/glxp/udidl/admin/controller/udchs/CodeRelController.java +++ b/src/main/java/com/glxp/udidl/admin/controller/udchs/CodeRelController.java @@ -67,7 +67,7 @@ public class CodeRelController { } - @ApiOperation(value = "更新指定信息", response = CodeRel.class) +// @ApiOperation(value = "更新指定信息", response = List.class) @PostMapping("/updateBatch") public BaseResponse updateBatchByCodeRel(@RequestBody List paramList) { if (CollUtil.isEmpty(paramList)){ @@ -82,14 +82,16 @@ public class CodeRelController { @PostMapping("/listAndAliDrug") public BaseResponse getListAndAliDrug(@RequestBody CodeRel param) { if ( param == null || - (StrUtil.isBlank(param.getDiNameCode()) && StrUtil.isBlank(param.getDrugCode())) + (StrUtil.isBlank(param.getYbbm()) && StrUtil.isBlank(param.getYbbm())) ){ return ResultVOUtils.error(ResultEnum.DATA_ERROR,"参数错误"); } - List respList = new ArrayList<>(); +// List respList = new ArrayList<>(); + List thirdAliDrugList = new ArrayList<>(); + List list = codeRelService.list(new LambdaQueryWrapper() - .eq(CodeRel::getDiNameCode,param.getDiNameCode()).or().eq(CodeRel::getDrugCode,param.getDrugCode())); + .eq(CodeRel::getYbbm,param.getYbbm())); if (CollUtil.isNotEmpty(list)){ for (int i = 0; i < list.size(); i++) { @@ -101,13 +103,14 @@ public class CodeRelController { if (StrUtil.isNotEmpty(drugCode)){ //本地查找 未找到再到阿里查找 ThirdAliDrug thirdAliDrug = thirdAliDrugService.getThirdAliDrug(drugCode); - codeRelVo.setThirdAliDrug(thirdAliDrug); +// codeRelVo.setThirdAliDrug(thirdAliDrug); + thirdAliDrugList.add(thirdAliDrug); } - respList.add(codeRelVo); +// respList.add(codeRelVo); } } - return ResultVOUtils.success(respList); + return ResultVOUtils.success(thirdAliDrugList); } }