From fd6dca0c559c08129b7e0abdf67093b1a728ffd3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 29 十一月 2024 17:21:00 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 96 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 76 insertions(+), 20 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index d305d95..a3e5189 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -49,6 +49,14 @@
<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>
@@ -99,6 +107,8 @@
<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>
@@ -136,7 +146,15 @@
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>
@@ -160,6 +178,14 @@
<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>
@@ -183,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
@@ -243,6 +277,14 @@
<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>
@@ -280,19 +322,29 @@
<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,patientno,patid_his,sd_flag,age_unit,notrequired_flag,notrequiredreason)
+ ,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.patientno},#{item.patidHis},#{item.sdFlag},#{item.ageUnit},#{item.notrequiredFlag},#{item.notrequiredreason}
- )
+ #{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>
@@ -328,6 +380,14 @@
<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>
@@ -391,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
@@ -452,6 +514,7 @@
d.nurse_name,
d.nurse_id,
d.endtime,
+ d.out_way_id,
d.leavehospitaldistrictname AS leavehospitaldistrictname,
d.leavehospitaldistrictcode AS leavehospitaldistrictcode,
t.tagname
@@ -467,7 +530,8 @@
<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>
@@ -495,26 +559,14 @@
<if test="deptname != null and deptname != ''">
AND d.deptname LIKE concat('%',#{deptname}, '%')
</if>
- <if test="leavehospitaldistrictcodes != null and leaveldeptcodes != null">
- AND d.leavehospitaldistrictcode IN
- <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
- close=")">
- #{leavehospitaldistrictcode}
- </foreach>
- OR d.leaveldeptcode IN
- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
- close=")">
- #{leaveldeptcode}
- </foreach>
- </if>
- <if test="leavehospitaldistrictcodes != null and leaveldeptcodes == null">
+ <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="leavehospitaldistrictcodes == null and leaveldeptcodes != null">
+ <if test="leaveldeptcodes != null and leaveldeptcodes.size() > 0">
AND d.leaveldeptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
close=")">
@@ -589,6 +641,8 @@
<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}, '%')
@@ -678,6 +732,8 @@
<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>
--
Gitblit v1.9.3