From b94aaad4f29c39832b3e9b985956607b82067175 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 13 Aug 2020 09:16:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 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 429a1cd..cfda5fb 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
@@ -40,7 +40,7 @@
                 and templete_type = #{p.templeteType}
             </if>
             <if test="p.templeteTitle != null and p.templeteTitle !=''">
-                and templete_title  like '%${p.templeteTitle}%'
+                and templete_title like '%${p.templeteTitle}%'
             </if>
             <if test="p.templeteNote != null and p.templeteNote !=''">
                 and templete_note = #{p.templeteNote}
@@ -90,4 +90,35 @@
         <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
+	AND templete_type = #{p.templeteType}
+	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