From 100e6c0106c19b422cddb59ed07824f2c5349137 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 23 Dec 2024 20:48:56 +0800
Subject: [PATCH] =?UTF-8?q?12/23=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java | 9 +++------
1 file changed, 3 insertions(+), 6 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 d3b5d54..456b0bd 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)
@@ -2274,11 +2274,7 @@ 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");
- }
+ ioCollectOrder.setBusType("QXCF001");
Date date = null;
try {
date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(item.getPrescribedate());
@@ -2318,6 +2314,7 @@ public class HlfyyyClient extends CommonHttpClient {
collectOrderBiz.setMeasureUnit(entity.getMeasureunit());
collectOrderBiz.setCount(IntUtil.value(entity.getMeasurecount()));
collectOrderBiz.setYbbm(entity.getHiltstCode());
+ collectOrderBiz.setCheckCode(entity.getHiltstCode());
collectOrderBiz.setThrCode(entity.getHiltstCode());
collectOrderBiz.setCpmctymc(entity.getItemname());
collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());