From ba69dcfe19d7718449f45b3aba8e9fc75ed93025 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 15 四月 2025 15:56:14 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 117 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 79 insertions(+), 38 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 740f00d..fef487e 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -23,6 +23,7 @@
<result property="idcardno" column="idcardno"/>
<result property="birthdate" column="birthdate"/>
<result property="age" column="age"/>
+ <result property="age2" column="age2"/>
<result property="sourcefrom" column="sourcefrom"/>
<result property="archivetime" column="archivetime"/>
<result property="archiveby" column="archiveby"/>
@@ -47,6 +48,7 @@
<result property="bedNo" column="bedno"/>
<result property="inhosptime" column="inhosptime"/>
<result property="ageUnit" column="age_unit"/>
+ <result property="ageUnit2" column="age_unit2"/>
<result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
<result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
<result property="careFacilities" column="care_facilities"/>
@@ -80,6 +82,7 @@
<result property="idcardno" column="idcardno"/>
<result property="birthdate" column="birthdate"/>
<result property="age" column="age"/>
+ <result property="age2" column="age2"/>
<result property="sourcefrom" column="sourcefrom"/>
<result property="archivetime" column="archivetime"/>
<result property="archiveby" column="archiveby"/>
@@ -105,6 +108,7 @@
<result property="starttime" column="starttime"/>
<result property="endtime" column="endtime"/>
<result property="ageUnit" column="age_unit"/>
+ <result property="ageUnit2" column="age_unit2"/>
<result property="inhospno" column="inhospno"/>
<result property="nurseId" column="nurse_id"/>
<result property="nurseName" column="nurse_name"/>
@@ -122,12 +126,14 @@
patientno,
patid_his,
age_unit,
+ age_unit2,
sd_flag,
name,
sex,
idcardno,
birthdate,
age,
+ age2,
nation,
native_place,
place_of_residence,
@@ -179,6 +185,9 @@
<if test="patidHis != null ">and patid_his = #{patidHis}</if>
<if test="sdFlag != null ">and sd_flag = #{sdFlag}</if>
<if test="ageUnit != null ">and age_unit = #{ageUnit}</if>
+ <if test="age != null ">and age = #{age}</if>
+ <if test="age2 != null ">and age2 = #{age2}</if>
+ <if test="ageUnit2 != null ">and age_unit2 = #{ageUnit2}</if>
<if test="notrequiredFlag != null ">and notrequired_flag = #{notrequiredFlag}</if>
<if test="notrequiredreason != null ">and notrequiredreason = #{notrequiredreason}</if>
<if test="careFacilities != null ">and care_facilities = #{careFacilities}</if>
@@ -197,6 +206,7 @@
select
a.id,
a.age_unit,
+ a.age_unit2,
a.notrequired_flag,
a.notrequiredreason,
a.patientno,
@@ -208,6 +218,7 @@
a.idcardtype,
a.idcardno,
a.age,
+ a.age2,
a.telcode,
a.create_time,
a.update_time,
@@ -262,6 +273,7 @@
<if test="guid != null">guid,</if>
<if test="birthdate != null">birthdate,</if>
<if test="age != null">age,</if>
+ <if test="age2 != null">age2,</if>
<if test="sourcefrom != null">sourcefrom,</if>
<if test="archivetime != null">archivetime,</if>
<if test="archiveby != null">archiveby,</if>
@@ -278,6 +290,7 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="ageUnit != null">age_unit,</if>
+ <if test="ageUnit2 != null">age_unit2,</if>
<if test="notrequiredFlag != null ">notrequired_flag,</if>
<if test="notrequiredreason != null ">notrequiredreason,</if>
<if test="careFacilities != null ">care_facilities,</if>
@@ -307,6 +320,7 @@
<if test="guid != null">#{guid},</if>
<if test="birthdate != null">#{birthdate},</if>
<if test="age != null">#{age},</if>
+ <if test="age2 != null">#{age2},</if>
<if test="sourcefrom != null">#{sourcefrom},</if>
<if test="archivetime != null">#{archivetime},</if>
<if test="archiveby != null">#{archiveby},</if>
@@ -323,6 +337,7 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="ageUnit != null">#{ageUnit},</if>
+ <if test="ageUnit2 != null">#{ageUnit2},</if>
<if test="notrequiredFlag != null ">#{notrequiredFlag},</if>
<if test="notrequiredreason != null ">#{notrequiredreason},</if>
<if test="careFacilities != null ">#{careFacilities},</if>
@@ -338,15 +353,15 @@
<insert id="insertPatArchive">
insert into
- pat_archive(name,viptype,sex,idcardno,birthdate,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,nation,birthplace,native_place,patientno,patid_his,sd_flag,age_unit,notrequired_flag,notrequiredreason,care_facilities,case_path,
+ 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)
values
<foreach item="item" index="index" collection="list" separator=",">
- (#{item.name},#{item.viptype},#{item.sex},#{item.idcardno},#{item.birthdate},#{item.placeOfResidence},#{item.age},#{item.sourcefrom},#{item.archivetime},#{item.archiveby}
+ (#{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.notrequiredFlag},#{item.notrequiredreason}
+ #{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})
</foreach>
</insert>
@@ -361,6 +376,7 @@
<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="age2 != null">age2 = #{age2},</if>
<if test="sourcefrom != null">sourcefrom = #{sourcefrom},</if>
<if test="archivetime != null">archivetime = #{archivetime},</if>
<if test="archiveby != null">archiveby = #{archiveby},</if>
@@ -381,6 +397,7 @@
<if test="viptype != null">patid_his = #{patidHis},</if>
<if test="viptype != null">sd_flag = #{sdFlag},</if>
<if test="ageUnit != null">age_unit = #{ageUnit},</if>
+ <if test="ageUnit2 != null">age_unit2 = #{ageUnit2},</if>
<if test="notrequiredFlag != null ">notrequired_flag = #{notrequiredFlag},</if>
<if test="notrequiredreason != null ">notrequiredreason = #{notrequiredreason},</if>
<if test="careFacilities != null ">care_facilities = #{careFacilities},</if>
@@ -396,18 +413,20 @@
where id = #{id}
</update>
- <delete id="deletePatArchiveByPatid" parameterType="Long">
- delete
- from pat_archive
+ <update id="deletePatArchiveByPatid" parameterType="Long">
+ update pat_archive
+ <trim prefix="SET" suffixOverrides=",">
+ del_flag =1
+ </trim>
where id = #{id}
- </delete>
+ </update>
- <delete id="deletePatArchiveByPatids" parameterType="String">
- delete from pat_archive where id in
+ <update id="deletePatArchiveByPatids" parameterType="String">
+ update pat_archive set del_flag =1 where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
- </delete>
+ </update>
<select id="selectPatArchiveInfoByAllhosp" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveOthreInfoResult">
@@ -415,6 +434,7 @@
SELECT
a.id,
a.age_unit,
+ a.age_unit2,
a.patid_his,
a.notrequired_flag,
a.notrequiredreason,
@@ -428,6 +448,7 @@
a.birthplace,
a.idcardno,
a.birthdate,
+ a.age2,
a.age,
a.sourcefrom,
a.archivetime,
@@ -453,6 +474,7 @@
LEFT JOIN pat_archivetag b ON a.id = b.patid AND b.del_flag = 0
<where>
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}
@@ -464,7 +486,6 @@
#{tagId}
</foreach>
</if>
-
</where>
order by a.update_time desc
</select>
@@ -472,10 +493,10 @@
<select id="selectPatArchiveInfoByInhosp" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveOthreInfoResult">
-
select
a.id,
a.age_unit,
+ a.age_unit2,
a.inhospno,
a.notrequired_flag,
a.notrequiredreason,
@@ -495,6 +516,7 @@
a.idcardno,
a.birthdate,
a.age,
+ a.age2,
a.sourcefrom,
a.archivetime,
a.archiveby,
@@ -517,7 +539,6 @@
d.endtime,
d.nurse_name,
d.nurse_id,
- d.endtime,
d.out_way_id,
d.leavehospitaldistrictname AS leavehospitaldistrictname,
d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
@@ -525,11 +546,12 @@
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 GROUP BY patid ) t ON t.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>
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>
@@ -577,6 +599,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=")">
@@ -592,10 +629,10 @@
<select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveOthreInfoResult">
-
select
a.id,
a.age_unit,
+ a.age_unit2,
a.patid_his,
a.sd_flag,
a.patientno,
@@ -614,6 +651,7 @@
a.idcardno,
a.birthdate,
a.age,
+ a.age2,
a.viptype,
a.sourcefrom,
a.archivetime,
@@ -630,15 +668,15 @@
a.create_time,
a.isupload,
a.upload_time,
- d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
- d.leavehospitaldistrictname AS leavehospitaldistrictname,
+ 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 GROUP BY patid ) t ON t.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>
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="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -659,9 +697,6 @@
</if>
<if test="deptname != null and deptname != ''">
and d.deptname LIKE concat('%', #{deptname}, '%')
- </if>
- <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
- and d.leavehospitaldistrictname LIKE concat('%', #{leavehospitaldistrictname}, '%')
</if>
<if test="drname != null and drname != ''">
AND d.drname LIKE concat('%',#{drname}, '%')
@@ -685,6 +720,7 @@
select
a.id,
a.age_unit,
+ a.age_unit2,
a.name,
a.notrequired_flag,
a.notrequiredreason,
@@ -704,6 +740,7 @@
a.idcardno,
a.birthdate,
a.age,
+ a.age2,
a.sourcefrom,
a.archivetime,
a.archiveby,
@@ -719,13 +756,15 @@
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 GROUP BY patid ) t ON t.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>
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="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -768,9 +807,10 @@
resultMap="PatArchiveOthreInfoResult">
select
- distinct a.idcardno,
+ a.idcardno,
a.id,
a.age_unit,
+ a.age_unit2,
a.inhospno,
a.notrequired_flag,
a.notrequiredreason,
@@ -789,6 +829,7 @@
a.birthplace,
a.birthdate,
a.age,
+ a.age2,
a.sourcefrom,
a.archivetime,
a.archiveby,
@@ -818,11 +859,12 @@
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 GROUP BY patid ) t ON t.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>
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>
@@ -853,9 +895,6 @@
<if test="diagname != null and diagname != ''">
AND d.diagname LIKE concat('%',#{diagname}, '%')
</if>
- <if test="deptname != null and deptname != ''">
- AND d.deptname LIKE concat('%',#{deptname}, '%')
- </if>
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size()>0">
AND d.leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
@@ -880,16 +919,16 @@
AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
</if>
</where>
- order by a.update_time desc
</select>
<select id="selectPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveOthreInfoResult">
select
- distinct a.idcardno,
+ a.idcardno,
a.id,
a.age_unit,
+ a.age_unit2,
a.patid_his,
a.sd_flag,
a.patientno,
@@ -907,6 +946,7 @@
a.birthplace,
a.birthdate,
a.age,
+ a.age2,
a.viptype,
a.sourcefrom,
a.archivetime,
@@ -923,15 +963,15 @@
a.create_time,
a.isupload,
a.upload_time,
- d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
- d.leavehospitaldistrictname AS leavehospitaldistrictname,
+ 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 GROUP BY patid ) t ON t.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>
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="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
@@ -953,9 +993,6 @@
<if test="deptname != null and deptname != ''">
and d.deptname LIKE concat('%', #{deptname}, '%')
</if>
- <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
- and d.leavehospitaldistrictname LIKE concat('%', #{leavehospitaldistrictname}, '%')
- </if>
<if test="drname != null and drname != ''">
AND d.drname LIKE concat('%',#{drname}, '%')
</if>
@@ -976,9 +1013,10 @@
resultMap="PatArchiveOthreInfoResult">
select
- distinct a.idcardno,
+ a.idcardno,
a.id,
a.age_unit,
+ a.age_unit2,
a.name,
a.notrequired_flag,
a.notrequiredreason,
@@ -997,6 +1035,7 @@
a.viptype,
a.birthdate,
a.age,
+ a.age2,
a.sourcefrom,
a.archivetime,
a.archiveby,
@@ -1012,13 +1051,15 @@
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 GROUP BY patid ) t ON t.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>
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="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and a.idcardno = #{idcardno}</if>
--
Gitblit v1.9.3