diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java index 98b6ad9..4354a3b 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java @@ -47,7 +47,7 @@ public class NursingOrderController extends BaseController { */ @MobileRequestAuthorization @GetMapping("/goodsOrder") - public TableDataInfo goodsOrder(AppletGoodsOrderVO goodsOrderVO) { + public TableDataInfo goodsOrder(@RequestBody AppletGoodsOrderVO goodsOrderVO) { startPage(); List goodsOrder = nursingOrderService.getGoodsOrder(goodsOrderVO); return getDataTable(goodsOrder); diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java index f2e1c78..5591be3 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java @@ -163,7 +163,7 @@ public class NursingOrderServiceImpl implements INursingOrderService { throw new ServiceException("获取微信小程序用户信息失败", 201); } PatientOrderVO resultHttp = JSON.parseObject(result, PatientOrderVO.class); - if (Objects.nonNull(resultHttp) && CollectionUtils.isNotEmpty(resultHttp.getData())) { + if (Objects.nonNull(resultHttp) && CollectionUtils.isNotEmpty(resultHttp.getData()) && Objects.nonNull(resultHttp.getData().get(0).getOrderNo())) { List data = resultHttp.getData(); data.forEach(item -> item.setOrderSource(OrderSourceEnum.FAMILY_DOCTOR.getInfo())); List orderEvaluate = nursingOrderMapper.getOrderEvaluateByPatientId(nurseOrder.getParentId()); @@ -182,8 +182,10 @@ public class NursingOrderServiceImpl implements INursingOrderService { patientOrders.addAll(data); } } - Collections.sort(patientOrders, Comparator.comparing(PatientOrder::getCreateTime, (u1, u2) -> u2.compareTo(u1))); - patientOrders = patientOrders.stream().skip((nurseOrder.getPageNum() - 1) * nurseOrder.getPageSize()).limit(nurseOrder.getPageSize()).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(patientOrders)) { + Collections.sort(patientOrders, Comparator.comparing(PatientOrder::getCreateTime, (u1, u2) -> u2.compareTo(u1))); + patientOrders = patientOrders.stream().skip((nurseOrder.getPageNum() - 1) * nurseOrder.getPageSize()).limit(nurseOrder.getPageSize()).collect(Collectors.toList()); + } return patientOrders; } } \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml index d2df7c9..fbea41b 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml @@ -155,6 +155,12 @@ and gr.order_type = #{orderType} + + gr.order_typ in + + #{orderTypeList} + + and gr.del_flag = 0 and god.del_flag = 0