From 2482ea82a6c8fb4f57462001a3722ad9db79f775 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Mon, 10 Aug 2020 19:23:52 +0800 Subject: [PATCH] 修改 bug 添加医生时,往用户表添加Nickname为医生姓名 --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 105 insertions(+), 8 deletions(-) diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml index af8c47a..7754ecb 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml +++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml @@ -132,8 +132,7 @@ </select> <sql id="whereList"> <where> - DEP.is_del = 0 - AND HOS.is_del = 0 + hosisdel = 0 <if test="p.isScreen != null and p.isScreen !=''"> and is_screen = #{p.isScreen} </if> @@ -155,7 +154,76 @@ <if test="p.hospitalName != null and p.hospitalName !=''"> and hospital_name LIKE concat('%',#{p.hospitalName},'%') </if> - <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"></include> + <if test="p.roleOrg != null and p.roleOrg.size>0"> + + <foreach item="item" collection="p.roleOrg" index=""> + <foreach item="itemto" collection="item" index="inx"> + + <choose> + <when test="inx == 1"> + <if test="itemto.flag"> + </if> + <if test="!itemto.flag"> + or ( HOS.is_del = 0 and HOS.enabled=1) + </if> + </when> + <when test="inx==2"> + <if test="itemto.flag"> + AND + <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" + close=")" + index=""> + create_user_org_code = #{itemtoto.orgCode} + </foreach> + </if> + <if test="!itemto.flag"> + or ( + <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" + close=")" + index=""> + create_user_org_code = #{itemtoto.orgCode} + </foreach> + and HOS.is_del = 0 and HOS.enabled=1 + ) + </if> + </when> + <when test="inx == 3"> + <if test="itemto.flag"> + AND + create_user_org_code = #{itemto.object} + </if> + <if test="!itemto.flag"> + or (create_user_org_code = #{itemto.object} and HOS.is_del = 0 and HOS.enabled=1) + </if> + </when> + <when test="inx == 4"> + <if test="itemto.flag"> + AND + create_user_org_code like '${itemto.object}%' + </if> + <if test="!itemto.flag"> + or (create_user_org_code like '${itemto.object}%' and HOS.is_del = 0 and + HOS.enabled=1) + </if> + </when> + <when test="inx == 5"> + <if test="itemto.flag"> + AND + HOS.create_user_id = #{itemto.object} + </if> + <if test="!itemto.flag"> + or (HOS.create_user_id = #{itemto.object} and HOS.is_del = 0 and HOS.enabled=1) + </if> + </when> + <otherwise> + AND id is null + </otherwise> + </choose> + + </foreach> + </foreach> + </if> + <!-- <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"></include>--> </where> </sql> <select id="findHospitalList" resultType="com.kidgrow.usercenter.vo.HospitalListVo"> @@ -167,6 +235,12 @@ DEP.org_id, DEP.is_del, DEP.enabled, + hospitals.* + FROM + sys_department DEP + LEFT JOIN sys_organization DEORG ON DEP.org_id = DEORG.id and DEP.is_del=0 + LEFT JOIN ( + SELECT HOS.id hospital_id, HOS.hospital_name, HOS.hospital_code, @@ -181,18 +255,41 @@ HOS.is_answer, HOS.tenant_id, HOS.area_code, - HOS.create_time + HOS.create_time, + HOS.is_del hosisdel, + HOS.enabled hosenabled, + ORG.id AS hosorgid FROM - sys_department DEP - LEFT JOIN sys_hospital HOS ON DEP.hospital_id = HOS.id + sys_hospital HOS + LEFT JOIN sys_organization ORG ON HOS.org_id = ORG.id and ORG.is_del=0 + ) AS hospitals ON DEORG.org_parent_id = hospitals.hosorgid <include refid="whereList"/> - order by create_time desc + order by create_time desc </select> <select id="findByName" resultType="com.kidgrow.usercenter.model.SysHospital"> select id, hospital_name from sys_hospital - where hospital_name LIKE concat('%',#{hospitalName},'%') + where is_del=0 and enabled=1 and hospital_name LIKE concat('%',#{hospitalName},'%') order by hospital_name desc </select> + <select id="chartHospital" resultType="int" parameterType="int"> + SELECT + count( DISTINCT hospital_name ) hospitalCount + FROM + sys_hospital + WHERE + <if test="datatype==0"> + hospital_state =0 + </if> + <if test="datatype==1"> + hospital_state =1 + </if> + <if test="datatype==11"> + is_screen =1 and + hospital_state =1 + </if> + AND is_del = 0 + AND enabled = 1; + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0