患者信息列表新增销售信息和诊断医生信息

fs-service/src/main/java/com/fs/patient/domain/FsPatientBaseInfo.java

@@ -1,5 +1,6 @@
 package com.fs.patient.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
@@ -72,4 +73,10 @@ public class FsPatientBaseInfo extends BaseEntity{
 
     //医生诊断时间
     private Date diagnosisTime;
+
+    @TableField(exist = false)
+    private String doctorName;
+
+    @TableField(exist = false)
+    private String companyUserName;
 }

fs-service/src/main/resources/mapper/patient/FsPatientBaseInfoMapper.xml

@@ -28,7 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectFsPatientBaseInfoList" parameterType="FsPatientBaseInfo" resultMap="FsPatientBaseInfoResult">
-        <include refid="selectFsPatientBaseInfoVo"/>
+        select i.*, d.doctor_name, u.nick_name company_user_name from fs_patient_base_info i
+        LEFT JOIN fs_doctor d ON i.doctor_id = d.doctor_id
+        LEFT JOIN company_user u ON i.company_user_id = u.user_id
         <where>  
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="sex != null "> and sex = #{sex}</if>