From 46c8115ada66fdcd9633fa88e9d50153411785a8 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 27 Nov 2024 11:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/ctqyy/CtqyyClient.java   |  6 +++---
 .../mapper/other/ctqyy/VYpzsPresInfoMapper.xml  | 17 +++++++++--------
 2 files changed, 12 insertions(+), 11 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 dace1b8..2ceb652 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -1758,12 +1758,12 @@ public class CtqyyClient extends CommonHttpClient {
                 //区分住院、门诊处方
                 if (IntUtil.value(presInfoEntity.getIN_HOSP()) == 1) {
                     ioCollectOrder.setBusType("YPCF003");
-                    ioCollectOrder.setBillNo(presInfoEntity.getSTOOUT_NO());
+//                    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 d50ff48..8701401 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml
@@ -102,14 +102,15 @@
             </if>
         </where>
         GROUP BY
-        <choose>
-            <when test="udiwmsBasicSkPrescribeRequest.IN_HOSP == '1'">
-                PRESCRIBE_NUMBER
-            </when>
-            <otherwise>
-                STOOUT_NO
-            </otherwise>
-        </choose>
+            PRESCRIBE_NUMBER
+        <!--        <choose>-->
+        <!--            <when test="udiwmsBasicSkPrescribeRequest.IN_HOSP == '1'">-->
+        <!--                PRESCRIBE_NUMBER-->
+        <!--            </when>-->
+        <!--            <otherwise>-->
+        <!--                STOOUT_NO-->
+        <!--            </otherwise>-->
+        <!--        </choose>-->
         ORDER BY
             PRESCRIBE_NUMBER
     </select>