From ecea8849ad29ccc204d4994f6eeef5cd5064d0cc Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 14 Aug 2020 14:03:33 +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 | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 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..6cefc57 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,9 +99,10 @@
</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.id doctor_Id,
sysdoctor.doctor_ccie,
sysdoctor.doctor_tel,
sysdoctor.doctor_rank,
@@ -114,6 +115,7 @@
sysdoctor.enabled docenabled,
sysdoctor.is_del docdel,
+ syshos.id hospital_id,
syshos.hospital_name,
syshos.hospital_short_name,
syshos.hospital_type_name,
@@ -127,18 +129,18 @@
syshos.hospital_logo,
syshos.is_screen hosisscreen,
syshos.is_answer hosisanswer,
- syshos.accounts_count,
syshos.hospital_state,
syshos.enabled hosenabled,
syshos.is_del hosdel,
- syshos.accounts_count,
+ sysdep.id department_id,
sysdep.department_name,
sysdep.server_user_name,
sysdep.server_user_tel,
sysdep.sale_user_name,
sysdep.sale_user_tel,
sysdep.enabled depenabled,
+ sysdep.accounts_count,
sysdep.is_del depdel
FROM sys_user sysuser
left JOIN sys_doctor sysdoctor on sysuser.id=sysdoctor.user_id
@@ -146,4 +148,56 @@
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.default_auth,
+ us.enabled,
+ roleuser.role_id,
+ dc.is_del
+ FROM
+ sys_doctor dc
+ LEFT JOIN sys_user us ON dc.user_id = us.id
+ LEFT JOIN sys_role_user roleuser
+ ON roleuser.user_id=us.id
+ where dc.is_del=0 and dc.enabled=1 and us.enabled=1
+ and dc.hospital_id=#{hospitalId} and dc.department_id=#{departmentId} and (role_id=#{roleId1} or role_id=#{roleId2})
+ </select>
+ <select id="hospitalDoctorListAndDel" 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.default_auth,
+ us.enabled,
+ roleuser.role_id,
+ dc.is_del
+ FROM
+ sys_doctor dc
+ LEFT JOIN sys_user us ON dc.user_id = us.id
+ LEFT JOIN sys_role_user roleuser
+ ON roleuser.user_id=us.id
+ where dc.enabled=1 and us.enabled=1
+ and dc.hospital_id=#{hospitalId} and dc.department_id=#{departmentId} and (role_id=#{roleId1} or role_id=#{roleId2})
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0