From 29d027349c605bda0b7944301cd82a25ec9c1d7a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 07 五月 2024 16:42:03 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 109 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 73 insertions(+), 36 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index e423628..e0e31bd 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -24,6 +24,7 @@
<result property="orgid" column="orgid"/>
<result property="openid" column="openid"/>
<result property="delFlag" column="del_flag"/>
+ <result property="dept" column="deptname"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
@@ -32,6 +33,9 @@
<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"/>
+ <result property="membertype" column="membertype"/>
</resultMap>
<sql id="selectPatArchiveVo">
@@ -60,6 +64,7 @@
create_time,
isupload,
pattype,
+ membertype,
upload_time
from pat_archive
</sql>
@@ -75,6 +80,7 @@
<if test="patid != null and patid != ''">and patid = #{patid}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+ <if test="membertype != null ">and membertype = #{membertype}</if>
</where>
</select>
@@ -91,9 +97,11 @@
a.telcode,
a.create_time,
a.update_time,
+ a.membertype,
a.birthdate
from pat_archive a,pat_archivetag b ,base_tag c
<where>
+ a.del_flag=0 and
a.patid = b.patid and b.tagid = c.tagid
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
@@ -108,7 +116,7 @@
<select id="selectPatArchiveByPatid" parameterType="Long" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
- where patid = #{patid}
+ where patid = #{patid} and del_flag=0
</select>
<insert id="insertPatArchive">
@@ -161,10 +169,10 @@
<!-- </trim>-->
insert into
- pat_archive(name,sex,idcardno,birthdate,age,source,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
+ pat_archive(name,membertype,sex,idcardno,birthdate,age,source,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
,create_by,create_time,isupload,upload_time,pattype,place_of_residence,nation,birthplace,native_place) values
<foreach item="item" index="index" collection="list" separator=",">
- (#{item.name},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.age},#{item.source},#{item.archivetime},#{item.archiveby}
+ (#{item.name},#{item.membertype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.age},#{item.source},#{item.archivetime},#{item.archiveby}
,#{item.telcode},#{item.archiveby},#{item.idcardtype},#{item.orgid},#{item.openid},#{item.dduserid},#{item.updateBy},
#{item.updateTime},#{item.createBy},#{item.createTime},#{item.isupload},#{item.uploadTime},#{item.pattype},#{item.placeOfResidence},#{item.nation},#{item.birthplace},#{item.nativePlace}
)
@@ -194,6 +202,7 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
+ <if test="membertype != null">membertype = #{membertype},</if>
</trim>
where patid = #{patid}
</update>
@@ -216,6 +225,7 @@
select
c.tagname as tag,
+ b.tagid as tagid,
a.patid,
a.name,
a.sex,
@@ -241,6 +251,7 @@
a.create_time,
a.isupload,
a.upload_time,
+ a.membertype,
a.pattype
from pat_archive a,pat_archivetag b ,base_tag c
<where>
@@ -265,9 +276,9 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
a.patid,
a.name,
+ d.deptname,
a.sex,
a.nation,
a.native_place,
@@ -283,6 +294,7 @@
a.relativetelcode,
a.idcardtype,
a.orgid,
+ a.membertype,
a.openid,
a.del_flag,
a.update_by,
@@ -291,22 +303,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}
@@ -320,10 +335,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>
@@ -332,8 +351,10 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
+ -- c.tagname as tag,
+ -- b.tagid as tagid,
a.patid,
+ d.deptname,
a.name,
a.sex,
a.nation,
@@ -343,6 +364,7 @@
a.idcardno,
a.birthdate,
a.age,
+ a.membertype,
a.source,
a.archivetime,
a.archiveby,
@@ -359,19 +381,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>
@@ -386,8 +414,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>
@@ -396,14 +424,17 @@
resultMap="PatArchiveResult">
select
- c.tagname as tag,
- a.patid,
+ -- c.tagname as tag,
+ -- b.tagid as tagid,
+ a.patid as id,
a.name,
a.sex,
+ d.deptname,
a.nation,
a.native_place,
a.place_of_residence,
a.birthplace,
+ a.membertype,
a.idcardno,
a.birthdate,
a.age,
@@ -423,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>
@@ -451,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