From bedd0a1cef215538df64470df6b8d4a022189136 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 八月 2024 14:05:16 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 87 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 31d5826..e8e8dc2 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,17 +77,18 @@
<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>
+ <if test="pattype != null ">and pattype = #{pattype}</if>
</where>
</select>
<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 +103,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 +117,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,12 +170,12 @@
<!-- </trim>-->
insert into
- 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
+ pat_archive(name,viptype,sex,idcardno,birthdate,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,nation,birthplace,native_place) values
<foreach item="item" index="index" collection="list" separator=",">
- (#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.birthplace},#{item.placeOfResidence},#{item.age},#{item.sourcefrom},#{item.archivetime},#{item.archiveby}
+ (#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{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}
+ #{item.updateTime},#{item.createBy},#{item.createTime},#{item.isupload},#{item.uploadTime},#{item.pattype},#{item.nation},#{item.birthplace},#{item.nativePlace}
)
</foreach>
</insert>
@@ -206,19 +207,19 @@
<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>
@@ -226,7 +227,7 @@
resultMap="PatArchiveResult">
SELECT
- a.patid,
+ a.id,
a.NAME,
a.sex,
a.nation,
@@ -257,12 +258,12 @@
b.tagid AS tagid
FROM
pat_archive a
- LEFT JOIN pat_archivetag b ON a.patid = b.patid AND b.del_flag = 0
+ LEFT JOIN pat_archivetag b ON a.id = b.patid AND b.del_flag = 0
<where>
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 b.tagid in
<foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
@@ -271,6 +272,7 @@
</if>
</where>
+ order by a.update_time desc
</select>
@@ -278,7 +280,7 @@
resultMap="PatArchiveResult">
select
- a.patid,
+ a.id,
a.NAME,
d.deptname,
a.sex,
@@ -311,13 +313,15 @@
t.tagname
FROM
pat_med_inhosp d
- JOIN pat_archive a ON a.patid = d.patid
+ 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>
+ d.del_flag != 1
+ AND a.del_flag != 1
<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 != ''">
@@ -348,21 +352,23 @@
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>
</if>
- AND d.del_flag != 1
- AND a.del_flag != 1
+ <if test="isFilter == true">
+ AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
+ </if>
</where>
+ order by a.update_time desc
</select>
<select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveResult">
select
- a.patid,
+ a.id,
d.deptname,
a.name,
a.sex,
@@ -390,11 +396,13 @@
a.isupload,
a.upload_time,
a.pattype
- from pat_med_outhosp d JOIN pat_archive a ON a.patid = d.patid
+ 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>
- <if test="pid != null and pid != ''">and a.patid = #{pid}</if>
+ d.del_flag != 1
+ AND a.del_flag != 1
+ <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>
@@ -417,21 +425,23 @@
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>
</if>
- AND d.del_flag != 1
- AND a.del_flag != 1
+ <if test="isFilter == true">
+ AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
+ </if>
</where>
+ order by a.update_time desc
</select>
<select id="selectPatArchiveInfoByPhysical" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveResult">
select
- a.patid as id,
+ a.id,
a.name,
a.sex,
d.deptname,
@@ -459,11 +469,13 @@
a.isupload,
a.upload_time,
a.pattype
- from pat_med_physical d JOIN pat_archive a ON a.patid = d.patid
+ 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>
- <if test="pid != null and pid != ''">and a.patid = #{pid}</if>
+ d.del_flag != 1
+ AND a.del_flag != 1
+ <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>
@@ -487,15 +499,16 @@
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>
</if>
- AND d.del_flag != 1
- AND a.del_flag != 1
+ <if test="isFilter == true">
+ AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
+ </if>
</where>
-
+ order by a.update_time desc
</select>
</mapper>
--
Gitblit v1.9.3