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 page = vYpzsPresInfoMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), - udiwmsBasicSkPrescribeRequest); + IPage page = vYpzsPresInfoMapper + .selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), + udiwmsBasicSkPrescribeRequest); if (page.getTotal() == 0) { PageSimpleResponse 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 @@ GROUP BY - PRESCRIBE_NUMBER + + + PRESCRIBE_NUMBER + + + STOOUT_NO + + ORDER BY PRESCRIBE_NUMBER