diff --git a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java index 838f540..6045b51 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -1726,6 +1726,7 @@ public class HlfyyyClient extends CommonHttpClient { List codefks = headList.stream().map(VA010::getCode).collect(Collectors.toList()); LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.in(VA010Mx::getCodefk, codefks); + List a010details = va010MxMapper.selectList(wrapper1); Map> detailsMap = new HashMap<>(); if (CollUtil.isNotEmpty(a010details)) { @@ -1759,7 +1760,7 @@ public class HlfyyyClient extends CommonHttpClient { ioCollectOrder.setBillTime(date); ioCollectOrder.setCreateTime(new Date()); ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser()); - ioCollectOrder.setBusType(udiwmsBasicSkPrescribeRequest.getBusType()); +// ioCollectOrder.setBusType(udiwmsBasicSkPrescribeRequest.getBusType()); ioCollectOrder.setBackupOrderRemark1(item.getCode()); // ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID()); diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml index a8fdf07..83602c2 100644 --- a/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml @@ -25,6 +25,12 @@ from v_a010 WHERE 1=1 + + AND REMARK ='门诊' + + + AND REMARK !='门诊' + AND STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') >= #{req.startTime} AND STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') < #{req.endTime}