From b220383758021bcb26d0a788ebe9a31795d23b6d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 四月 2024 09:41:57 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 91 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 36 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 0edb96a..9d4ca36 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -33,6 +33,8 @@
<result property="uploadTime" column="upload_time"/>
<result property="tag" column="tag"/>
<result property="pattype" column="pattype"/>
+ <result property="bedNo" column="bedno"/>
+ <result property="inhosptime" column="inhosptime"/>
</resultMap>
<sql id="selectPatArchiveVo">
@@ -268,8 +270,6 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
- b.tagid as tagid,
a.patid,
a.name,
d.deptname,
@@ -296,22 +296,25 @@
a.create_time,
a.isupload,
a.upload_time,
- a.pattype
- from pat_archive a,pat_archivetag b ,base_tag c,pat_med_inhosp d
+ a.pattype,
+ d.bed_no,
+ d.starttime as inhosptime
+ 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 = 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="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}
@@ -325,10 +328,14 @@
<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 a.del_flag != 1
</where>
</select>
@@ -337,8 +344,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,
@@ -366,19 +373,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>
@@ -393,8 +406,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>
@@ -403,9 +416,9 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
- b.tagid as tagid,
- a.patid,
+ -- c.tagname as tag,
+ -- b.tagid as tagid,
+ a.patid as id,
a.name,
a.sex,
d.deptname,
@@ -432,19 +445,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>
@@ -460,11 +479,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