From 6a58a5a148c27c9ff66901bfbae6e52c1a56b5d2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 04 七月 2024 17:17:53 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 107 ++++++++++++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 55 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index e0e31bd..3af7acc 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -15,7 +15,7 @@
<result property="idcardno" column="idcardno"/>
<result property="birthdate" column="birthdate"/>
<result property="age" column="age"/>
- <result property="source" column="source"/>
+ <result property="sourcefrom" column="sourcefrom"/>
<result property="archivetime" column="archivetime"/>
<result property="archiveby" column="archiveby"/>
<result property="telcode" column="telcode"/>
@@ -35,7 +35,7 @@
<result property="pattype" column="pattype"/>
<result property="bedNo" column="bedno"/>
<result property="inhosptime" column="inhosptime"/>
- <result property="membertype" column="membertype"/>
+ <result property="viptype" column="viptype"/>
</resultMap>
<sql id="selectPatArchiveVo">
@@ -49,7 +49,7 @@
native_place,
place_of_residence,
birthplace,
- source,
+ sourcefrom,
archivetime,
archiveby,
telcode,
@@ -64,7 +64,7 @@
create_time,
isupload,
pattype,
- membertype,
+ viptype,
upload_time
from pat_archive
</sql>
@@ -74,13 +74,13 @@
<where>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
- <if test="source != null ">and source = #{source}</if>
+ <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="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
- <if test="membertype != null ">and membertype = #{membertype}</if>
+ <if test="viptype != null ">and viptype = #{viptype}</if>
</where>
</select>
@@ -97,7 +97,7 @@
a.telcode,
a.create_time,
a.update_time,
- a.membertype,
+ a.viptype,
a.birthdate
from pat_archive a,pat_archivetag b ,base_tag c
<where>
@@ -127,7 +127,7 @@
<!-- iccardno-->
<!--<!– <if test="birthdate != null">birthdate,</if>–>-->
<!--<!– <if test="age != null">age,</if>–>-->
- <!--<!– <if test="source != null">source,</if>–>-->
+ <!--<!– <if test="sourcefrom != null">sourcefrom,</if>–>-->
<!--<!– <if test="archivetime != null">archivetime,</if>–>-->
<!--<!– <if test="archiveby != null">archiveby,</if>–>-->
<!--<!– <if test="telcode != null">telcode,</if>–>-->
@@ -150,7 +150,7 @@
<!-- <if test="iccardno != null">#{item.iccardno},</if>-->
<!--<!– <if test="birthdate != null">#{birthdate},</if>–>-->
<!--<!– <if test="age != null">#{item.age},</if>–>-->
- <!--<!– <if test="source != null">#{item.source},</if>–>-->
+ <!--<!– <if test="sourcefrom != null">#{item.sourcefrom},</if>–>-->
<!--<!– <if test="archivetime != null">#{item.archivetime},</if>–>-->
<!--<!– <if test="archiveby != null">#{item.archiveby},</if>–>-->
<!--<!– <if test="telcode != null">#{item.telcode},</if>–>-->
@@ -169,10 +169,10 @@
<!-- </trim>-->
insert into
- pat_archive(name,membertype,sex,idcardno,birthdate,age,source,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.membertype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.age},#{item.source},#{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,8 +186,10 @@
<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="source != null">source = #{source},</if>
+ <if test="sourcefrom != null">sourcefrom = #{sourcefrom},</if>
<if test="archivetime != null">archivetime = #{archivetime},</if>
<if test="archiveby != null">archiveby = #{archiveby},</if>
<if test="telcode != null">telcode = #{telcode},</if>
@@ -202,7 +204,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>
+ <if test="viptype != null">viptype = #{viptype},</if>
</trim>
where patid = #{patid}
</update>
@@ -223,11 +225,9 @@
<select id="selectPatArchiveInfoByAllhosp" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveResult">
- select
- c.tagname as tag,
- b.tagid as tagid,
+ SELECT
a.patid,
- a.name,
+ a.NAME,
a.sex,
a.nation,
a.native_place,
@@ -236,7 +236,7 @@
a.idcardno,
a.birthdate,
a.age,
- a.source,
+ a.sourcefrom,
a.archivetime,
a.archiveby,
a.telcode,
@@ -251,23 +251,25 @@
a.create_time,
a.isupload,
a.upload_time,
- a.membertype,
- a.pattype
- from pat_archive a,pat_archivetag b ,base_tag c
+ a.viptype,
+ a.pattype,
+ b.tagname AS tag,
+ b.tagid AS tagid
+ FROM
+ pat_archive a
+ LEFT JOIN pat_archivetag b ON a.patid = 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="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>
@@ -287,14 +289,14 @@
a.idcardno,
a.birthdate,
a.age,
- a.source,
+ a.sourcefrom,
a.archivetime,
a.archiveby,
a.telcode,
a.relativetelcode,
a.idcardtype,
a.orgid,
- a.membertype,
+ a.viptype,
a.openid,
a.del_flag,
a.update_by,
@@ -341,7 +343,12 @@
<if test="deptname != null and deptname != ''">
AND d.deptname LIKE concat('%',#{deptname}, '%')
</if>
-
+ <if test="pids != null">
+ AND a.patid NOT IN
+ <foreach collection="pids" item="pid" open="(" separator="," close=")">
+ #{pid}
+ </foreach>
+ </if>
AND d.del_flag != 1
AND a.del_flag != 1
</where>
@@ -351,8 +358,6 @@
resultMap="PatArchiveResult">
select
- -- c.tagname as tag,
- -- b.tagid as tagid,
a.patid,
d.deptname,
a.name,
@@ -364,8 +369,8 @@
a.idcardno,
a.birthdate,
a.age,
- a.membertype,
- a.source,
+ a.viptype,
+ a.sourcefrom,
a.archivetime,
a.archiveby,
a.telcode,
@@ -381,7 +386,6 @@
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_med_outhosp d
<where>
a.patid = d.patid
@@ -389,11 +393,6 @@
<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>-->
<if test="hospitaldistrictname != null and hospitaldistrictname != ''">
AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
</if>
@@ -412,10 +411,13 @@
<if test="drname != null and drname != ''">
AND d.drname LIKE concat('%',#{drname}, '%')
</if>
-
+ <if test="pids != null">
+ AND a.patid NOT IN
+ <foreach collection="pids" item="pid" open="(" separator="," close=")">
+ #{pid}
+ </foreach>
+ </if>
AND d.del_flag != 1
- -- AND b.del_flag != 1
- -- AND c.del_flag != 1
AND a.del_flag != 1
</where>
</select>
@@ -424,8 +426,6 @@
resultMap="PatArchiveResult">
select
- -- c.tagname as tag,
- -- b.tagid as tagid,
a.patid as id,
a.name,
a.sex,
@@ -434,11 +434,11 @@
a.native_place,
a.place_of_residence,
a.birthplace,
- a.membertype,
+ a.viptype,
a.idcardno,
a.birthdate,
a.age,
- a.source,
+ a.sourcefrom,
a.archivetime,
a.archiveby,
a.telcode,
@@ -454,7 +454,6 @@
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_med_physical d
<where>
a.patid = d.patid
@@ -462,11 +461,6 @@
<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>-->
<if test="hospitaldistrictname != null and hospitaldistrictname != ''">
AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
</if>
@@ -486,10 +480,13 @@
<if test="drname != null and drname != ''">
AND d.drname LIKE concat('%',#{drname}, '%')
</if>
-
+ <if test="pids != null">
+ AND a.patid NOT IN
+ <foreach collection="pids" item="pid" open="(" separator="," close=")">
+ #{pid}
+ </foreach>
+ </if>
AND d.del_flag != 1
--- AND b.del_flag != 1
--- AND c.del_flag != 1
AND a.del_flag != 1
</where>
--
Gitblit v1.9.3