From 2b73138bf9d424d04c11da86545189a99c928c24 Mon Sep 17 00:00:00 2001 From: yewj Date: Wed, 27 Nov 2024 15:47:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A6=87=E5=B9=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/client/hlfyyy/HlfyyyClient.java | 77 ++++++------ .../mipsdl/thirddao/hlfyyy/VA010Mapper.java | 1 + src/main/resources/application.yml | 3 + .../mapper/master/hlfyyy/VA010Mapper.xml | 114 ++++++++++-------- 4 files changed, 110 insertions(+), 85 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 6045b51..a05737f 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -72,6 +72,7 @@ import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -155,8 +156,6 @@ public class HlfyyyClient extends CommonHttpClient { private RelCodeDetailService relCodeDetailService; - - @Resource private VA001Service va001Service; @@ -273,17 +272,17 @@ public class HlfyyyClient extends CommonHttpClient { List nameList = new ArrayList(); List registerNoList = new ArrayList(); - if(list!=null && list.size() >0 ){ + if (list != null && list.size() > 0) { for (ThrProductsEntity thrProductsEntity : list) { - if(StringUtils.isNotEmpty(thrProductsEntity.getCode())){ + if (StringUtils.isNotEmpty(thrProductsEntity.getCode())) { codeList.add(thrProductsEntity.getCode()); } - if(StringUtils.isNotEmpty(thrProductsEntity.getName())){ + if (StringUtils.isNotEmpty(thrProductsEntity.getName())) { nameList.add(thrProductsEntity.getName()); } - if(StringUtils.isNotEmpty(thrProductsEntity.getRegisterNo())){ + if (StringUtils.isNotEmpty(thrProductsEntity.getRegisterNo())) { registerNoList.add(thrProductsEntity.getRegisterNo()); } @@ -292,15 +291,15 @@ public class HlfyyyClient extends CommonHttpClient { } LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); //补充其他查询条件 - wrapper.in(codeList!=null && codeList.size()>0, VA002::getCode,codeList); - wrapper.in(nameList!=null && nameList.size()>0, VA002::getName, nameList); - wrapper.in(registerNoList!=null && registerNoList.size()>0, VA002::getRegisterno, registerNoList); + wrapper.in(codeList != null && codeList.size() > 0, VA002::getCode, codeList); + wrapper.in(nameList != null && nameList.size() > 0, VA002::getName, nameList); + wrapper.in(registerNoList != null && registerNoList.size() > 0, VA002::getRegisterno, registerNoList); // 保留之前的查询方法怕有用到 wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VA002::getCode, udiwmsProductRequest.getCode()); wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), VA002::getName, udiwmsProductRequest.getName()); wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), VA002::getRegisterno, udiwmsProductRequest.getRegisterNo()); - wrapper.eq(VA002::getRemark,"Y"); + wrapper.eq(VA002::getRemark, "Y"); IPage page = va002Mapper.selectPage(new Page(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper); List physicDictEntities = page.getRecords(); List zzzyyProductsResponseList = null; @@ -309,7 +308,7 @@ public class HlfyyyClient extends CommonHttpClient { zzzyyProductsResponseList = physicDictEntities.stream().map(dict -> { ZzzyyProductsResponse products = new ZzzyyProductsResponse(); // BeanUtil.copyProperties(dict,products); - oracleCompatibleCopy(dict,products); + oracleCompatibleCopy(dict, products); products.setProductType(1); // products.setRegisterNo(dict.getRegisterno()); return products; @@ -325,17 +324,17 @@ public class HlfyyyClient extends CommonHttpClient { List nameList = new ArrayList(); List registerNoList = new ArrayList(); - if(list!=null && list.size() >0 ){ + if (list != null && list.size() > 0) { for (ThrProductsEntity thrProductsEntity : list) { - if(StringUtils.isNotEmpty(thrProductsEntity.getCode())){ + if (StringUtils.isNotEmpty(thrProductsEntity.getCode())) { codeList.add(thrProductsEntity.getCode()); } - if(StringUtils.isNotEmpty(thrProductsEntity.getName())){ + if (StringUtils.isNotEmpty(thrProductsEntity.getName())) { nameList.add(thrProductsEntity.getName()); } - if(StringUtils.isNotEmpty(thrProductsEntity.getRegisterNo())){ + if (StringUtils.isNotEmpty(thrProductsEntity.getRegisterNo())) { registerNoList.add(thrProductsEntity.getRegisterNo()); } @@ -344,15 +343,15 @@ public class HlfyyyClient extends CommonHttpClient { } LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); //补充其他查询条件 - wrapper.in(codeList!=null && codeList.size()>0, VA003::getCode,codeList); - wrapper.in(nameList!=null && nameList.size()>0, VA003::getName, nameList); - wrapper.in(registerNoList!=null && registerNoList.size()>0, VA003::getRegisterno, registerNoList); + wrapper.in(codeList != null && codeList.size() > 0, VA003::getCode, codeList); + wrapper.in(nameList != null && nameList.size() > 0, VA003::getName, nameList); + wrapper.in(registerNoList != null && registerNoList.size() > 0, VA003::getRegisterno, registerNoList); // 保留之前的查询方法怕有用到 wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VA003::getCode, udiwmsProductRequest.getCode()); wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), VA003::getName, udiwmsProductRequest.getName()); wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), VA003::getRegisterno, udiwmsProductRequest.getRegisterNo()); - wrapper.eq(VA003::getRemark,"Y"); + wrapper.eq(VA003::getRemark, "Y"); IPage page = va003Mapper.selectPage(new Page(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper); List physicDictEntities = page.getRecords(); List thrProductsEntityList = null; @@ -360,7 +359,7 @@ public class HlfyyyClient extends CommonHttpClient { //数据处理以thr_products 返回 thrProductsEntityList = physicDictEntities.stream().map(dict -> { ThrProductsEntity products = new ThrProductsEntity(); - oracleCompatibleCopy(dict,products); + oracleCompatibleCopy(dict, products); products.setSpec(dict.getBzgg()); products.setProductType(2); products.setRegisterNo(dict.getRegisterno()); @@ -754,7 +753,7 @@ public class HlfyyyClient 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) @@ -1143,7 +1142,8 @@ public class HlfyyyClient extends CommonHttpClient { udiwmsWarehouseRequest.setDatabaseProductName(getDataSourceType()); PageSimpleResponseNew pageSimpleResponseNew = va004Service.filterList(udiwmsWarehouseRequest); log.info("解析四川武平县医院返回仓库信息，返回结果：{}", pageSimpleResponseNew.getList()); - return ResultVOUtils.success(pageSimpleResponseNew); } + return ResultVOUtils.success(pageSimpleResponseNew); + } @Override public BaseResponse testConnect() { @@ -1446,7 +1446,8 @@ public class HlfyyyClient extends CommonHttpClient { return udiwmsPreInOrderRequest; } - + @Value("${DBTYPE}") + private String DBTYPE; /** * ------------------------------------------现场管理医保相关接口方法-------------------------------------------------------------- */ @@ -1459,8 +1460,8 @@ public class HlfyyyClient extends CommonHttpClient { @Override public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) { - udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType()); - IPage iPage = va010Service.getList(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),udiwmsBasicSkPrescribeRequest); + udiwmsBasicSkPrescribeRequest.setDatabaseProductName(DBTYPE); + IPage iPage = va010Service.getList(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); // List list = iPage.getRecords(); // PageInfo pageInfo = new PageInfo<>(list); // PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -1814,6 +1815,7 @@ public class HlfyyyClient extends CommonHttpClient { return ResultVOUtils.error(500, "下载失败!"); } } + public static List summarizeByCode(List bizList) { Map summarizedMap = new HashMap<>(); @@ -1904,7 +1906,6 @@ public class HlfyyyClient extends CommonHttpClient { } - public BaseResponse optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) { //摆药流水号 // String stoout_no = ioCollectOrder.getBackupOrderRemark1(); @@ -2161,16 +2162,16 @@ public class HlfyyyClient extends CommonHttpClient { @Override public BaseResponse getBuyType() { - Map buyTypeMap= new HashMap<>(); - buyTypeMap.put("buyType_3501",buyType_3501); - buyTypeMap.put("buyType_3502",buyType_3502); - buyTypeMap.put("buyType_3505",buyType_3505); - buyTypeMap.put("buyType_3506",buyType_3506); + Map buyTypeMap = new HashMap<>(); + buyTypeMap.put("buyType_3501", buyType_3501); + buyTypeMap.put("buyType_3502", buyType_3502); + buyTypeMap.put("buyType_3505", buyType_3505); + buyTypeMap.put("buyType_3506", buyType_3506); return ResultVOUtils.success(buyTypeMap); } - public void oracleCompatibleCopy(Object source, Object target) { + public void oracleCompatibleCopy(Object source, Object target) { try { Class sourceClass = source.getClass();//得到对象的Class Class targetClass = target.getClass();//得到对象的Class @@ -2178,24 +2179,24 @@ public class HlfyyyClient extends CommonHttpClient { Field[] sourceFields = sourceClass.getDeclaredFields();//得到Class对象的所有属性 Field[] targetFields = targetClass.getDeclaredFields();//得到Class对象的所有属性 - for(Field sourceField : sourceFields){ + for (Field sourceField : sourceFields) { sourceField.setAccessible(true); String name = sourceField.getName();//属性名 Class type = sourceField.getType();//属性类型 Object value = sourceField.get(source); - for(Field targetField : targetFields){ + for (Field targetField : targetFields) { targetField.setAccessible(true); String targetName = targetField.getName();//目标对象的属性名 - if(targetName.toLowerCase().equals(name.toLowerCase()) && !Objects.isNull(value)){ - targetField.set(target,value); + if (targetName.toLowerCase().equals(name.toLowerCase()) && !Objects.isNull(value)) { + targetField.set(target, value); } } } - }catch (Exception e){ - BeanUtil.copyProperties(source,target); + } catch (Exception e) { + BeanUtil.copyProperties(source, target); } diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010Mapper.java index e46e68e..052e8cf 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA010Mapper.java @@ -14,3 +14,4 @@ import org.apache.ibatis.annotations.Param; public interface VA010Mapper extends BaseMapper { IPage getList(Page page, @Param("req") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); } + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 56d884d..af37647 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -21,6 +21,7 @@ THIRD_NAME: thirdName #UDI管理系统地址 UDIWMS_IP: http://127.0.0.1:9991 +DBTYPE: Oracle #mybatis-plus配置 mybatis-plus: @@ -40,3 +41,5 @@ ok: write-timeout: 30000 max-idle-connections: 200 keep-alive-duration: 300 + + diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml index 83602c2..97c22b0 100644 --- a/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml @@ -17,57 +17,77 @@ - CODE, SICKCODE, SICKNAME, PRESCRIBEDATE, CREATEDR, AMOUNT, DEPTCODE, DEPTNAME, DIAGNOSIS, + CODE, + SICKCODE, + SICKNAME, + PRESCRIBEDATE, + CREATEDR, + AMOUNT, + DEPTCODE, + DEPTNAME, + DIAGNOSIS, REMARK +