From 0fa0b1af9df9a9917e22f500298d74985ae70540 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 27 Nov 2024 10:36:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E5=B9=BC=E4=BB=A3=E7=A0=81=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java   | 9 ++++++---
 .../mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml   | 9 ++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
index 539d0ad..7b8ba43 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -1425,8 +1425,9 @@ public class CtqyyClient extends CommonHttpClient {
             udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType());
 
             // 拉取处方时，改成拉取v_ypzs_pres_info
-            IPage<VYpzsPresInfo> page = vYpzsPresInfoMapper.selectGroupedWithPagination(new Page<VYpzsPresInfo>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),
-                    udiwmsBasicSkPrescribeRequest);
+            IPage<VYpzsPresInfo> page = vYpzsPresInfoMapper
+                    .selectGroupedWithPagination(new Page<VYpzsPresInfo>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),
+                            udiwmsBasicSkPrescribeRequest);
 
             if (page.getTotal() == 0) {
                 PageSimpleResponse<IoCollectOrder> pageSimpleResponse = new PageSimpleResponse<>();
@@ -1757,10 +1758,12 @@ public class CtqyyClient extends CommonHttpClient {
                 //区分住院、门诊处方
                 if (IntUtil.value(presInfoEntity.getIN_HOSP()) == 1) {
                     ioCollectOrder.setBusType("YPCF003");
+                    ioCollectOrder.setBillNo(presInfoEntity.getSTOOUT_NO());
                 } else {
                     ioCollectOrder.setBusType("YPCF002");
+                    ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER());
                 }
-                ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER());
+
                 ioCollectOrder.setFromType("HIS系统");
                 ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID());
                 ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml
index 4177888..40a033e 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml
@@ -107,7 +107,14 @@
             </if>
         </where>
         GROUP BY
-            PRESCRIBE_NUMBER
+        <choose>
+            <when test="udiwmsBasicSkPrescribeRequest.IN_HOSP == '1'">
+                PRESCRIBE_NUMBER
+            </when>
+            <otherwise>
+                STOOUT_NO
+            </otherwise>
+        </choose>
         ORDER BY
             PRESCRIBE_NUMBER
     </select>