From 71592d37ab0fa1f5c62b2cc9aa1f854fbfce4516 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 7 Jan 2025 14:23:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E5=8C=BB=E4=BF=9D=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=B0=B1=E4=B8=8D=E5=8A=A0?= =?UTF-8?q?=E5=85=A5his=E7=B3=BB=E7=BB=9F=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 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 575b86d..d34994c 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.enums.SqlLike; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.mipsdl.client.CommonHttpClient; @@ -280,11 +281,12 @@ public class CtqyyClient extends CommonHttpClient { IPage page = vYpzsPhysicDictMapper.selectPage(new Page(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper); List physicDictEntities = page.getRecords(); List thrProductsEntityList = null; + List listNew = null; if (CollUtil.isNotEmpty(physicDictEntities)) { //数据处理以thr_products 返回 thrProductsEntityList = physicDictEntities.stream().map(dict -> { ThrProductsEntity products = new ThrProductsEntity(); - products.setCode(dict.getPHYSIC_CODE()); + products.setCode(dict.getPHYSIC_SPEC()); products.setName(dict.getPHYSIC_NAME()); products.setMeasname(dict.getPACK_UNIT()); products.setSpec(dict.getPACK_SPEC()); @@ -297,7 +299,16 @@ public class CtqyyClient extends CommonHttpClient { return products; }).collect(Collectors.toList()); thrProductsDao.batchInsert(thrProductsEntityList); - thrProductsEntityList = thrProductsEntityList.stream() + listNew = new ArrayList(); + // 删除医保编码数据为空的数据 + for (ThrProductsEntity thrProductsEntity : thrProductsEntityList) { + if(StringUtils.isNotBlank(thrProductsEntity.getYbbm())){ + listNew.add(thrProductsEntity); + } + } + + listNew = listNew.stream() + .collect(Collectors.groupingBy(ThrProductsEntity::getYbbm, LinkedHashMap::new, Collectors.collectingAndThen(Collectors.toList(), list -> list.get(0)))) @@ -306,14 +317,14 @@ public class CtqyyClient extends CommonHttpClient { .collect(Collectors.toList()); } - for (ThrProductsEntity entity : thrProductsEntityList) { + for (ThrProductsEntity entity : listNew) { entity.setId(null); entity.setRemark(entity.getCode()); entity.setCode(entity.getYbbm()); } PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); - pageSimpleResponse.setList(thrProductsEntityList); + pageSimpleResponse.setList(listNew); return ResultVOUtils.success(pageSimpleResponse); } log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getProductType());