From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml | 121 ++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 42 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 2fa6267..dca1e77 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
@@ -12,78 +12,115 @@
<where>
<!--查询条件自行添加-->
is_del=0
- <if test="id != null and id !=''">
- and id = #{id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="hospitalId != null and hospitalId !=''">
- and hospital_id = #{hospitalId}
+ <if test="p.hospitalId != null and p.hospitalId !=''">
+ and hospital_id = #{p.hospitalId}
</if>
- <if test="hospitalName != null and hospitalName !=''">
- and hospital_name = #{hospitalName}
+ <if test="p.hospitalName != null and p.hospitalName !=''">
+ and hospital_name = #{p.hospitalName}
</if>
- <if test="departmentId != null and departmentId !=''">
- and department_id = #{departmentId}
+ <if test="p.departmentId != null and p.departmentId !=''">
+ and department_id = #{p.departmentId}
</if>
- <if test="departmentName != null and departmentName !=''">
- and department_name = #{departmentName}
+ <if test="p.departmentName != null and p.departmentName !=''">
+ and department_name = #{p.departmentName}
</if>
- <if test="doctorId != null and doctorId !=''">
- and doctor_id = #{doctorId}
+ <if test="p.doctorId != null and p.doctorId !=''">
+ and doctor_id = #{p.doctorId}
</if>
- <if test="doctorName != null and doctorName !=''">
- and doctor_name = #{doctorName}
+ <if test="p.doctorName != null and p.doctorName !=''">
+ and doctor_name = #{p.doctorName}
</if>
- <if test="publicType != null and publicType !=''">
- and public_type = #{publicType}
+ <if test="p.publicType != null and p.publicType !=''">
+ and public_type = #{p.publicType}
</if>
- <if test="templeteType != null and templeteType !=''">
- and templete_type = #{templeteType}
+ <if test="p.templeteType != null and p.templeteType !=''">
+ and templete_type = #{p.templeteType}
</if>
- <if test="templeteTitle != null and templeteTitle !=''">
- and templete_title = #{templeteTitle}
+ <if test="p.templeteTitle != null and p.templeteTitle !=''">
+ and templete_title like '%${p.templeteTitle}%'
</if>
- <if test="templeteNote != null and templeteNote !=''">
- and templete_note = #{templeteNote}
+ <if test="p.templeteNote != null and p.templeteNote !=''">
+ and templete_note = #{p.templeteNote}
</if>
- <if test="isDel != null and isDel !=''">
- and is_del = #{isDel}
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
</if>
- <if test="enabled != null and enabled !=''">
- and enabled = #{enabled}
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
</if>
- <if test="updateTime != null and updateTime !=''">
- and update_time = #{updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</if>
- <if test="createUserId != null and createUserId !=''">
- and create_user_id = #{createUserId}
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
</if>
- <if test="createUserName != null and createUserName !=''">
- and create_user_name = #{createUserName}
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
</if>
- <if test="updateUserId != null and updateUserId !=''">
- and update_user_id = #{updateUserId}
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
</if>
- <if test="updateUserName != null and updateUserName !=''">
- and update_user_name = #{updateUserName}
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
</if>
- <if test="createTime != null and createTime !=''">
- and create_time = #{createTime}
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
</if>
- </where>
+ </where>
</sql>
<!--定义根据-DoctorTemplete当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.DoctorTemplete">
- select <include refid="Column_List"/>
+ <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.DoctorTemplete">
+ select
+ <include refid="Column_List"/>
from doctor_templete
<include refid="where"/>
order by id desc
+ limit 1
</select>
<!--定义根据-DoctorTemplete当作查询条件返回对象集合-->
<select id="findList" resultType="com.kidgrow.oprationcenter.model.DoctorTemplete">
- select <include refid="Column_List"/>
+ select
+ <include refid="Column_List"/>
from doctor_templete
+ <include refid="where"/>
order by id desc
</select>
+ <select id="findDoctorList" resultType="com.kidgrow.oprationcenter.model.DoctorTemplete">
+ SELECT
+ id,
+ doctor_id,
+ doctor_name,
+ public_type,
+ templete_type,
+ templete_title,
+ templete_note,
+ create_time
+FROM
+ doctor_templete
+WHERE
+ is_del = 0
+ AND enabled = 1
+ <if test="p.templeteType!=null and p.templeteType!=''">
+ AND templete_type = #{p.templeteType}
+ </if>
+ AND((
+ hospital_id IS NULL
+ AND hospital_id IS NULL
+ 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
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0