From efab482471f3e3ee330fd294d9f4a459eedf78fc Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 16 Apr 2021 14:33:18 +0800
Subject: [PATCH] Merge branch 'doctorTemplete' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
index dca1e77..5777053 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml
@@ -114,13 +114,24 @@
AND doctor_id IS NULL
)
OR (
- hospital_id =#{p.hospitalId}
- AND department_id =#{p.departmentId}
- AND (
- public_type = 0
- OR (
- doctor_id =#{p.doctorId} AND public_type = 1))))
- ORDER BY public_type DESC,id desc
+ hospital_id =#{p.hospitalId}
+ AND department_id =#{p.departmentId}
+ AND (
+
+ <if test="p.publicType==null or p.publicType==''">
+ public_type = 0 OR
+ </if>
+ (
+ doctor_id =#{p.doctorId}
+ <if test="p.publicType!=null and p.publicType!=''">
+ AND public_type = #{p.publicType}
+ </if>
+ <if test="p.templeteTitle !=null and p.templeteTitle!=''">
+ and templete_title like '%${p.templeteTitle}%'
+ </if>
+
+ ))))
+ ORDER BY public_type DESC,id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0