From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 5c4c117..687de0e 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
@@ -136,6 +136,9 @@
<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>
@@ -164,7 +167,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)
</if>
</when>
<when test="inx==2">
@@ -183,7 +186,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
)
</if>
</when>
@@ -193,7 +196,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)
</if>
</when>
<when test="inx == 4">
@@ -202,8 +205,8 @@
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)
</if>
</when>
<when test="inx == 5">
@@ -212,7 +215,7 @@
hospitals.create_user_id = #{itemto.object}
</if>
<if test="!itemto.flag">
- or (hospitals.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)
</if>
</when>
<otherwise>
@@ -234,6 +237,7 @@
DEP.server_user_id,
DEP.org_id,
DEP.is_del,
+ DEP.is_pay,
DEP.enabled,
hospitals.*
FROM
--
Gitblit v1.8.0