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 @@ GROUP BY - - - PRESCRIBE_NUMBER - - - STOOUT_NO - - + PRESCRIBE_NUMBER + + + + + + + + ORDER BY PRESCRIBE_NUMBER