From 78c9129e9045fafe4c2f7333b3dcafde6b20b96d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 十二月 2024 15:20:51 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 394 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 328 insertions(+), 66 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 78c168a..a3e5189 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -6,6 +6,14 @@
<resultMap type="com.smartor.domain.PatArchive" id="PatArchiveResult">
<result property="id" column="id"/>
+ <result property="patientno" column="patientno"/>
+ <result property="sourcefrom" column="sourcefrom"/>
+ <result property="notrequiredFlag" column="notrequired_flag"/>
+ <result property="notrequiredreason" column="notrequiredreason"/>
+ <result property="patidHis" column="patid_his"/>
+ <result property="sdFlag" column="sd_flag"/>
+ <result property="pattype" column="pattype"/>
+ <result property="viptype" column="viptype"/>
<result property="name" column="name"/>
<result property="sex" column="sex"/>
<result property="nation" column="nation"/>
@@ -25,6 +33,9 @@
<result property="openid" column="openid"/>
<result property="delFlag" column="del_flag"/>
<result property="dept" column="deptname"/>
+ <result property="deptcode" column="deptcode"/>
+ <result property="drcode" column="drcode"/>
+ <result property="drname" column="drname"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
@@ -35,11 +46,81 @@
<result property="pattype" column="pattype"/>
<result property="bedNo" column="bedno"/>
<result property="inhosptime" column="inhosptime"/>
+ <result property="ageUnit" column="age_unit"/>
+ <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
+ <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
+ <result property="careFacilities" column="care_facilities"/>
+ <result property="casePath" column="case_path"/>
+ <result property="degreeOfEducation" column="degree_of_education"/>
+ <result property="maritalStatus" column="marital_status"/>
+ <result property="income" column="income"/>
+ <result property="medicareType" column="medicare_type"/>
+ <result property="carePerson" column="care_person"/>
+ <result property="casePersonAge" column="case_person_age"/>
+ </resultMap>
+
+
+ <resultMap type="com.smartor.domain.PatArchiveOthreInfo" id="PatArchiveOthreInfoResult">
+ <result property="id" column="id"/>
+ <result property="notrequiredFlag" column="notrequired_flag"/>
+ <result property="notrequiredreason" column="notrequiredreason"/>
+ <result property="patientno" column="patientno"/>
+ <result property="sourcefrom" column="sourcefrom"/>
+ <result property="patidHis" column="patid_his"/>
+ <result property="sdFlag" column="sd_flag"/>
+ <result property="pattype" column="pattype"/>
<result property="viptype" column="viptype"/>
+ <result property="name" column="name"/>
+ <result property="sex" column="sex"/>
+ <result property="nation" column="nation"/>
+ <result property="nativePlace" column="native_place"/>
+ <result property="placeOfResidence" column="place_of_residence"/>
+ <result property="birthplace" column="birthplace"/>
+ <result property="idcardno" column="idcardno"/>
+ <result property="birthdate" column="birthdate"/>
+ <result property="age" column="age"/>
+ <result property="sourcefrom" column="sourcefrom"/>
+ <result property="archivetime" column="archivetime"/>
+ <result property="archiveby" column="archiveby"/>
+ <result property="telcode" column="telcode"/>
+ <result property="relativetelcode" column="relativetelcode"/>
+ <result property="idcardtype" column="idcardtype"/>
+ <result property="orgid" column="orgid"/>
+ <result property="openid" column="openid"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="dept" column="deptname"/>
+ <result property="deptcode" column="deptcode"/>
+ <result property="drcode" column="drcode"/>
+ <result property="drname" column="drname"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
+ <result property="tag" column="tag"/>
+ <result property="pattype" column="pattype"/>
+ <result property="bedNo" column="bedno"/>
+ <result property="starttime" column="starttime"/>
+ <result property="endtime" column="endtime"/>
+ <result property="ageUnit" column="age_unit"/>
+ <result property="inhospno" column="inhospno"/>
+ <result property="nurseId" column="nurse_id"/>
+ <result property="nurseName" column="nurse_name"/>
+ <result property="outWayName" column="out_way_name"/>
+ <result property="outWayId" column="out_way_id"/>
+ <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
+ <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
</resultMap>
<sql id="selectPatArchiveVo">
select id,
+ notrequired_flag,
+ notrequiredreason,
+ patientno,
+ patid_his,
+ age_unit,
+ sd_flag,
name,
sex,
idcardno,
@@ -65,13 +146,22 @@
isupload,
pattype,
viptype,
- upload_time
+ upload_time,
+ care_facilities,
+ case_path,
+ degree_of_education,
+ marital_status,
+ income,
+ medicare_type,
+ care_person,
+ case_person_age
from pat_archive
</sql>
<select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
<where>
+ 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>
@@ -81,6 +171,21 @@
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="viptype != null ">and viptype = #{viptype}</if>
+ <if test="pattype != null ">and pattype = #{pattype}</if>
+ <if test="patientno != null ">and patientno = #{patientno}</if>
+ <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="notrequiredFlag != null ">and notrequired_flag = #{notrequiredFlag}</if>
+ <if test="notrequiredreason != null ">and notrequiredreason = #{notrequiredreason}</if>
+ <if test="careFacilities != null ">and care_facilities = #{careFacilities}</if>
+ <if test="casePath != null ">and case_path = #{casePath}</if>
+ <if test="degreeOfEducation != null ">and degree_of_education = #{degreeOfEducation}</if>
+ <if test="maritalStatus != null ">and marital_status = #{maritalStatus}</if>
+ <if test="income != null ">and income = #{income}</if>
+ <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>
</where>
</select>
@@ -88,6 +193,12 @@
<select id="patInfoByContion" parameterType="com.smartor.domain.PatArchiveReq" resultMap="PatArchiveResult">
select
a.id,
+ a.age_unit,
+ a.notrequired_flag,
+ a.notrequiredreason,
+ a.patientno,
+ a.patid_his,
+ a.sd_flag,
a.name,
a.sex,
c.tagname as tag,
@@ -98,7 +209,15 @@
a.create_time,
a.update_time,
a.viptype,
- a.birthdate
+ a.birthdate,
+ a.care_facilities,
+ a.case_path,
+ a.degree_of_education,
+ a.marital_status,
+ a.income,
+ a.medicare_type,
+ a.care_person,
+ a.case_person_age
from pat_archive a,pat_archivetag b ,base_tag c
<where>
a.del_flag=0 and
@@ -119,63 +238,113 @@
where id = #{id} and del_flag=0
</select>
- <insert id="insertPatArchive">
- <!-- insert into pat_archive-->
- <!-- <trim prefix="(" suffix=")" suffixOverrides=",">-->
- <!-- name,-->
- <!-- sex,-->
- <!-- iccardno-->
- <!--<!– <if test="birthdate != null">birthdate,</if>–>-->
- <!--<!– <if test="age != null">age,</if>–>-->
- <!--<!– <if test="sourcefrom != null">sourcefrom,</if>–>-->
- <!--<!– <if test="archivetime != null">archivetime,</if>–>-->
- <!--<!– <if test="archiveby != null">archiveby,</if>–>-->
- <!--<!– <if test="telcode != null">telcode,</if>–>-->
- <!--<!– <if test="relativetelcode != null">relativetelcode,</if>–>-->
- <!--<!– <if test="iccardtype != null">iccardtype,</if>–>-->
- <!--<!– <if test="orgid != null">orgid,</if>–>-->
- <!--<!– <if test="openid != null">openid,</if>–>-->
- <!--<!– <if test="delFlag != null and delFlag != ''">del_flag,</if>–>-->
- <!--<!– <if test="updateBy != null">update_by,</if>–>-->
- <!--<!– <if test="updateTime != null">update_time,</if>–>-->
- <!--<!– <if test="createBy != null">create_by,</if>–>-->
- <!--<!– <if test="createTime != null">create_time,</if>–>-->
- <!--<!– <if test="isupload != null">isupload,</if>–>-->
- <!--<!– <if test="uploadTime != null">upload_time,</if>–>-->
- <!-- </trim>-->
- <!-- <trim prefix="values (" suffix=")" suffixOverrides=",">-->
- <!-- <foreach item="item" index="index" collection="list" separator=",">-->
- <!-- <if test="name != null">#{item.name},</if>-->
- <!-- <if test="sex != null">#{item.sex},</if>-->
- <!-- <if test="iccardno != null">#{item.iccardno},</if>-->
- <!--<!– <if test="birthdate != null">#{birthdate},</if>–>-->
- <!--<!– <if test="age != null">#{item.age},</if>–>-->
- <!--<!– <if test="sourcefrom != null">#{item.sourcefrom},</if>–>-->
- <!--<!– <if test="archivetime != null">#{item.archivetime},</if>–>-->
- <!--<!– <if test="archiveby != null">#{item.archiveby},</if>–>-->
- <!--<!– <if test="telcode != null">#{item.telcode},</if>–>-->
- <!--<!– <if test="relativetelcode != null">#{item.relativetelcode},</if>–>-->
- <!--<!– <if test="iccardtype != null">#{item.iccardtype},</if>–>-->
- <!--<!– <if test="orgid != null">#{item.orgid},</if>–>-->
- <!--<!– <if test="openid != null">#{item.openid},</if>–>-->
- <!--<!– <if test="delFlag != null and delFlag != ''">#{item.delFlag},</if>–>-->
- <!--<!– <if test="updateBy != null">#{item.updateBy},</if>–>-->
- <!--<!– <if test="updateTime != null">#{item.updateTime},</if>–>-->
- <!--<!– <if test="createBy != null">#{item.createBy},</if>–>-->
- <!--<!– <if test="createTime != null">#{item.createTime},</if>–>-->
- <!--<!– <if test="isupload != null">#{item.isupload},</if>–>-->
- <!--<!– <if test="uploadTime != null">#{item.uploadTime},</if>–>-->
- <!-- </foreach>-->
- <!-- </trim>-->
+ <insert id="insertPatArchiveSingle" parameterType="com.smartor.domain.PatArchive" useGeneratedKeys="true"
+ keyProperty="id">
+ insert into pat_archive
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="patientno != null">patientno,</if>
+ <if test="patidHis != null">patid_his,</if>
+ <if test="sdFlag != null">sd_flag,</if>
+ <if test="pattype != null">pattype,</if>
+ <if test="viptype != null">viptype,</if>
+ <if test="name != null">name,</if>
+ <if test="sex != null">sex,</if>
+ <if test="nation != null">nation,</if>
+ <if test="nativePlace != null">native_place,</if>
+ <if test="placeOfResidence != null">place_of_residence,</if>
+ <if test="birthplace != null">birthplace,</if>
+ <if test="idcardno != null">idcardno,</if>
+ <if test="dduserid != null">dduserid,</if>
+ <if test="pid != null">pid,</if>
+ <if test="guid != null">guid,</if>
+ <if test="birthdate != null">birthdate,</if>
+ <if test="age != null">age,</if>
+ <if test="sourcefrom != null">sourcefrom,</if>
+ <if test="archivetime != null">archivetime,</if>
+ <if test="archiveby != null">archiveby,</if>
+ <if test="telcode != null">telcode,</if>
+ <if test="relativetelcode != null">relativetelcode,</if>
+ <if test="idcardtype != null">idcardtype,</if>
+ <if test="orgid != null">orgid,</if>
+ <if test="openid != null">openid,</if>
+ <if test="delFlag != null and delFlag != ''">del_flag,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="isupload != null">isupload,</if>
+ <if test="uploadTime != null">upload_time,</if>
+ <if test="ageUnit != null">age_unit,</if>
+ <if test="notrequiredFlag != null ">notrequired_flag,</if>
+ <if test="notrequiredreason != null ">notrequiredreason,</if>
+ <if test="careFacilities != null ">care_facilities,</if>
+ <if test="casePath != null ">case_path,</if>
+ <if test="degreeOfEducation != null ">degree_of_education,</if>
+ <if test="maritalStatus != null ">marital_status,</if>
+ <if test="income != null ">income,</if>
+ <if test="medicareType != null ">medicare_type,</if>
+ <if test="carePerson != null ">care_person,</if>
+ <if test="casePersonAge != null ">case_person_age,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="patientno != null">#{patientno},</if>
+ <if test="patidHis != null">#{patidHis},</if>
+ <if test="sdFlag != null">#{sdFlag},</if>
+ <if test="pattype != null">#{pattype},</if>
+ <if test="viptype != null">#{>viptype},</if>
+ <if test="name != null">#{name},</if>
+ <if test="sex != null">#{sex},</if>
+ <if test="nation != null">#{nation},</if>
+ <if test="nativePlace != null">#{nativePlace},</if>
+ <if test="placeOfResidence != null">#{placeOfResidence},</if>
+ <if test="birthplace != null">#{birthplace},</if>
+ <if test="idcardno != null">#{idcardno},</if>
+ <if test="dduserid != null">#{dduserid},</if>
+ <if test="pid != null">#{pid},</if>
+ <if test="guid != null">#{guid},</if>
+ <if test="birthdate != null">#{birthdate},</if>
+ <if test="age != null">#{age},</if>
+ <if test="sourcefrom != null">#{sourcefrom},</if>
+ <if test="archivetime != null">#{archivetime},</if>
+ <if test="archiveby != null">#{archiveby},</if>
+ <if test="telcode != null">#{telcode},</if>
+ <if test="relativetelcode != null">#{relativetelcode},</if>
+ <if test="idcardtype != null">#{idcardtype},</if>
+ <if test="orgid != null">#{orgid},</if>
+ <if test="openid != null">#{openid},</if>
+ <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="isupload != null">#{isupload},</if>
+ <if test="uploadTime != null">#{uploadTime},</if>
+ <if test="ageUnit != null">#{ageUnit},</if>
+ <if test="notrequiredFlag != null ">#{notrequiredFlag},</if>
+ <if test="notrequiredreason != null ">#{notrequiredreason},</if>
+ <if test="careFacilities != null ">#{careFacilities},</if>
+ <if test="casePath != null ">#{casePath},</if>
+ <if test="degreeOfEducation != null ">#{degreeOfEducation},</if>
+ <if test="maritalStatus != null ">#{maritalStatus},</if>
+ <if test="income != null ">#{income},</if>
+ <if test="medicareType != null ">#{medicareType},</if>
+ <if test="carePerson != null ">#{carePerson},</if>
+ <if test="casePersonAge != null ">#{casePersonAge},</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) values
+ ,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)
+ 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.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.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})
</foreach>
</insert>
@@ -205,6 +374,20 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="viptype != null">viptype = #{viptype},</if>
+ <if test="viptype != null">patientno = #{patientno},</if>
+ <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="notrequiredFlag != null ">notrequired_flag = #{notrequiredFlag},</if>
+ <if test="notrequiredreason != null ">notrequiredreason = #{notrequiredreason},</if>
+ <if test="careFacilities != null ">care_facilities = #{careFacilities},</if>
+ <if test="casePath != null ">case_path = #{casePath},</if>
+ <if test="degreeOfEducation != null ">degree_of_education = #{degreeOfEducation},</if>
+ <if test="maritalStatus != null ">marital_status = #{maritalStatus},</if>
+ <if test="income != null ">income = #{income},</if>
+ <if test="medicareType != null ">medicare_type = #{medicareType},</if>
+ <if test="carePerson != null ">care_person = #{carePerson},</if>
+ <if test="casePersonAge != null ">case_person_age = #{casePersonAge},</if>
</trim>
where id = #{id}
</update>
@@ -223,10 +406,16 @@
</delete>
<select id="selectPatArchiveInfoByAllhosp" parameterType="com.smartor.domain.PatArchiveReq"
- resultMap="PatArchiveResult">
+ resultMap="PatArchiveOthreInfoResult">
SELECT
a.id,
+ a.age_unit,
+ a.patid_his,
+ a.notrequired_flag,
+ a.notrequiredreason,
+ a.sd_flag,
+ a.patientno,
a.NAME,
a.sex,
a.nation,
@@ -262,6 +451,8 @@
a.del_flag = 0
<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="telcode != null and telcode != ''">and a.telcode = #{telcode}</if>
<if test="tagIds != null and tagIds != ''">and b.tagid in
@@ -271,16 +462,27 @@
</if>
</where>
+ order by a.update_time desc
</select>
<select id="selectPatArchiveInfoByInhosp" parameterType="com.smartor.domain.PatArchiveReq"
- resultMap="PatArchiveResult">
+ resultMap="PatArchiveOthreInfoResult">
select
a.id,
+ a.age_unit,
+ a.inhospno,
+ a.notrequired_flag,
+ a.notrequiredreason,
+ a.patid_his,
+ a.sd_flag,
+ a.patientno,
a.NAME,
d.deptname,
+ d.deptcode,
+ d.drcode,
+ d.drname,
a.sex,
a.nation,
a.native_place,
@@ -307,7 +509,14 @@
a.upload_time,
a.pattype,
d.bed_no,
- d.starttime AS inhosptime,
+ d.starttime,
+ d.endtime,
+ d.nurse_name,
+ d.nurse_id,
+ d.endtime,
+ d.out_way_id,
+ d.leavehospitaldistrictname AS leavehospitaldistrictname,
+ d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
t.tagname
FROM
pat_med_inhosp d
@@ -315,11 +524,14 @@
LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
d.patid
<where>
+ d.del_flag != 1
+ AND a.del_flag != 1
<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>
@@ -347,23 +559,48 @@
<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=","
+ 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="pids != null">
AND a.id NOT IN
<foreach collection="pids" item="pid" open="(" separator="," close=")">
#{pid}
</foreach>
</if>
- AND d.del_flag != 1
- AND a.del_flag != 1
+ <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
</select>
<select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
- resultMap="PatArchiveResult">
+ resultMap="PatArchiveOthreInfoResult">
select
a.id,
+ a.age_unit,
+ a.patid_his,
+ a.sd_flag,
+ a.patientno,
+ a.notrequired_flag,
+ a.notrequiredreason,
d.deptname,
+ d.deptcode,
+ d.drcode,
+ d.drname,
a.name,
a.sex,
a.nation,
@@ -389,17 +626,23 @@
a.create_time,
a.isupload,
a.upload_time,
+ d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
+ d.leavehospitaldistrictname AS leavehospitaldistrictname,
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 =
d.patid
<where>
+ d.del_flag != 1
+ AND a.del_flag != 1
<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>
<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="diagname != null and diagname != ''">
AND d.diagname LIKE concat('%',#{diagname}, '%')
@@ -413,6 +656,9 @@
<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>
@@ -422,19 +668,30 @@
#{pid}
</foreach>
</if>
- AND d.del_flag != 1
- AND a.del_flag != 1
+ <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
</select>
<select id="selectPatArchiveInfoByPhysical" parameterType="com.smartor.domain.PatArchiveReq"
- resultMap="PatArchiveResult">
+ resultMap="PatArchiveOthreInfoResult">
select
a.id,
+ a.age_unit,
a.name,
+ a.notrequired_flag,
+ a.notrequiredreason,
+ a.patid_his,
+ a.sd_flag,
+ a.patientno,
a.sex,
d.deptname,
+ d.deptcode,
+ d.drcode,
+ d.drname,
a.nation,
a.native_place,
a.place_of_residence,
@@ -463,6 +720,8 @@
LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid =
d.patid
<where>
+ d.del_flag != 1
+ AND a.del_flag != 1
<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>
@@ -472,6 +731,8 @@
</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}
@@ -492,10 +753,11 @@
#{pid}
</foreach>
</if>
- AND d.del_flag != 1
- AND a.del_flag != 1
+ <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
</select>
</mapper>
--
Gitblit v1.9.3