From 37f2e4e68c0d55e094981fa478fc198b907f87dc Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 20 七月 2024 16:30:13 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 94 +++++++++++++++++++++++++---------------------
1 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 451a7e6..f0eb828 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.smartor.mapper.PatArchiveMapper">
<resultMap type="com.smartor.domain.PatArchive" id="PatArchiveResult">
- <result property="patid" column="patid"/>
+ <result property="id" column="id"/>
<result property="name" column="name"/>
<result property="sex" column="sex"/>
<result property="nation" column="nation"/>
@@ -39,7 +39,7 @@
</resultMap>
<sql id="selectPatArchiveVo">
- select patid,
+ select id,
name,
sex,
idcardno,
@@ -77,7 +77,7 @@
<if test="sourcefrom != null ">and sourcefrom = #{sourcefrom}</if>
<if test="telcode != null and telcode != ''">and telcode = #{telcode}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
- <if test="patid != null and patid != ''">and patid = #{patid}</if>
+ <if test="id != null and id != ''">and id = #{id}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="viptype != null ">and viptype = #{viptype}</if>
@@ -87,7 +87,7 @@
<select id="patInfoByContion" parameterType="com.smartor.domain.PatArchiveReq" resultMap="PatArchiveResult">
select
- a.patid,
+ a.id,
a.name,
a.sex,
c.tagname as tag,
@@ -102,7 +102,7 @@
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
+ a.id = 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>
<if test="telcode != null and telcode != ''">and telcode = #{telcode}</if>
@@ -116,7 +116,7 @@
<select id="selectPatArchiveByPatid" parameterType="Long" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
- where patid = #{patid} and del_flag=0
+ where id = #{id} and del_flag=0
</select>
<insert id="insertPatArchive">
@@ -169,10 +169,10 @@
<!-- </trim>-->
insert into
- pat_archive(name,viptype,sex,idcardno,birthdate,age,sourcefrom,archivetime,archiveby,telcode,relativetelcode,idcardtype,orgid,openid,dduserid,update_by,update_time
+ pat_archive(name,viptype,sex,idcardno,birthdate,birthplace,place_of_residence,age,sourcefrom,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.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.age},#{item.sourcefrom},#{item.archivetime},#{item.archiveby}
+ (#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.birthplace},#{item.placeOfResidence},#{item.age},#{item.sourcefrom},#{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}
)
@@ -186,6 +186,8 @@
<if test="sex != null">sex = #{sex},</if>
<if test="idcardno != null">idcardno = #{idcardno},</if>
<if test="birthdate != null">birthdate = #{birthdate},</if>
+ <if test="placeOfResidence != null">place_of_residence = #{placeOfResidence},</if>
+ <if test="birthplace != null">birthplace = #{birthplace},</if>
<if test="age != null">age = #{age},</if>
<if test="sourcefrom != null">sourcefrom = #{sourcefrom},</if>
<if test="archivetime != null">archivetime = #{archivetime},</if>
@@ -204,30 +206,28 @@
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="viptype != null">viptype = #{viptype},</if>
</trim>
- where patid = #{patid}
+ where id = #{id}
</update>
<delete id="deletePatArchiveByPatid" parameterType="Long">
delete
from pat_archive
- where patid = #{patid}
+ where id = #{id}
</delete>
<delete id="deletePatArchiveByPatids" parameterType="String">
- delete from pat_archive where patid in
- <foreach item="patid" collection="array" open="(" separator="," close=")">
- #{patid}
+ delete from pat_archive where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
</foreach>
</delete>
<select id="selectPatArchiveInfoByAllhosp" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveResult">
- select
- c.tagname as tag,
- b.tagid as tagid,
- a.patid,
- a.name,
+ SELECT
+ a.id,
+ a.NAME,
a.sex,
a.nation,
a.native_place,
@@ -252,22 +252,24 @@
a.isupload,
a.upload_time,
a.viptype,
- a.pattype
- from pat_archive a,pat_archivetag b ,base_tag c
+ a.pattype,
+ b.tagname AS tag,
+ b.tagid AS tagid
+ FROM
+ pat_archive a
+ LEFT JOIN pat_archivetag b ON a.id = b.patid AND b.del_flag = 0
<where>
- a.patid = b.patid and b.tagid = c.tagid
+ a.del_flag = 0
<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="pid != null and pid != ''">and a.id = #{pid}</if>
<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
- <if test="tagIds != null and tagIds != ''">and c.tagid in
+ <if test="tagIds != null and tagIds != ''">and b.tagid in
<foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
#{tagId}
</foreach>
</if>
- AND b.del_flag != 1
- AND c.del_flag != 1
- AND a.del_flag != 1
+
</where>
</select>
@@ -276,8 +278,8 @@
resultMap="PatArchiveResult">
select
- a.patid,
- a.name,
+ a.id,
+ a.NAME,
d.deptname,
a.sex,
a.nation,
@@ -305,13 +307,17 @@
a.upload_time,
a.pattype,
d.bed_no,
- d.starttime as inhosptime
- from pat_archive a,pat_med_inhosp d
+ d.starttime AS inhosptime,
+ t.tagname
+ FROM
+ pat_med_inhosp d
+ JOIN pat_archive a ON a.id = d.patid
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ d.patid
<where>
- 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="pid != null and pid != ''">and a.id = #{id}</if>
<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
<if test="hospitalname != null and hospitalname != ''">
@@ -342,7 +348,7 @@
AND d.deptname LIKE concat('%',#{deptname}, '%')
</if>
<if test="pids != null">
- AND a.patid NOT IN
+ AND a.id NOT IN
<foreach collection="pids" item="pid" open="(" separator="," close=")">
#{pid}
</foreach>
@@ -356,7 +362,7 @@
resultMap="PatArchiveResult">
select
- a.patid,
+ a.id,
d.deptname,
a.name,
a.sex,
@@ -384,10 +390,11 @@
a.isupload,
a.upload_time,
a.pattype
- from pat_archive a, pat_med_outhosp d
+ from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ d.patid
<where>
- a.patid = d.patid
- <if test="pid != null and pid != ''">and a.patid = #{pid}</if>
+ <if test="pid != null and pid != ''">and a.id = #{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>
@@ -410,7 +417,7 @@
AND d.drname LIKE concat('%',#{drname}, '%')
</if>
<if test="pids != null">
- AND a.patid NOT IN
+ AND a.id NOT IN
<foreach collection="pids" item="pid" open="(" separator="," close=")">
#{pid}
</foreach>
@@ -424,7 +431,7 @@
resultMap="PatArchiveResult">
select
- a.patid as id,
+ a.id,
a.name,
a.sex,
d.deptname,
@@ -452,10 +459,11 @@
a.isupload,
a.upload_time,
a.pattype
- from pat_archive a, pat_med_physical d
+ from pat_med_physical d JOIN pat_archive a ON a.id = d.patid
+ LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
+ d.patid
<where>
- a.patid = d.patid
- <if test="pid != null and pid != ''">and a.patid = #{pid}</if>
+ <if test="pid != null and pid != ''">and a.id = #{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>
@@ -479,7 +487,7 @@
AND d.drname LIKE concat('%',#{drname}, '%')
</if>
<if test="pids != null">
- AND a.patid NOT IN
+ AND a.id NOT IN
<foreach collection="pids" item="pid" open="(" separator="," close=")">
#{pid}
</foreach>
--
Gitblit v1.9.3