From 21ce122193e2fb57d206dbfca59e8d2ab2114fd0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 23 三月 2026 17:12:56 +0800
Subject: [PATCH] 新增病区与科室组合
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 328 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 217 insertions(+), 111 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index cbfe8a3..0882e3f 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -586,14 +586,10 @@
d.nurse_id,
d.out_way_id,
d.leavehospitaldistrictname AS leavehospitaldistrictname,
- d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
- t.tagname
+ d.leavehospitaldistrictcode AS leavehospitaldistrictcode
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 where del_flag=0 GROUP BY patid
- ) t ON t.patid =
- d.patid
where 1=1
and d.del_flag != 1
AND a.del_flag != 1
@@ -812,12 +808,8 @@
a.upload_time,
a.filter_drname,
a.filter_drcode,
- t.tagname,
a.pattype
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 where del_flag=0 GROUP BY patid
- ) t ON t.patid =
- d.patid
where 1=1
and d.del_flag != 1
AND a.del_flag != 1
@@ -917,14 +909,10 @@
d.nurse_id,
d.out_way_id,
d.leavehospitaldistrictname AS leavehospitaldistrictname,
- d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
- t.tagname
+ d.leavehospitaldistrictcode AS leavehospitaldistrictcode
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 where del_flag=0 GROUP BY patid
- ) t ON t.patid =
- d.patid
where 1=1
and d.del_flag != 1
AND a.del_flag != 1
@@ -1009,100 +997,96 @@
) as tmp
</select>
- <select id="selectPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq"
- resultMap="PatArchiveOthreInfoResult">
+<!-- <select id="selectPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq"-->
+<!-- resultMap="PatArchiveOthreInfoResult">-->
- select
- a.idcardno,
- a.id,
- a.age_unit,
- a.age_unit2,
- a.patid_his,
- a.sd_flag,
- a.campusid,
- a.patientno,
- a.notrequired_flag,
- a.notrequiredreason,
- d.deptname,
- d.deptcode,
- d.drcode,
- d.drname,
- a.name,
- a.sex,
- a.nation,
- a.native_place,
- a.place_of_residence,
- a.birthplace,
- a.birthdate,
- a.age,
- a.age2,
- a.viptype,
- a.sourcefrom,
- a.archivetime,
- a.archiveby,
- a.telcode,
- a.relativetelcode,
- a.idcardtype,
- a.orgid,
- a.openid,
- a.del_flag,
- a.update_by,
- a.update_time,
- a.create_by,
- a.create_time,
- a.isupload,
- a.upload_time,
- a.filter_drname,
- a.filter_drcode,
- t.tagname,
- a.pattype
- 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 where del_flag=0 GROUP BY patid
- ) t ON t.patid =
- d.patid
- 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>
- <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
- AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')
- </if>
- <if test="notrequiredFlag != null and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
- </if>
- <if test="leavediagname != null and leavediagname != ''">
- AND d.diagname LIKE concat('%',#{leavediagname}, '%')
- </if>
- <if test="hospitalname != null and hospitalname != ''">
- AND d.hospitalname = #{hospitalname}
- </if>
- <if test="visitno != null and visitno != ''">
- AND d.outhospno = #{visitno}
- </if>
- <if test="deptname != null and deptname != ''">
- and d.deptname LIKE concat('%', #{deptname}, '%')
- </if>
- <if test="drname != null and drname != ''">
- AND d.drname LIKE concat('%',#{drname}, '%')
- </if>
- <if test="drcode != null">
- AND d.drcode = #{drcode}
- </if>
- <if test="pids != null">
- AND a.id NOT IN
- <foreach collection="pids" item="pid" open="(" separator="," close=")">
- #{pid}
- </foreach>
- </if>
- <if test="isFilter == true">
- AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
- </if>
- <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
- </select>
+<!-- select-->
+<!-- a.idcardno,-->
+<!-- a.id,-->
+<!-- a.age_unit,-->
+<!-- a.age_unit2,-->
+<!-- a.patid_his,-->
+<!-- a.sd_flag,-->
+<!-- a.campusid,-->
+<!-- a.patientno,-->
+<!-- a.notrequired_flag,-->
+<!-- a.notrequiredreason,-->
+<!-- d.deptname,-->
+<!-- d.deptcode,-->
+<!-- d.drcode,-->
+<!-- d.drname,-->
+<!-- a.name,-->
+<!-- a.sex,-->
+<!-- a.nation,-->
+<!-- a.native_place,-->
+<!-- a.place_of_residence,-->
+<!-- a.birthplace,-->
+<!-- a.birthdate,-->
+<!-- a.age,-->
+<!-- a.age2,-->
+<!-- a.viptype,-->
+<!-- a.sourcefrom,-->
+<!-- a.archivetime,-->
+<!-- a.archiveby,-->
+<!-- a.telcode,-->
+<!-- a.relativetelcode,-->
+<!-- a.idcardtype,-->
+<!-- a.orgid,-->
+<!-- a.openid,-->
+<!-- a.del_flag,-->
+<!-- a.update_by,-->
+<!-- a.update_time,-->
+<!-- a.create_by,-->
+<!-- a.create_time,-->
+<!-- a.isupload,-->
+<!-- a.upload_time,-->
+<!-- a.filter_drname,-->
+<!-- a.filter_drcode,-->
+<!-- a.pattype-->
+<!-- from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid-->
+<!-- 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>-->
+<!-- <if test="hospitaldistrictname != null and hospitaldistrictname != ''">-->
+<!-- AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')-->
+<!-- </if>-->
+<!-- <if test="notrequiredFlag != null and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}-->
+<!-- </if>-->
+<!-- <if test="leavediagname != null and leavediagname != ''">-->
+<!-- AND d.diagname LIKE concat('%',#{leavediagname}, '%')-->
+<!-- </if>-->
+<!-- <if test="hospitalname != null and hospitalname != ''">-->
+<!-- AND d.hospitalname = #{hospitalname}-->
+<!-- </if>-->
+<!-- <if test="visitno != null and visitno != ''">-->
+<!-- AND d.outhospno = #{visitno}-->
+<!-- </if>-->
+<!-- <if test="deptname != null and deptname != ''">-->
+<!-- and d.deptname LIKE concat('%', #{deptname}, '%')-->
+<!-- </if>-->
+<!-- <if test="drname != null and drname != ''">-->
+<!-- AND d.drname LIKE concat('%',#{drname}, '%')-->
+<!-- </if>-->
+<!-- <if test="drcode != null">-->
+<!-- AND d.drcode = #{drcode}-->
+<!-- </if>-->
+<!-- <if test="pids != null">-->
+<!-- AND a.id NOT IN-->
+<!-- <foreach collection="pids" item="pid" open="(" separator="," close=")">-->
+<!-- #{pid}-->
+<!-- </foreach>-->
+<!-- </if>-->
+<!-- <if test="isFilter == true">-->
+<!-- AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)-->
+<!-- </if>-->
+<!-- <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>-->
+<!-- </select>-->
<select id="selectPatArchiveInfoByPhysicalQC" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveOthreInfoResult">
@@ -1149,12 +1133,8 @@
a.create_time,
a.isupload,
a.upload_time,
- t.tagname,
a.pattype
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 where del_flag=0 GROUP BY patid
- ) t ON t.patid =
- d.patid
where 1=1
and d.del_flag != 1
AND a.del_flag != 1
@@ -1197,4 +1177,130 @@
-- order by a.update_time desc
<if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
+
+ <!-- 浣忛櫌鎮ｈ�呮�绘暟缁熻锛堝幓閲嶏級 -->
+ <select id="countPatArchiveInfoByInhospQC" parameterType="com.smartor.domain.PatArchiveReq" resultType="long">
+ SELECT COUNT(DISTINCT a.id)
+ FROM pat_med_inhosp d
+ JOIN pat_archive a ON a.id = d.patid
+ 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="telcode != null and telcode != ''">AND a.telcode = #{telcode}</if>
+ <if test="notrequiredFlag != null and notrequiredFlag != ''">AND a.notrequired_flag = #{notrequiredFlag}</if>
+ <if test="hospitalname != null and hospitalname != ''">AND d.hospitalname = #{hospitalname}</if>
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">AND d.leaveicd10code LIKE concat('%',#{leaveicd10code}, '%')</if>
+ <if test="endtime != null">AND d.endtime = #{endtime}</if>
+ <if test="drname != null and drname != ''">AND d.drname LIKE concat('%',#{drname}, '%')</if>
+ <if test="drcode != null">AND d.drcode = #{drcode}</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>
+ <if test="deptname != null and deptname != ''">AND d.deptname LIKE concat('%', #{deptname}, '%')</if>
+ <if test="leavediagname != null and leavediagname != ''">AND d.leavediagname LIKE concat('%',#{leavediagname}, '%')</if>
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size()>0">
+ AND d.leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator="," close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test="leaveldeptcodes != null and leaveldeptcodes.size() > 0">
+ AND d.leaveldeptcode IN
+ <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator="," close=")">
+ #{leaveldeptcode}
+ </foreach>
+ </if>
+ <if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size()>0">
+ AND d.hospitaldistrictcode IN
+ <foreach collection="hospitaldistrictcodes" item="hospitaldistrictcode" open="(" separator="," close=")">
+ #{hospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test="deptcodes != null and deptcodes.size() > 0">
+ AND d.deptcode IN
+ <foreach collection="deptcodes" item="deptcode" open="(" separator="," close=")">
+ #{deptcode}
+ </foreach>
+ </if>
+ <if test="pids != null">
+ AND a.id NOT IN
+ <foreach collection="pids" item="pid" open="(" separator="," close=")">
+ #{pid}
+ </foreach>
+ </if>
+ <if test="isFilter == true">
+ AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
+ </if>
+ </select>
+
+ <!-- 闂ㄨ瘖鎮ｈ�呮�绘暟缁熻锛堝幓閲嶏級 -->
+<!-- <select id="countPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq" resultType="long">-->
+<!-- SELECT COUNT(DISTINCT a.id)-->
+<!-- FROM pat_med_outhosp d-->
+<!-- JOIN pat_archive a ON a.id = d.patid-->
+<!-- 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>-->
+<!-- <if test="hospitaldistrictname != null and hospitaldistrictname != ''">AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')</if>-->
+<!-- <if test="notrequiredFlag != null and notrequiredFlag != ''">AND a.notrequired_flag = #{notrequiredFlag}</if>-->
+<!-- <if test="leavediagname != null and leavediagname != ''">AND d.diagname LIKE concat('%',#{leavediagname}, '%')</if>-->
+<!-- <if test="hospitalname != null and hospitalname != ''">AND d.hospitalname = #{hospitalname}</if>-->
+<!-- <if test="visitno != null and visitno != ''">AND d.outhospno = #{visitno}</if>-->
+<!-- <if test="deptname != null and deptname != ''">AND d.deptname LIKE concat('%', #{deptname}, '%')</if>-->
+<!-- <if test="drname != null and drname != ''">AND d.drname LIKE concat('%',#{drname}, '%')</if>-->
+<!-- <if test="drcode != null">AND d.drcode = #{drcode}</if>-->
+<!-- <if test="pids != null">-->
+<!-- AND a.id NOT IN-->
+<!-- <foreach collection="pids" item="pid" open="(" separator="," close=")">-->
+<!-- #{pid}-->
+<!-- </foreach>-->
+<!-- </if>-->
+<!-- <if test="isFilter == true">-->
+<!-- AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)-->
+<!-- </if>-->
+<!-- </select>-->
+
+ <!-- 浣撴鎮ｈ�呮�绘暟缁熻锛堝幓閲嶏級 -->
+ <select id="countPatArchiveInfoByPhysicalQC" parameterType="com.smartor.domain.PatArchiveReq" resultType="long">
+ SELECT COUNT(DISTINCT a.id)
+ FROM pat_med_physical d
+ JOIN pat_archive a ON a.id = d.patid
+ 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>
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">AND d.hospitaldistrictname LIKE concat('%',#{hospitaldistrictname}, '%')</if>
+ <if test="diagname != null and diagname != ''">AND d.diagname LIKE concat('%',#{diagname}, '%')</if>
+ <if test="notrequiredFlag != null and notrequiredFlag != ''">AND a.notrequired_flag = #{notrequiredFlag}</if>
+ <if test="hospitalname != null and hospitalname != ''">AND d.hospitalname = #{hospitalname}</if>
+ <if test="visitno != null and visitno != ''">AND d.physno = #{visitno}</if>
+ <if test="deptname != null and deptname != ''">AND d.deptname LIKE concat('%', #{deptname}, '%')</if>
+ <if test="drname != null and drname != ''">AND d.drname LIKE concat('%',#{drname}, '%')</if>
+ <if test="pids != null">
+ AND a.id NOT IN
+ <foreach collection="pids" item="pid" open="(" separator="," close=")">
+ #{pid}
+ </foreach>
+ </if>
+ <if test="isFilter == true">
+ AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3