From 6393d6ba70099f1b47f4124e06426f016fb28052 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 01 七月 2025 14:59:58 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 186 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 148 insertions(+), 38 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index ecb1f0f..2b6dc92 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"/>
@@ -58,6 +60,8 @@
<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"/>
</resultMap>
@@ -80,6 +84,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 +110,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"/>
@@ -113,6 +119,10 @@
<result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
<result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
<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"/>
</resultMap>
<sql id="selectPatArchiveVo">
@@ -120,14 +130,18 @@
notrequired_flag,
notrequiredreason,
patientno,
+ filter_drname,
+ filter_drcode,
patid_his,
age_unit,
+ age_unit2,
sd_flag,
name,
sex,
idcardno,
birthdate,
age,
+ age2,
nation,
native_place,
place_of_residence,
@@ -179,6 +193,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>
@@ -189,6 +206,8 @@
<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>
</where>
</select>
@@ -197,6 +216,7 @@
select
a.id,
a.age_unit,
+ a.age_unit2,
a.notrequired_flag,
a.notrequiredreason,
a.patientno,
@@ -208,6 +228,7 @@
a.idcardtype,
a.idcardno,
a.age,
+ a.age2,
a.telcode,
a.create_time,
a.update_time,
@@ -220,11 +241,15 @@
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>
@@ -262,6 +287,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 +304,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>
@@ -288,6 +315,8 @@
<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>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="patientno != null">#{patientno},</if>
@@ -307,6 +336,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 +353,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>
@@ -333,21 +364,23 @@
<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>
</trim>
</insert>
<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,
- degree_of_education,marital_status,income,medicare_type,care_person,case_person_age)
+ 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)
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.careFacilities},#{item.casePath},#{item.degreeOfEducation},#{item.maritalStatus},#{item.income},#{item.medicareType},#{item.carePerson},#{item.casePersonAge})
+ #{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})
</foreach>
</insert>
@@ -361,6 +394,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 +415,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>
@@ -392,22 +427,26 @@
<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>
</trim>
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 +454,7 @@
SELECT
a.id,
a.age_unit,
+ a.age_unit2,
a.patid_his,
a.notrequired_flag,
a.notrequiredreason,
@@ -428,6 +468,7 @@
a.birthplace,
a.idcardno,
a.birthdate,
+ a.age2,
a.age,
a.sourcefrom,
a.archivetime,
@@ -446,6 +487,8 @@
a.upload_time,
a.viptype,
a.pattype,
+ a.filter_drname,
+ a.filter_drcode,
b.tagname AS tag,
b.tagid AS tagid
FROM
@@ -453,6 +496,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 +508,6 @@
#{tagId}
</foreach>
</if>
-
</where>
order by a.update_time desc
</select>
@@ -472,10 +515,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 +538,7 @@
a.idcardno,
a.birthdate,
a.age,
+ a.age2,
a.sourcefrom,
a.archivetime,
a.archiveby,
@@ -512,12 +556,13 @@
a.isupload,
a.upload_time,
a.pattype,
+ a.filter_drname,
+ a.filter_drcode,
d.bed_no,
d.starttime,
d.endtime,
d.nurse_name,
d.nurse_id,
- d.endtime,
d.out_way_id,
d.leavehospitaldistrictname AS leavehospitaldistrictname,
d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
@@ -525,11 +570,13 @@
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 +624,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 +654,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 +676,7 @@
a.idcardno,
a.birthdate,
a.age,
+ a.age2,
a.viptype,
a.sourcefrom,
a.archivetime,
@@ -630,13 +693,18 @@
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 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>
@@ -680,6 +748,7 @@
select
a.id,
a.age_unit,
+ a.age_unit2,
a.name,
a.notrequired_flag,
a.notrequiredreason,
@@ -699,6 +768,7 @@
a.idcardno,
a.birthdate,
a.age,
+ a.age2,
a.sourcefrom,
a.archivetime,
a.archiveby,
@@ -714,13 +784,18 @@
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
- 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>
@@ -761,11 +836,12 @@
<select id="selectPatArchiveInfoByInhospQC" parameterType="com.smartor.domain.PatArchiveReq"
resultMap="PatArchiveOthreInfoResult">
-
+ select * from (
select
- distinct a.idcardno,
+ a.idcardno,
a.id,
a.age_unit,
+ a.age_unit2,
a.inhospno,
a.notrequired_flag,
a.notrequiredreason,
@@ -777,6 +853,8 @@
d.deptcode,
d.drcode,
d.drname,
+ d.leavediagname,
+ d.leaveicd10code,
a.sex,
a.nation,
a.native_place,
@@ -784,6 +862,7 @@
a.birthplace,
a.birthdate,
a.age,
+ a.age2,
a.sourcefrom,
a.archivetime,
a.archiveby,
@@ -801,6 +880,8 @@
a.isupload,
a.upload_time,
a.pattype,
+ a.filter_drname,
+ a.filter_drcode,
d.bed_no,
d.starttime,
d.endtime,
@@ -813,11 +894,13 @@
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>
@@ -836,20 +919,16 @@
<if test="endtime != null">
AND d.endtime = #{endtime}
</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="visitno != null and visitno != ''">
AND d.inhospno = #{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="diagname != null and diagname != ''">
- AND d.diagname LIKE concat('%',#{diagname}, '%')
- </if>
- <if test="deptname != null and deptname != ''">
- AND d.deptname LIKE concat('%',#{deptname}, '%')
+ <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
@@ -865,6 +944,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=")">
@@ -875,16 +969,17 @@
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.id,a.update_time desc ) as tmp order by endtime 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,
@@ -901,7 +996,10 @@
a.place_of_residence,
a.birthplace,
a.birthdate,
+ -- a.icd10code as leaveicd10code,
+ -- a.diagname as leavediagname,
a.age,
+ a.age2,
a.viptype,
a.sourcefrom,
a.archivetime,
@@ -918,13 +1016,18 @@
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 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>
@@ -934,8 +1037,8 @@
</if>
<if test="notrequiredFlag != null and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
</if>
- <if test="diagname != null and diagname != ''">
- AND d.diagname LIKE concat('%',#{diagname}, '%')
+ <if test="leavediagname != null and leavediagname != ''">
+ AND d.diagname LIKE concat('%',#{leavediagname}, '%')
</if>
<if test="hospitalname != null and hospitalname != ''">
AND d.hospitalname = #{hospitalname}
@@ -966,9 +1069,10 @@
resultMap="PatArchiveOthreInfoResult">
select
- distinct a.idcardno,
+ a.idcardno,
a.id,
a.age_unit,
+ a.age_unit2,
a.name,
a.notrequired_flag,
a.notrequiredreason,
@@ -987,6 +1091,9 @@
a.viptype,
a.birthdate,
a.age,
+ a.filter_drname,
+ a.filter_drcode,
+ a.age2,
a.sourcefrom,
a.archivetime,
a.archiveby,
@@ -1002,13 +1109,16 @@
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