From 713dfaf7fb56cb57ea5c60822b52e65c6e1a8202 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 04 七月 2024 20:27:27 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 451a7e6..3af7acc 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -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>
@@ -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,
@@ -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.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>
--
Gitblit v1.9.3