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 5c6309d..825ba77 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -151,8 +151,6 @@ public class HlfyyyClient extends CommonHttpClient { private RelCodeDetailService relCodeDetailService; - - @Resource private VA001Service va001Service; @@ -298,17 +296,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()); } @@ -317,15 +315,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; @@ -333,7 +331,7 @@ public class HlfyyyClient extends CommonHttpClient { //数据处理以thr_products 返回 thrProductsEntityList = physicDictEntities.stream().map(dict -> { ThrProductsEntity products = new ThrProductsEntity(); - BeanUtil.copyProperties(dict,products); + BeanUtil.copyProperties(dict, products); products.setSpec(dict.getBzgg()); products.setProductType(2); return products; @@ -726,7 +724,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) @@ -1430,7 +1428,7 @@ public class HlfyyyClient extends CommonHttpClient { 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); + IPage iPage = va010Service.getList(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); // List list = iPage.getRecords(); // PageInfo pageInfo = new PageInfo<>(list); // PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -1715,6 +1713,11 @@ public class HlfyyyClient extends CommonHttpClient { ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()); ioCollectOrder.setFromCorpName(item.getSickname()); ioCollectOrder.setShipperName(item.getDeptname()); + if (item.getRemark().equals("门诊")) { + ioCollectOrder.setBusType("YPCF002"); + } else { + ioCollectOrder.setBusType("YPCF003"); + } Date date = null; try { date = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").parse(item.getPrescribedate()); @@ -1778,6 +1781,7 @@ public class HlfyyyClient extends CommonHttpClient { return ResultVOUtils.error(500, "下载失败!"); } } + public static List summarizeByCode(List bizList) { Map summarizedMap = new HashMap<>(); @@ -1868,7 +1872,6 @@ public class HlfyyyClient extends CommonHttpClient { } - public BaseResponse optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) { //摆药流水号 // String stoout_no = ioCollectOrder.getBackupOrderRemark1(); @@ -2125,11 +2128,11 @@ 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); } }