From 320f1f5bad48085142d816c9cdb2ae43ed14dc3e Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 23 Dec 2024 15:46:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A6=87=E5=B9=BC=E7=94=A8?= =?UTF-8?q?=E5=8C=BB=E4=BF=9D=E7=BC=96=E7=A0=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/hlfyyy/HlfyyyClient.java | 16 +++++++++------- .../mipsdl/entity/inout/IoCollectOrderBiz.java | 5 +++++ 2 files changed, 14 insertions(+), 7 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 067204a..d3b5d54 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -770,7 +770,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) @@ -2304,14 +2304,16 @@ public class HlfyyyClient extends CommonHttpClient { IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); BeanUtils.copyProperties(entity, collectOrderBiz); - List basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getItemcode())); - if (CollUtil.isNotEmpty(basicUdirelEntities)) { - BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0); - collectOrderBiz.setRelId(basicUdirelEntity.getId()); - } else { +// List basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getItemcode())); +// if (CollUtil.isNotEmpty(basicUdirelEntities)) { +// BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0); +// collectOrderBiz.setRelId(basicUdirelEntity.getId()); +// } else { +// errorMsg.append(entity.getItemname()).append("字典未对照").append(";"); +// } + if (StrUtil.isEmpty(entity.getHiltstCode())) { errorMsg.append(entity.getItemname()).append("字典未对照").append(";"); } - collectOrderBiz.setGgxh(entity.getGgxh()); collectOrderBiz.setMeasureUnit(entity.getMeasureunit()); collectOrderBiz.setCount(IntUtil.value(entity.getMeasurecount())); diff --git a/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrderBiz.java b/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrderBiz.java index 5bb2a37..de2cc52 100644 --- a/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrderBiz.java +++ b/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrderBiz.java @@ -199,4 +199,9 @@ public class IoCollectOrderBiz implements Serializable { private static final long serialVersionUID = 1L; + + /** + * 组套编码/医保编码/术士套包编码 + */ + private String checkCode; }