From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 105 +++++++++++++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 43 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index ce7292e..cbfe8a3 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -62,6 +62,7 @@
<result property="guid" column="guid"/>
<result property="filterDrname" column="filter_drname"/>
<result property="filterDrcode" column="filter_drcode"/>
+ <result property="campusid" column="campusid"/>
</resultMap>
@@ -123,6 +124,7 @@
<result property="leaveicd10code" column="leaveicd10code"/>
<result property="filterDrname" column="filter_drname"/>
<result property="filterDrcode" column="filter_drcode"/>
+ <result property="campusid" column="campusid"/>
</resultMap>
<sql id="selectPatArchiveVo">
@@ -130,6 +132,7 @@
notrequired_flag,
notrequiredreason,
patientno,
+ campusid,
filter_drname,
filter_drcode,
patid_his,
@@ -177,8 +180,8 @@
<select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
- <where>
- del_flag=0
+ where 1=1
+ and del_flag = 0
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
<if test="sourcefrom != null ">and sourcefrom = #{sourcefrom}</if>
@@ -208,7 +211,7 @@
<if test="casePersonAge != null ">and case_person_age = #{casePersonAge}</if>
<if test="filterDrname != null ">and filter_drname = #{filterDrname}</if>
<if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if>
- </where>
+ <if test="campusid != null ">and campusid = #{campusid}</if>
</select>
@@ -218,6 +221,7 @@
a.age_unit,
a.age_unit2,
a.notrequired_flag,
+ a.campusid,
a.notrequiredreason,
a.patientno,
a.patid_his,
@@ -245,20 +249,21 @@
a.filter_drcode,
a.case_person_age
from pat_archive a,pat_archivetag b ,base_tag c
- <where>
- a.del_flag=0 and
- a.id = b.patid and b.tagid = c.tagid
+ where 1=1
+ and a.del_flag = 0
+ and a.id = b.patid
+ and b.tagid = c.tagid
<if test="filterDrname != null ">and filter_drname = #{filterDrname}</if>
<if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if>
<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>
+ <if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
<if test="tagIds != null and tagIds != ''">and c.tagid in
<foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
#{tagId}
</foreach>
</if>
- </where>
</select>
<select id="selectPatArchiveByPatid" parameterType="Long" resultMap="PatArchiveResult">
@@ -326,6 +331,7 @@
<if test="casePersonAge != null ">case_person_age,</if>
<if test="filterDrname != null ">filter_drname,</if>
<if test="filterDrcode != null ">filter_drcode,</if>
+ <if test="campusid != null ">campusid,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="patientno != null">#{patientno},</if>
@@ -375,6 +381,7 @@
<if test="casePersonAge != null ">#{casePersonAge},</if>
<if test="filterDrname != null ">#{filterDrname},</if>
<if test="filterDrcode != null ">#{filterDrcode},</if>
+ <if test="campusid != null ">#{campusid},</if>
</trim>
</insert>
@@ -382,14 +389,14 @@
insert into
pat_archive(name,viptype,sex,idcardno,birthdate,place_of_residence,age,age2,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,patientno,patid_his,sd_flag,age_unit,age_unit2,notrequired_flag,notrequiredreason,care_facilities,case_path,
- degree_of_education,marital_status,income,medicare_type,care_person,case_person_age,filter_drname,filter_drcode)
+ degree_of_education,marital_status,income,medicare_type,care_person,case_person_age,filter_drname,filter_drcode,campusid)
values
<foreach item="item" index="index" collection="list" separator=",">
(#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.placeOfResidence},#{item.age},#{item.age2},#{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.nation},#{item.birthplace},#{item.nativePlace},#{item.patientno},
#{item.patidHis},#{item.sdFlag},#{item.ageUnit},#{item.ageUnit2},#{item.notrequiredFlag},#{item.notrequiredreason}
- ,#{item.careFacilities},#{item.casePath},#{item.degreeOfEducation},#{item.maritalStatus},#{item.income},#{item.medicareType},#{item.carePerson},#{item.casePersonAge},#{item.filterDrname},#{item.filterDrcode})
+ ,#{item.careFacilities},#{item.casePath},#{item.degreeOfEducation},#{item.maritalStatus},#{item.income},#{item.medicareType},#{item.carePerson},#{item.casePersonAge},#{item.filterDrname},#{item.filterDrcode},#{item.campusid})
</foreach>
</insert>
@@ -438,6 +445,7 @@
<if test="guid != null ">guid = #{guid},</if>
<if test="filterDrname != null ">filter_drname = #{filterDrname},</if>
<if test="filterDrcode != null ">filter_drcode = #{filterDrcode},</if>
+ <if test="campusid != null ">campusid = #{campusid},</if>
</trim>
where id = #{id}
</update>
@@ -498,28 +506,29 @@
a.pattype,
a.filter_drname,
a.filter_drcode,
+ a.campusid,
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.del_flag = 0
+ where 1=1
+ and a.del_flag = 0
and a.orgid = #{orgid}
<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="notrequiredFlag != null and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
</if>
<if test="pid != null and pid != ''">and a.id = #{pid}</if>
+ <if test="campusid != null and campusid != ''">and a.campusid = #{campusid}</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=")">
#{tagId}
</foreach>
</if>
- </where>
order by a.update_time desc
- <if test="pn != null and ps != null"> limit ${pn},${ps} </if>
+ <if test="pn != null and ps != null">limit ${pn},${ps}</if>
</select>
@@ -530,6 +539,7 @@
a.id,
a.age_unit,
a.age_unit2,
+ a.campusid,
a.inhospno,
a.notrequired_flag,
a.notrequiredreason,
@@ -584,13 +594,14 @@
LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
) t ON t.patid =
d.patid
- <where>
- d.del_flag != 1
+ where 1=1
+ and d.del_flag != 1
AND a.del_flag != 1
and d.orgid = #{orgid}
<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.id = #{id}</if>
+ <if test="campusid != null and campusid != ''">and a.campusid = #{campusid}</if>
<if test="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
<if test="notrequiredFlag != null and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
</if>
@@ -659,9 +670,9 @@
<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
- <if test="pn != null and ps != null"> limit ${pn},${ps} </if>
+ -- order by a.update_time desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
+
</select>
<select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
@@ -671,6 +682,7 @@
a.age_unit,
a.age_unit2,
a.patid_his,
+ a.campusid,
a.sd_flag,
a.patientno,
a.notrequired_flag,
@@ -713,11 +725,12 @@
LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
) t ON t.patid =
d.patid
- <where>
- d.del_flag != 1
+ where 1=1
+ and d.del_flag != 1
AND a.del_flag != 1
and d.orgid = #{orgid}
<if test="pid != null and pid != ''">and a.id = #{pid}</if>
+ <if test="campusid != null and campusid != ''">and a.campusid = #{campusid}</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>
@@ -750,9 +763,8 @@
<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
- <if test="pn != null and ps != null"> limit ${pn},${ps} </if>
+ -- order by a.update_time desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<select id="selectPatArchiveInfoByPhysical" parameterType="com.smartor.domain.PatArchiveReq"
@@ -767,6 +779,7 @@
a.notrequiredreason,
a.patid_his,
a.sd_flag,
+ a.campusid,
a.patientno,
a.sex,
d.deptname,
@@ -805,11 +818,12 @@
LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
) t ON t.patid =
d.patid
- <where>
- d.del_flag != 1
+ where 1=1
+ and d.del_flag != 1
AND a.del_flag != 1
and d.orgid = #{orgid}
<if test="pid != null and pid != ''">and a.id = #{pid}</if>
+ <if test="campusid != null and campusid != ''">and a.campusid = #{campusid}</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>
@@ -843,9 +857,8 @@
<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
- <if test="pn != null and ps != null"> limit ${pn},${ps} </if>
+ -- order by a.update_time desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<select id="selectPatArchiveInfoByInhospQC" parameterType="com.smartor.domain.PatArchiveReq"
@@ -857,6 +870,7 @@
a.age_unit,
a.age_unit2,
a.inhospno,
+ a.campusid,
a.notrequired_flag,
a.notrequiredreason,
a.patid_his,
@@ -911,8 +925,8 @@
LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
) t ON t.patid =
d.patid
- <where>
- d.del_flag != 1
+ where 1=1
+ and d.del_flag != 1
AND a.del_flag != 1
and d.orgid = #{orgid}
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
@@ -939,8 +953,11 @@
<if test="drcode != null">
AND d.drcode = #{drcode}
</if>
- <if test="cry != null and cry == 0 ">and d.endtime is null</if>
- <if test="cry != null and cry == 1 ">and d.endtime is not null</if>
+ <if test="campusid != null">
+ AND d.campusid = #{campusid}
+ </if>
+ <if test="allhosp != null and allhosp == 1 ">and d.endtime is null</if>
+ <if test="allhosp != null and allhosp == 4 ">and d.endtime is not null</if>
<if test="visitno != null and visitno != ''">
AND d.inhospno = #{visitno}
</if>
@@ -988,9 +1005,8 @@
<if test="isFilter == true">
AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
</if>
- </where>
- order by a.id,a.update_time desc ) as tmp order by endtime desc
- <if test="pn != null and ps != null"> limit ${pn},${ps} </if>
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
+ ) as tmp
</select>
<select id="selectPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq"
@@ -1003,6 +1019,7 @@
a.age_unit2,
a.patid_his,
a.sd_flag,
+ a.campusid,
a.patientno,
a.notrequired_flag,
a.notrequiredreason,
@@ -1043,11 +1060,12 @@
LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
) t ON t.patid =
d.patid
- <where>
- d.del_flag != 1
+ where 1=1
+ and d.del_flag != 1
AND a.del_flag != 1
and d.orgid = #{orgid}
<if test="pid != null and pid != ''">and a.id = #{pid}</if>
+ <if test="campusid != null and campusid != ''">and a.campusid = #{campusid}</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>
@@ -1083,8 +1101,7 @@
<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
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<select id="selectPatArchiveInfoByPhysicalQC" parameterType="com.smartor.domain.PatArchiveReq"
@@ -1093,6 +1110,7 @@
select
a.idcardno,
a.id,
+ a.campusid,
a.age_unit,
a.age_unit2,
a.name,
@@ -1137,11 +1155,12 @@
LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid
) t ON t.patid =
d.patid
- <where>
- d.del_flag != 1
+ where 1=1
+ and d.del_flag != 1
AND a.del_flag != 1
and d.orgid = #{orgid}
<if test="pid != null and pid != ''">and a.id = #{pid}</if>
+ <if test="campusid != null and campusid != ''">and a.campusid = #{campusid}</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>
@@ -1175,7 +1194,7 @@
<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
+ -- order by a.update_time desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
</mapper>
--
Gitblit v1.9.3