Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/THospitalController.java

@@ -37,7 +37,6 @@ public class THospitalController extends BaseController
     /**
      * 查询医院信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:hospital:list')")
     @GetMapping("/list")
     public TableDataInfo list(THospital tHospital)
     {
@@ -49,7 +48,6 @@ public class THospitalController extends BaseController
     /**
      * 导出医院信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:hospital:export')")
     @Log(title = "医院信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, THospital tHospital)
@@ -62,7 +60,6 @@ public class THospitalController extends BaseController
     /**
      * 获取医院信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:hospital:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +69,6 @@ public class THospitalController extends BaseController
     /**
      * 新增医院信息
      */
-    @PreAuthorize("@ss.hasPermi('system:hospital:add')")
     @Log(title = "医院信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody THospital tHospital)
@@ -83,7 +79,6 @@ public class THospitalController extends BaseController
     /**
      * 修改医院信息
      */
-    @PreAuthorize("@ss.hasPermi('system:hospital:edit')")
     @Log(title = "医院信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody THospital tHospital)
@@ -94,7 +89,6 @@ public class THospitalController extends BaseController
     /**
      * 删除医院信息
      */
-    @PreAuthorize("@ss.hasPermi('system:hospital:remove')")
     @Log(title = "医院信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 医生信息对象 t_doctor
  * 
  * @author ruoyi
- * @date 2022-08-03
+ * @date 2022-08-04
  */
 public class TDoctor extends BaseEntity
 {
@@ -66,6 +66,10 @@ public class TDoctor extends BaseEntity
     @Excel(name = "职业医师照片路径")
     private String medicalLicense;
 
+    /** 二维码base64 */
+    @Excel(name = "二维码base64")
+    private String qrCode;
+
     /** 医院 */
     @Excel(name = "医院")
     private Long hospitalId;
@@ -190,6 +194,15 @@ public class TDoctor extends BaseEntity
     {
         return medicalLicense;
     }
+    public void setQrCode(String qrCode) 
+    {
+        this.qrCode = qrCode;
+    }
+
+    public String getQrCode() 
+    {
+        return qrCode;
+    }
     public void setHospitalId(Long hospitalId) 
     {
         this.hospitalId = hospitalId;
@@ -225,6 +238,7 @@ public class TDoctor extends BaseEntity
             .append("speciality", getSpeciality())
             .append("introduction", getIntroduction())
             .append("medicalLicense", getMedicalLicense())
+            .append("qrCode", getQrCode())
             .append("hospitalId", getHospitalId())
             .append("delFlag", getDelFlag())
             .append("createTime", getCreateTime())

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="qrCode"    column="qr_code"    />
         <result property="hospitalId"    column="hospital_id"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createTime"    column="create_time"    />
@@ -25,7 +26,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, 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, qr_code, hospital_id, del_flag, create_time, update_time from t_doctor
     </sql>
 
     <select id="selectTDoctorList" parameterType="TDoctor" resultMap="TDoctorResult">
@@ -43,6 +44,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="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
             <if test="hospitalId != null "> and hospital_id = #{hospitalId}</if>
         </where>
     </select>
@@ -67,6 +69,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="qrCode != null">qr_code,</if>
             <if test="hospitalId != null">hospital_id,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createTime != null">create_time,</if>
@@ -85,6 +88,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="qrCode != null">#{qrCode},</if>
             <if test="hospitalId != null">#{hospitalId},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -107,6 +111,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="qrCode != null">qr_code = #{qrCode},</if>
             <if test="hospitalId != null">hospital_id = #{hospitalId},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createTime != null">create_time = #{createTime},</if>