From a5c7efc90dd29fa261d7ae7eb73240ce1d88b3ce Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 06 十一月 2025 11:06:58 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml |  121 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 110 insertions(+), 11 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 80a2175..d10139b 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -60,6 +60,9 @@
         <result property="carePerson" column="care_person"/>
         <result property="casePersonAge" column="case_person_age"/>
         <result property="guid" column="guid"/>
+        <result property="filterDrname" column="filter_drname"/>
+        <result property="filterDrcode" column="filter_drcode"/>
+        <result property="campusid" column="campusid"/>
     </resultMap>
 
 
@@ -119,6 +122,9 @@
         <result property="guid" column="guid"/>
         <result property="leavediagname" column="leavediagname"/>
         <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">
@@ -126,6 +132,9 @@
                notrequired_flag,
                notrequiredreason,
                patientno,
+               campusid,
+               filter_drname,
+               filter_drcode,
                patid_his,
                age_unit,
                age_unit2,
@@ -200,6 +209,9 @@
             <if test="medicareType != null ">and medicare_type = #{medicareType}</if>
             <if test="carePerson != null ">and care_person = #{carePerson}</if>
             <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>
+            <if test="campusid != null ">and campusid = #{campusid}</if>
         </where>
     </select>
 
@@ -210,6 +222,7 @@
         a.age_unit,
         a.age_unit2,
         a.notrequired_flag,
+        a.campusid,
         a.notrequiredreason,
         a.patientno,
         a.patid_his,
@@ -233,14 +246,19 @@
         a.income,
         a.medicare_type,
         a.care_person,
+        a.filter_drname,
+        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
+            <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}
@@ -252,6 +270,15 @@
     <select id="selectPatArchiveByPatid" parameterType="Long" resultMap="PatArchiveResult">
         <include refid="selectPatArchiveVo"/>
         where id = #{id} and del_flag=0
+    </select>
+
+    <select id="selectPatArchiveByPatnos" resultMap="PatArchiveResult">
+        SELECT id, patientno
+        FROM pat_archive
+        WHERE patientno IN
+        <foreach item="patno" collection="patnos" open="(" separator="," close=")">
+            #{patno}
+        </foreach>
     </select>
 
     <insert id="insertPatArchiveSingle" parameterType="com.smartor.domain.PatArchive" useGeneratedKeys="true"
@@ -303,6 +330,9 @@
             <if test="medicareType != null ">medicare_type,</if>
             <if test="carePerson != null ">care_person,</if>
             <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>
@@ -350,21 +380,24 @@
             <if test="medicareType != null ">#{medicareType},</if>
             <if test="carePerson != null ">#{carePerson},</if>
             <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>
 
-    <insert id="insertPatArchive">
+    <insert id="insertPatArchive" useGeneratedKeys="true" keyProperty="id">
         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)
+        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.careFacilities},#{item.casePath},#{item.degreeOfEducation},#{item.maritalStatus},#{item.income},#{item.medicareType},#{item.carePerson},#{item.casePersonAge},#{item.filterDrname},#{item.filterDrcode},#{item.campusid})
         </foreach>
     </insert>
 
@@ -411,6 +444,9 @@
             <if test="carePerson != null ">care_person = #{carePerson},</if>
             <if test="casePersonAge != null ">case_person_age = #{casePersonAge},</if>
             <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>
@@ -469,6 +505,9 @@
         a.upload_time,
         a.viptype,
         a.pattype,
+        a.filter_drname,
+        a.filter_drcode,
+        a.campusid,
         b.tagname AS tag,
         b.tagid AS tagid
         FROM
@@ -482,6 +521,7 @@
             <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=")">
@@ -490,6 +530,8 @@
             </if>
         </where>
         order by a.update_time desc
+        <if test="pn != null  and ps != null">limit ${pn},${ps}</if>
+
     </select>
 
 
@@ -499,6 +541,7 @@
         a.id,
         a.age_unit,
         a.age_unit2,
+        a.campusid,
         a.inhospno,
         a.notrequired_flag,
         a.notrequiredreason,
@@ -536,6 +579,8 @@
         a.isupload,
         a.upload_time,
         a.pattype,
+        a.filter_drname,
+        a.filter_drcode,
         d.bed_no,
         d.starttime,
         d.endtime,
@@ -558,6 +603,7 @@
             <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>
@@ -627,7 +673,9 @@
                 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>
 
     <select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
@@ -637,6 +685,7 @@
         a.age_unit,
         a.age_unit2,
         a.patid_his,
+        a.campusid,
         a.sd_flag,
         a.patientno,
         a.notrequired_flag,
@@ -671,6 +720,8 @@
         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
@@ -682,6 +733,7 @@
             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>
@@ -715,7 +767,8 @@
                 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>
 
     <select id="selectPatArchiveInfoByPhysical" parameterType="com.smartor.domain.PatArchiveReq"
@@ -730,6 +783,7 @@
         a.notrequiredreason,
         a.patid_his,
         a.sd_flag,
+        a.campusid,
         a.patientno,
         a.sex,
         d.deptname,
@@ -760,6 +814,8 @@
         a.create_time,
         a.isupload,
         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
@@ -771,6 +827,7 @@
             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>
@@ -805,18 +862,20 @@
                 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>
 
     <select id="selectPatArchiveInfoByInhospQC" parameterType="com.smartor.domain.PatArchiveReq"
             resultMap="PatArchiveOthreInfoResult">
-
+        select * from (
         select
         a.idcardno,
         a.id,
         a.age_unit,
         a.age_unit2,
         a.inhospno,
+        a.campusid,
         a.notrequired_flag,
         a.notrequiredreason,
         a.patid_his,
@@ -854,6 +913,8 @@
         a.isupload,
         a.upload_time,
         a.pattype,
+        a.filter_drname,
+        a.filter_drcode,
         d.bed_no,
         d.starttime,
         d.endtime,
@@ -891,6 +952,17 @@
             <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>
@@ -914,6 +986,21 @@
                     #{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=")">
@@ -924,6 +1011,8 @@
                 AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
             </if>
         </where>
+        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
+        ) as tmp
     </select>
 
     <select id="selectPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq"
@@ -936,6 +1025,7 @@
         a.age_unit2,
         a.patid_his,
         a.sd_flag,
+        a.campusid,
         a.patientno,
         a.notrequired_flag,
         a.notrequiredreason,
@@ -950,8 +1040,6 @@
         a.place_of_residence,
         a.birthplace,
         a.birthdate,
-        a.icd10code as leaveicd10code,
-        a.diagname as leavediagname,
         a.age,
         a.age2,
         a.viptype,
@@ -970,6 +1058,8 @@
         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
@@ -981,6 +1071,7 @@
             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>
@@ -1004,6 +1095,9 @@
             <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=")">
@@ -1014,7 +1108,7 @@
                 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"
@@ -1023,6 +1117,7 @@
         select
         a.idcardno,
         a.id,
+        a.campusid,
         a.age_unit,
         a.age_unit2,
         a.name,
@@ -1043,6 +1138,8 @@
         a.viptype,
         a.birthdate,
         a.age,
+        a.filter_drname,
+        a.filter_drcode,
         a.age2,
         a.sourcefrom,
         a.archivetime,
@@ -1070,6 +1167,7 @@
             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>
@@ -1104,6 +1202,7 @@
                 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