From a0bc860a06e1aa9eca7609bef0f0747776d8fb04 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 16 Apr 2021 14:33:46 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
index 94eff1b..8d94088 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
@@ -69,6 +69,9 @@
<if test="p.keyWord != null and p.keyWord !=''">
and hospital_name like concat('%', #{p.keyWord}, '%')
</if>
+ <if test="p.departmentId != null and p.departmentId !=''">
+ and department_id = #{p.departmentId}
+ </if>
</where>
</sql>
@@ -93,9 +96,17 @@
<select id="findByName" resultType="com.kidgrow.oprationcenter.model.HospitalScreening">
select id,
- hospital_name
+ hospital_name,
+ hospital_id
from hospital_screening
where is_del=0 and enabled=1 and hospital_name LIKE concat('%',#{hospitalName},'%')
order by hospital_name desc,id desc
</select>
+
+ <select id="findAll" resultType="com.kidgrow.oprationcenter.model.HospitalScreening">
+ select
+ <include refid="Column_List"/>
+ from hospital_screening
+ where is_del=0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0