From 7ca22bdf5f145af163f3a5ab6d85786c83e38f3e Mon Sep 17 00:00:00 2001 From: HaoWang <1477026787@qq.com> Date: Mon, 20 Nov 2023 15:16:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=AE=AF=E9=97=AE=E8=AF=8A=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=BF=94=E5=9B=9E=E6=82=A3=E8=80=85=E5=92=8C=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applet/vo/nursingorder/ConsultationGoodVO.java | 9 +++++++++ .../mapper/applet/nursingorder/NusringOrderMapper.xml | 10 ++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/ConsultationGoodVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/ConsultationGoodVO.java index fa3b1de..418dd42 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/ConsultationGoodVO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/ConsultationGoodVO.java @@ -44,6 +44,15 @@ public class ConsultationGoodVO implements Serializable { */ private BigDecimal totalPrice; + /** + * 医生名称 + */ + private String personName; + + /** + * 患者名称 + */ + private String patientName; /** * 科室人员头像地址 */ 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 344295c..03a4865 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 @@ -181,10 +181,11 @@ gr.total_price, gr.order_time, gr.order_status, - IF( gr.order_type = 'HEALTH_CONSULTATION', - (SELECT person_picture_url FROM hospital_person_info WHERE id =gr.hospital_person_id ), NULL ) personPictureUrl, - IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT person_phone FROM hospital_person_info WHERE id =gr.hospital_person_id ), NULL ) personPhone, - IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT academic_title FROM hospital_person_info WHERE id = gr.hospital_person_id ), NULL ) academicTitle, + pi.patient_name, + hpi.person_name, + hpi.person_picture_url , + hpi.person_phone , + hpi.academic_title, gr.hospital_person_name, ci.problem_description, ci.situation_description, @@ -197,6 +198,7 @@ goods_order gr LEFT JOIN hospital_person_info hpi on hpi.id = gr.hospital_person_id LEFT JOIN consultation_info ci ON ci.id =gr.consultation_info_id + LEFT JOIN patient_info pi on pi.id=gr.patient_id and gr.order_no = #{orderNo}