From 8b826fedb50414cb1b3a3ae533c64ac289b0d087 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Wed, 27 Nov 2024 09:45:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A6=87=E5=B9=BC=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=20=E7=AC=AC=E4=B8=89=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java    | 3 ++-
 .../resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml  | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

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 838f540..6045b51 100644
--- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
@@ -1726,6 +1726,7 @@ public class HlfyyyClient extends CommonHttpClient {
             List<String> codefks = headList.stream().map(VA010::getCode).collect(Collectors.toList());
             LambdaQueryWrapper<VA010Mx> wrapper1 = new LambdaQueryWrapper<>();
             wrapper1.in(VA010Mx::getCodefk, codefks);
+
             List<VA010Mx> a010details = va010MxMapper.selectList(wrapper1);
             Map<String, List<VA010Mx>> detailsMap = new HashMap<>();
             if (CollUtil.isNotEmpty(a010details)) {
@@ -1759,7 +1760,7 @@ public class HlfyyyClient extends CommonHttpClient {
                 ioCollectOrder.setBillTime(date);
                 ioCollectOrder.setCreateTime(new Date());
                 ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
-                ioCollectOrder.setBusType(udiwmsBasicSkPrescribeRequest.getBusType());
+//                ioCollectOrder.setBusType(udiwmsBasicSkPrescribeRequest.getBusType());
                 ioCollectOrder.setBackupOrderRemark1(item.getCode());
 
 //                    ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID());
diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml
index a8fdf07..83602c2 100644
--- a/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml
+++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml
@@ -25,6 +25,12 @@
         <include refid="Base_Column_List">
         </include>
         from v_a010 WHERE 1=1
+            <if test="req.busType == 'YPCF002'">
+                AND REMARK ='门诊'
+            </if>
+             <if test="req.busType != 'YPCF002'">
+                 AND REMARK !='门诊'
+            </if>
             <if  test="req.databaseProductName == 'MySQL'">
                 <if test="req.startTime != '' and req.startTime != null and req.endTime != '' and req.endTime != null">
                     AND STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s')  >= #{req.startTime} AND  STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') &lt; #{req.endTime}