医生完善信息接口新增字段

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -183,6 +183,8 @@ public class SysLoginService
                 tDoctor.setName(req.getName());
                 tDoctor.setSpeciality(req.getSpeciality());
                 tDoctor.setMedicalLicense(req.getMedicalLicense());
+                tDoctor.setMedicalLicense2(req.getMedicalLicense2());
+                tDoctor.setTitle(req.getTitle());
                 tDoctor.setUserId(sysUser.getUserId());
                 tDoctorMapper.updateTDoctor(tDoctor);
             }
@@ -197,6 +199,8 @@ public class SysLoginService
             tDoctor.setName(req.getName());
             tDoctor.setSpeciality(req.getSpeciality());
             tDoctor.setMedicalLicense(req.getMedicalLicense());
+            tDoctor.setTitle(req.getTitle());
+            tDoctor.setMedicalLicense2(req.getMedicalLicense2());
             tDoctor.setUserId(sysUser.getUserId());
             tDoctorMapper.insertTDoctor(tDoctor);
             Long identifier = 10000000L + tDoctor.getId();

ruoyi-system/src/main/java/com/ruoyi/system/domain/TDoctor.java

@@ -66,6 +66,9 @@ public class TDoctor extends BaseEntity
     @Excel(name = "职业医师照片路径")
     private String medicalLicense;
 
+    @Excel(name = "职业医师照片路径2")
+    private String medicalLicense2;
+
     /** 二维码base64 */
     @Excel(name = "二维码base64")
     private String qrCode;
@@ -222,6 +225,14 @@ public class TDoctor extends BaseEntity
         return delFlag;
     }
 
