From b47352c072e8088d2bd29a4933c546f130d0143c Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Wed, 17 Jun 2020 18:26:14 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml index 6616183..a6664dd 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml @@ -99,7 +99,7 @@ </if> </select> - <select id="findDoctorUserAllData" resultType="com.kidgrow.common.model.DoctorUserAll"> + <select id="findDoctorUserAllData" parameterType="long" resultType="com.kidgrow.common.model.DoctorUserAll"> SELECT sysuser.id, sysdoctor.doctor_name, sysdoctor.doctor_ccie, @@ -114,6 +114,7 @@ sysdoctor.enabled docenabled, sysdoctor.is_del docdel, + syshos.id hospital_id, syshos.hospital_name, syshos.hospital_short_name, syshos.hospital_type_name, @@ -133,6 +134,7 @@ syshos.is_del hosdel, syshos.accounts_count, + sysdep.id department_id, sysdep.department_name, sysdep.server_user_name, sysdep.server_user_tel, @@ -146,4 +148,25 @@ left JOIN sys_department sysdep on sysdoctor.department_id=sysdep.id where sysuser.id=#{userId} </select> + <select id="hospitalDoctorList" parameterType="long" resultType="com.kidgrow.usercenter.vo.HospitalDoctorListVo"> + SELECT + dc.create_time, + dc.department_name, + dc.hospital_name, + dc.doctor_name, + dc.doctor_rank, + dc.doctor_tel, + dc.id, + dc.user_id, + dc.is_admin_user, + dc.doctor_state, + us.mobile, + us.username, + us.is_default_auth, + us.enabled + FROM + sys_doctor dc + LEFT JOIN sys_user us ON dc.user_id = us.id + where dc.is_del=0 and dc.hospital_id=#{hospitalId} and dc.department_id=#{departmentId} + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0