From 0dccef48a4863754bd6080511bdf9372c0004d78 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 19 四月 2024 11:05:55 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 96 ++++++++++++++++++++++++++++++-----------------
1 files changed, 61 insertions(+), 35 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 4bf4eaa..d3b775d 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -269,8 +269,8 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
- b.tagid as tagid,
+ -- c.tagname as tag,
+ -- b.tagid as tagid,
a.patid,
a.name,
d.deptname,
@@ -298,22 +298,30 @@
a.isupload,
a.upload_time,
a.pattype,
- d.bedno
- from pat_archive a,pat_archivetag b ,base_tag c,pat_med_inhosp d
+ d.bed_no
+ -- from pat_archive a,pat_archivetag b ,base_tag c,pat_med_inhosp d
+ from pat_archive a,pat_med_inhosp d
<where>
- a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ -- a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ a.patid = d.patid
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
<if test="pid != null and pid != ''">and a.patid = #{pid}</if>
<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
- <if test="tagIds != null and tagIds != ''">and c.tagid in
- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
- #{tagId}
- </foreach>
- </if>
+ <!-- <if test="tagIds != null and tagIds != ''">and c.tagid in-->
+ <!-- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">-->
+ <!-- #{tagId}-->
+ <!-- </foreach>-->
+ <!-- </if>-->
<if test="hospitalname != null and hospitalname != ''">
AND d.hospitalname = #{hospitalname}
+ </if>
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
+ AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
+ </if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">
+ AND d.leaveicd10code LIKE concat('%',#{leaveicd10code}, '%')
</if>
<if test="endtime != null">
AND d.endtime = #{endtime}
@@ -327,10 +335,16 @@
<if test="drname != null and drname != ''">
AND d.drname LIKE concat('%',#{drname}, '%')
</if>
+ <if test="diagname != null and diagname != ''">
+ AND d.diagname LIKE concat('%',#{diagname}, '%')
+ </if>
+ <if test="deptname != null and deptname != ''">
+ AND d.deptname LIKE concat('%',#{deptname}, '%')
+ </if>
AND d.del_flag != 1
- AND b.del_flag != 1
- AND c.del_flag != 1
+ -- AND b.del_flag != 1
+ -- AND c.del_flag != 1
AND a.del_flag != 1
</where>
</select>
@@ -339,8 +353,8 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
- b.tagid as tagid,
+ -- c.tagname as tag,
+ -- b.tagid as tagid,
a.patid,
d.deptname,
a.name,
@@ -368,19 +382,25 @@
a.isupload,
a.upload_time,
a.pattype
- from pat_archive a,pat_archivetag b ,base_tag c, pat_med_outhosp d
+ -- from pat_archive a,pat_archivetag b ,base_tag c, pat_med_outhosp d
+ from pat_archive a, pat_med_outhosp d
<where>
- a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ a.patid = d.patid
<if test="pid != null and pid != ''">and a.patid = #{pid}</if>
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
- <if test="tagIds != null and tagIds != ''">and c.tagid in
- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
- #{tagId}
- </foreach>
+ <!-- <if test="tagIds != null and tagIds != ''">and c.tagid in-->
+ <!-- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">-->
+ <!-- #{tagId}-->
+ <!-- </foreach>-->
+ <!-- </if>-->
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
+ AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
</if>
-
+ <if test="diagname != null and diagname != ''">
+ AND d.diagname LIKE concat('%',#{diagname}, '%')
+ </if>
<if test="hospitalname != null and hospitalname != ''">
AND d.hospitalname = #{hospitalname}
</if>
@@ -395,8 +415,8 @@
</if>
AND d.del_flag != 1
- AND b.del_flag != 1
- AND c.del_flag != 1
+ -- AND b.del_flag != 1
+ -- AND c.del_flag != 1
AND a.del_flag != 1
</where>
</select>
@@ -405,8 +425,8 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
- b.tagid as tagid,
+ -- c.tagname as tag,
+ -- b.tagid as tagid,
a.patid as id,
a.name,
a.sex,
@@ -434,19 +454,25 @@
a.isupload,
a.upload_time,
a.pattype
- from pat_archive a,pat_archivetag b ,base_tag c, pat_med_physical d
+ -- from pat_archive a,pat_archivetag b ,base_tag c, pat_med_physical d
+ from pat_archive a, pat_med_physical d
<where>
- a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
+ a.patid = d.patid
<if test="pid != null and pid != ''">and a.patid = #{pid}</if>
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
- <if test="tagIds != null and tagIds != ''">and c.tagid in
- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
- #{tagId}
- </foreach>
+<!-- <if test="tagIds != null and tagIds != ''">and c.tagid in-->
+<!-- <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">-->
+<!-- #{tagId}-->
+<!-- </foreach>-->
+<!-- </if>-->
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
+ AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
</if>
-
+ <if test="diagname != null and diagname != ''">
+ AND d.diagname LIKE concat('%',#{diagname}, '%')
+ </if>
<if test="hospitalname != null and hospitalname != ''">
AND d.hospitalname = #{hospitalname}
</if>
@@ -462,11 +488,11 @@
</if>
AND d.del_flag != 1
- AND b.del_flag != 1
- AND c.del_flag != 1
+-- AND b.del_flag != 1
+-- AND c.del_flag != 1
AND a.del_flag != 1
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3