+    public String getMedicalLicense2() {
+        return medicalLicense2;
+    }
+
+    public void setMedicalLicense2(String medicalLicense2) {
+        this.medicalLicense2 = medicalLicense2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -238,6 +249,7 @@ public class TDoctor extends BaseEntity
             .append("speciality", getSpeciality())
             .append("introduction", getIntroduction())
             .append("medicalLicense", getMedicalLicense())
+            .append("medicalLicense2", getMedicalLicense2())
             .append("qrCode", getQrCode())
             .append("hospitalId", getHospitalId())
             .append("delFlag", getDelFlag())

ruoyi-system/src/main/java/com/ruoyi/system/domain/req/AppRegisterReq.java

@@ -32,6 +32,26 @@ public class AppRegisterReq implements Serializable {
      */
     private String medicalLicense;
 
+    private String medicalLicense2;
+
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMedicalLicense2() {
+        return medicalLicense2;
+    }
+
+    public void setMedicalLicense2(String medicalLicense2) {
+        this.medicalLicense2 = medicalLicense2;
+    }
+
     public String getName() {
         return name;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/AppDoctorResp.java

@@ -86,6 +86,9 @@ public class AppDoctorResp implements Serializable {
     @ApiModelProperty("职业医师照片路径")
     private String medicalLicense;
 
+    @ApiModelProperty("职业医师照片路径2")
+    private String medicalLicense2;
+
     /**
      * 二维码base64
      */
@@ -223,4 +226,12 @@ public class AppDoctorResp implements Serializable {
     public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
+
+    public String getMedicalLicense2() {
+        return medicalLicense2;
+    }
+
+    public void setMedicalLicense2(String medicalLicense2) {
+        this.medicalLicense2 = medicalLicense2;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/PcTDoctorQueryByPageResp.java

@@ -65,6 +65,9 @@ public class PcTDoctorQueryByPageResp {
     @ApiModelProperty("职业医师照片路径base64")
     private String medicalLicense;
 
+    @ApiModelProperty("职业医师照片路径base64")
+    private String medicalLicense2;
+
     /** 二维码base64 */
     @ApiModelProperty("二维码base64")
     private String qrCode;
@@ -262,6 +265,14 @@ public class PcTDoctorQueryByPageResp {
         this.delFlag = delFlag;
     }
 
+    public String getMedicalLicense2() {
+        return medicalLicense2;
+    }
+
+    public void setMedicalLicense2(String medicalLicense2) {
+        this.medicalLicense2 = medicalLicense2;
+    }
+
     @Override
     public String toString() {
         return "PcTDoctorQueryByPageResp{" +
@@ -277,6 +288,7 @@ public class PcTDoctorQueryByPageResp {
                 ", speciality='" + speciality + '\'' +
                 ", introduction='" + introduction + '\'' +
                 ", medicalLicense='" + medicalLicense + '\'' +
+                ", medicalLicense2='" + medicalLicense2 + '\'' +
                 ", qrCode='" + qrCode + '\'' +
                 ", hospitalId=" + hospitalId +
                 ", delFlag='" + delFlag + '\'' +

ruoyi-system/src/main/resources/mapper/system/TDoctorMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="speciality"    column="speciality"    />
         <result property="introduction"    column="introduction"    />
         <result property="medicalLicense"    column="medical_license"    />
+        <result property="medicalLicense2"    column="medical_license2"    />
         <result property="qrCode"    column="qr_code"    />
         <result property="hospitalId"    column="hospital_id"    />
         <result property="delFlag"    column="del_flag"    />
@@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTDoctorVo">
-        select id, open_id, user_id, identifier, name, phone, sex, age, marriage, title, speciality, introduction, medical_license, qr_code, hospital_id, del_flag, create_time, update_time from t_doctor
+        select id, open_id, user_id, identifier, name, phone, sex, age, marriage, title, speciality, introduction, medical_license , medical_license2, qr_code, hospital_id, del_flag, create_time, update_time from t_doctor
     </sql>
 
     <select id="selectTDoctorList" parameterType="TDoctor" resultMap="TDoctorResult">
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speciality != null  and speciality != ''"> and speciality = #{speciality}</if>
             <if test="introduction != null  and introduction != ''"> and introduction = #{introduction}</if>
             <if test="medicalLicense != null  and medicalLicense != ''"> and medical_license = #{medicalLicense}</if>
+            <if test="medicalLicense2 != null  and medicalLicense2 != ''"> and medical_license2 = #{medicalLicense2}</if>
             <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
             <if test="hospitalId != null "> and hospital_id = #{hospitalId}</if>
         </where>
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speciality != null">speciality,</if>
             <if test="introduction != null">introduction,</if>
             <if test="medicalLicense != null">medical_license,</if>
+            <if test="medicalLicense2 != null">medical_license2,</if>
             <if test="qrCode != null">qr_code,</if>
             <if test="hospitalId != null">hospital_id,</if>
             <if test="delFlag != null">del_flag,</if>
@@ -98,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speciality != null">#{speciality},</if>
             <if test="introduction != null">#{introduction},</if>
             <if test="medicalLicense != null">#{medicalLicense},</if>
+            <if test="medicalLicense2 != null">#{medicalLicense2},</if>
             <if test="qrCode != null">#{qrCode},</if>
             <if test="hospitalId != null">#{hospitalId},</if>
             <if test="delFlag != null">#{delFlag},</if>
@@ -121,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speciality != null">speciality = #{speciality},</if>
             <if test="introduction != null">introduction = #{introduction},</if>
             <if test="medicalLicense != null">medical_license = #{medicalLicense},</if>
+            <if test="medicalLicense2 != null">medical_license = #{medicalLicense2},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
             <if test="hospitalId != null">hospital_id = #{hospitalId},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
@@ -155,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         speciality,
         introduction,
         medical_license as medicalLicense,
+        medical_license2 as medicalLicense2,
         qr_code as qrCode,
         del_flag as delFlag,
         hospital_id as hospitalId,
@@ -202,6 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             speciality,
             introduction,
             medical_license AS medicalLicense,
+            medical_license2 AS medicalLicense2,
             qr_code AS qrCode,
             hospital_id AS hospitalId
         FROM