From f14deee7baaf82e7aad6fc81a2509ba88e869afd Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 02 Nov 2020 15:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 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 7754ecb..6d4321c 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
@@ -130,11 +130,40 @@
<include refid="where"/>
order by id desc
</select>
+ <sql id="wherelist_last">
+ <if test="p.isScreen != null and p.isScreen !=''">
+ and is_screen = #{p.isScreen}
+ </if>
+ <if test="p.isPay != null and p.isPay !=''">
+ and is_pay = #{p.isPay}
+ </if>
+ <if test="p.isAnswer != null and p.isAnswer !=''">
+ and is_answer = #{p.isAnswer}
+ </if>
+ <if test="p.hospitalState != null and p.hospitalState !=''">
+ and hospital_state = #{p.hospitalState}
+ </if>
+ <if test="p.hospitalProvince != null and p.hospitalProvince !=''">
+ and hospital_province = #{p.hospitalProvince}
+ </if>
+ <if test="p.hospitalCity != null and p.hospitalCity !=''">
+ and hospital_city = #{p.hospitalCity}
+ </if>
+ <if test="p.hospitalArea != null and p.hospitalArea !=''">
+ and hospital_area = #{p.hospitalArea}
+ </if>
+ <if test="p.hospitalName != null and p.hospitalName !=''">
+ and hospital_name LIKE concat('%',#{p.hospitalName},'%')
+ </if>
+ </sql>
<sql id="whereList">
<where>
hosisdel = 0
<if test="p.isScreen != null and p.isScreen !=''">
and is_screen = #{p.isScreen}
+ </if>
+ <if test="p.isPay != null and p.isPay !=''">
+ and is_pay = #{p.isPay}
</if>
<if test="p.isAnswer != null and p.isAnswer !=''">
and is_answer = #{p.isAnswer}
@@ -164,7 +193,7 @@
<if test="itemto.flag">
</if>
<if test="!itemto.flag">
- or ( HOS.is_del = 0 and HOS.enabled=1)
+ or ( hospitals.hosisdel = 0 and hospitals.hosenabled=1 <include refid="wherelist_last"></include>)
</if>
</when>
<when test="inx==2">
@@ -183,7 +212,7 @@
index="">
create_user_org_code = #{itemtoto.orgCode}
</foreach>
- and HOS.is_del = 0 and HOS.enabled=1
+ and hospitals.hosisdel = 0 and hospitals.hosenabled=1 <include refid="wherelist_last"></include>
)
</if>
</when>
@@ -193,7 +222,7 @@
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)
+ or (create_user_org_code = #{itemto.object} and hospitals.hosisdel = 0 and hospitals.hosenabled=1 <include refid="wherelist_last"></include>)
</if>
</when>
<when test="inx == 4">
@@ -202,17 +231,17 @@
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)
+ or (create_user_org_code like '${itemto.object}%' and hospitals.hosisdel = 0 and
+ hospitals.hosenabled=1 <include refid="wherelist_last"></include>)
</if>
</when>
<when test="inx == 5">
<if test="itemto.flag">
AND
- HOS.create_user_id = #{itemto.object}
+ hospitals.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)
+ or (hospitals.create_user_id = #{itemto.object} and hospitals.hosisdel = 0 and hospitals.hosenabled=1 <include refid="wherelist_last"></include>)
</if>
</when>
<otherwise>
@@ -234,6 +263,7 @@
DEP.server_user_id,
DEP.org_id,
DEP.is_del,
+ DEP.is_pay,
DEP.enabled,
hospitals.*
FROM
@@ -258,7 +288,8 @@
HOS.create_time,
HOS.is_del hosisdel,
HOS.enabled hosenabled,
- ORG.id AS hosorgid
+ ORG.id AS hosorgid,
+ HOS.create_user_id
FROM
sys_hospital HOS
LEFT JOIN sys_organization ORG ON HOS.org_id = ORG.id and ORG.is_del=0
@@ -271,7 +302,7 @@
hospital_name
from sys_hospital
where is_del=0 and enabled=1 and hospital_name LIKE concat('%',#{hospitalName},'%')
- order by hospital_name desc
+ order by hospital_name desc,id desc
</select>
<select id="chartHospital" resultType="int" parameterType="int">
SELECT
--
Gitblit v1.8.0