From 92449be9924b2b25bff4a38d5a0205dd65447689 Mon Sep 17 00:00:00 2001
From: gongzhenkun <1658878546@qq.com>
Date: Tue, 15 Nov 2022 11:13:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=88=97=E8=A1=A8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=8C=BB=E9=99=A2=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/resp/PcTDoctorQueryByPageResp.java | 12 +++++
 .../resources/mapper/system/TDoctorMapper.xml | 47 ++++++++++---------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java
index c98764c..6d1a329 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java
@@ -76,6 +76,10 @@ public class PcTDoctorQueryByPageResp {
     @ApiModelProperty("医院id")
     private Long hospitalId;
 
+    /** 医院 */
+    @ApiModelProperty("医院名称")
+    private String hospitalName;
+
     /** 删除标志（0代表存在 2代表删除） */
     @ApiModelProperty("删除标志（0代表存在 2代表删除） ")
     private String delFlag;
@@ -105,6 +109,14 @@ public class PcTDoctorQueryByPageResp {
     @Excel(name = "诊断次数")
     private int countRecords;
 
+    public String getHospitalName() {
+        return hospitalName;
+    }
+
+    public void setHospitalName(String hospitalName) {
+        this.hospitalName = hospitalName;
+    }
+
     public int getCountRecords() {
         return countRecords;
     }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml
index 57c9816..7e74392 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml
@@ -147,30 +147,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="queryByPage" resultType="com.ruoyi.system.domain.resp.PcTDoctorQueryByPageResp">
-        select
-        id,
-        user_id as userId,
-        identifier,
-        name,
-        phone,
-        sex,
-        age,
-        marriage,
-        title,
-        speciality,
-        introduction,
-        medical_license as medicalLicense,
-        medical_license2 as medicalLicense2,
-        qr_code as qrCode,
-        del_flag as delFlag,
-        hospital_id as hospitalId,
-        create_time as createTime,
-        update_time as updateTime
-        from
-        t_doctor
+        SELECT
+            td.id,
+            td.user_id AS userId,
+            td.identifier,
+            td.NAME,
+            td.phone,
+            td.sex,
+            td.age,
+            td.marriage,
+            td.title,
+            td.speciality,
+            td.introduction,
+            td.medical_license AS medicalLicense,
+            td.medical_license2 AS medicalLicense2,
+            qr_code AS qrCode,
+            del_flag AS delFlag,
+            td.hospital_id AS hospitalId,
+            th.`name` AS hospitalName,
+            create_time AS createTime,
+            update_time AS updateTime
+        FROM
+            t_doctor td
+            LEFT JOIN t_hospital th ON td.hospital_id = th.id
         <where>
             <if test="startTime != null and endTime != null">
-                AND create_time between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') and DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s')
+                AND create_time between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') and
+                DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="name != null and name != ''">
                 AND name like concat('%', #{name}, '%')