From 0a88e8b1f968633add4371ff64693f36010da723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= <root>
Date: Wed, 18 Oct 2023 09:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/nursingorder/AppletGoodsOrderVO.java   |   5 +
 .../nursingorder/NusringOrderMapper.xml       | 109 ++++++++++--------
 2 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java
index 12b5735..33a6233 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java
@@ -7,6 +7,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -174,6 +175,10 @@ public class AppletGoodsOrderVO implements Serializable {
      */
     private String orderType;
 
+    /**
+     * 订单类型，积分兑换：INTEGRAL_EXCHANGE，直接购买：DIRECT_BUY，健康咨询：HEALTH_CONSULTATION
+     */
+    private List<String> orderTypeList;
 
     /**
      * 积分抵扣数量
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 b5b9772..d100995 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,9 @@
             <if test="orderType != null  and orderType != ''">
                 and gr.order_type = #{orderType}
             </if>
+            <if test="orderType = null  and orderType = ''">
+                and gr.order_type IN #{orderTypeList}
+            </if>
             and gr.del_flag = 0
             and god.del_flag = 0
         </where>
@@ -272,63 +275,67 @@
 
     <select id="getAppointmentOrderDetailsInfo" resultMap="getAppointmentDetailsResultMap">
 
-                SELECT pi.patient_name,
-                       pi.phone patientPhone,
-                       aor.id   appointmentOrderId,
-                       aor.patient_id,
-                       aor.order_no,
-                       aor.total_price,
-                       aor.order_status,
-                       aor.remark,
-                       aor.create_time,
-                       aor.order_type,
-                       aor.companion_start_date,
-                       aor.companion_end_date,
-                       aor.companion_days,
-                       aor.order_write_name,
-                       aod.nurse_station_item_id,
-                       aod.service_address,
-                       aod.service_date,
-                       aod.service_start_time,
-                       aod.service_end_time,
-                       aod.nurse_item_name,
-                       aod.nurse_item_price,
-                       aod.item_serve_duration_unit,
-                       aod.consumable_total_price,
-                       aoc.id,
-                       aoc.appoint_order_details_id,
-                       aoc.order_consumable_name,
-                       aoc.order_consumable_price,
-                       aoc.order_consumable_count,
-                       aoc.consumable_unit,
-                       aod.disabling_condition,
-                       aod.disabling_reason,
-                       aod.caregiver_name,
-                       aod.caregiver_phone,
-                       aod.hospital_name,
-                       aod.department_name,
-                       aod.hospital_bed_number
-                FROM appointment_order aor
-                         LEFT JOIN appointment_order_details aod ON aor.order_no = aod.order_no
-                         LEFT JOIN appointment_order_consumable aoc ON aod.id = aoc.appoint_order_details_id
-                         LEFT JOIN patient_info pi ON pi.id = aor.patient_id
-                where aor.order_no = #{ordeNo}
-                  AND aor.del_flag = 0
-                  and aod.del_flag = 0
+
+                        SELECT pi.patient_name,
+                               pi.phone patientPhone,
+                               aor.id   appointmentOrderId,
+                               aor.patient_id,
+                               aor.order_no,
+                               aor.total_price,
+                               aor.order_status,
+                               aor.remark,
+                               aor.create_time,
+                               aor.order_type,
+                               aor.companion_start_date,
+                               aor.companion_end_date,
+                               aor.companion_days,
+                               aor.order_write_name,
+                               aod.nurse_station_item_id,
+                               aod.service_address,
+                               aod.service_date,
+                               aod.service_start_time,
+                               aod.service_end_time,
+                               aod.nurse_item_name,
+                               aod.nurse_item_price,
+                               aod.item_serve_duration_unit,
+                               aod.consumable_total_price,
+                               aoc.id,
+                               aoc.appoint_order_details_id,
+                               aoc.order_consumable_name,
+                               aoc.order_consumable_price,
+                               aoc.order_consumable_count,
+                               aoc.consumable_unit,
+                               aod.disabling_condition,
+                               aod.disabling_reason,
+                               aod.caregiver_name,
+                               aod.caregiver_phone,
+                               aod.hospital_name,
+                               aod.department_name,
+                               aod.hospital_bed_number
+                        FROM appointment_order aor
+                                 LEFT JOIN appointment_order_details aod ON aor.order_no = aod.order_no
+                                 LEFT JOIN appointment_order_consumable aoc ON aod.id = aoc.appoint_order_details_id
+                                 LEFT JOIN patient_info pi ON pi.id = aor.patient_id
+                        where aor.order_no = #{ordeNo}
+                          AND aor.del_flag = 0
+                          and aod.del_flag = 0
+
 
     </select>
 
     <select id="getNurseStationByItemId"
             resultType="com.xinelu.applet.vo.specialdisease.AppointmentOrderDetailsInfoVO">
 
-                SELECT ns.nurse_station_name nurseStationName,
-                       ns.phone              stationPhone,
-                       ns.address,
-                       ns.station_picture_url,
-                       nsi.item_picture_url
-                FROM nurse_station_item nsi
-                         LEFT JOIN nurse_station ns ON nsi.nurse_station_id = ns.id
-                WHERE nsi.id = #{nurseStationItemId}
+
+                        SELECT ns.nurse_station_name nurseStationName,
+                               ns.phone              stationPhone,
+                               ns.address,
+                               ns.station_picture_url,
+                               nsi.item_picture_url
+                        FROM nurse_station_item nsi
+                                 LEFT JOIN nurse_station ns ON nsi.nurse_station_id = ns.id
+                        WHERE nsi.id = #{nurseStationItemId}
+
 
     </select>
 </mapper>
\ No newline at end of file