代码还原

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());

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>