From ae67d616719e9a7d9691906e941f53155816b88a Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Wed, 1 Nov 2023 09:17:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=93=E5=AE=B6?=
 =?UTF-8?q?=E5=92=A8=E8=AF=A2=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applet/vo/nursingorder/AppletGoodsOrderVO.java     | 10 ++++++++++
 .../mapper/applet/nursingorder/NusringOrderMapper.xml  |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

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 33a6233..8218f2d 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
@@ -251,4 +251,14 @@ public class AppletGoodsOrderVO implements Serializable {
      * 科室人员头像地址
      */
     private String personPictureUrl;
+
+    /**
+     * 科室人员联系电话
+     */
+    private String personPhone;
+
+    /**
+     * 人员职称，主任医师：CHIEF_PHYSICIAN，副主任医师：DEPUTY_CHIEF_PHYSICIAN，主治医师：ATTENDING_DOCTOR，医师：PHYSICIAN，医士：HEALER，住院医师：RESIDENT_PHYSICIAN
+     */
+    private String academicTitle;
 }
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 5dac6e9..b463b16 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
@@ -107,6 +107,7 @@
         gr.hospital_person_id,
         gr.health_consultation_content,
         gr.health_appoint_date,
+        gr.remark,
         god.integral_deduction_count,
         god.id goodsOrderDetailsId,
         god.order_no godOrderNo,
@@ -130,6 +131,10 @@
         (select rf.success_time from refund_info rf where rf.order_no = gr.order_no) update_time,
         IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT person_picture_url FROM hospital_person_info WHERE id =
         gr.hospital_person_id ), NULL ) person_picture_url,
+        IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT person_phone FROM hospital_person_info WHERE id =
+        gr.hospital_person_id ), NULL ) person_phone,
+        IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT academic_title FROM hospital_person_info WHERE id =
+        gr.hospital_person_id ), NULL ) academic_title,
         gr.hospital_person_name
         FROM
         goods_order gr
@@ -384,7 +389,7 @@
             LEFT JOIN hospital_person_info hpi ON hpi.id = gor.hospital_person_id
             LEFT JOIN order_evaluate_info nei ON nei.order_no = gor.order_no
         where
-        <if test="orderTypeList != null and orderTypeList.size > 0">
+        <if test="orderStatusList != null and orderStatusList.size > 0">
             gor.order_status in
             <foreach collection="orderStatusList" item="orderStatusList" open="(" separator="," close=")">
                 #{orderStatusList}