From bf84a29a37ed9c454946956d4eb5d5a42a9831eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= <root>
Date: Fri, 20 Oct 2023 14:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/nursingorder/NursingOrderController.java   | 2 +-
 .../nursingorder/impl/NursingOrderServiceImpl.java        | 8 +++++---
 .../mapper/applet/nursingorder/NusringOrderMapper.xml     | 6 ++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

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<AppletGoodsOrderVO> 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<PatientOrder> data = resultHttp.getData();
             data.forEach(item -> item.setOrderSource(OrderSourceEnum.FAMILY_DOCTOR.getInfo()));
             List<PatientOrder> 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 @@
             <if test="orderType != null  and orderType != ''">
                 and gr.order_type = #{orderType}
             </if>
+            <if test="orderTypeList != null and orderTypeList != ''">
+                gr.order_typ in
+                <foreach collection="orderTypeList" item="orderTypeList" open="(" separator="," close=")">
+                    #{orderTypeList}
+                </foreach>
+            </if>
             and gr.del_flag = 0
             and god.del_flag = 0
         </where>