From 63e17909e1eee7ff54c38827a4096cbad82e5dad Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 16 四月 2024 11:56:55 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index e423628..4bf4eaa 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -24,6 +24,7 @@
<result property="orgid" column="orgid"/>
<result property="openid" column="openid"/>
<result property="delFlag" column="del_flag"/>
+ <result property="dept" column="deptname"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
@@ -32,6 +33,7 @@
<result property="uploadTime" column="upload_time"/>
<result property="tag" column="tag"/>
<result property="pattype" column="pattype"/>
+ <result property="bedNo" column="bedno"/>
</resultMap>
<sql id="selectPatArchiveVo">
@@ -94,6 +96,7 @@
a.birthdate
from pat_archive a,pat_archivetag b ,base_tag c
<where>
+ a.del_flag=0 and
a.patid = b.patid and b.tagid = c.tagid
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
@@ -108,7 +111,7 @@
<select id="selectPatArchiveByPatid" parameterType="Long" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
- where patid = #{patid}
+ where patid = #{patid} and del_flag=0
</select>
<insert id="insertPatArchive">
@@ -216,6 +219,7 @@
select
c.tagname as tag,
+ b.tagid as tagid,
a.patid,
a.name,
a.sex,
@@ -266,8 +270,10 @@
select
c.tagname as tag,
+ b.tagid as tagid,
a.patid,
a.name,
+ d.deptname,
a.sex,
a.nation,
a.native_place,
@@ -291,7 +297,8 @@
a.create_time,
a.isupload,
a.upload_time,
- a.pattype
+ a.pattype,
+ d.bedno
from pat_archive a,pat_archivetag b ,base_tag c,pat_med_inhosp d
<where>
a.patid = b.patid and b.tagid = c.tagid and a.patid = d.patid
@@ -333,7 +340,9 @@
select
c.tagname as tag,
+ b.tagid as tagid,
a.patid,
+ d.deptname,
a.name,
a.sex,
a.nation,
@@ -397,9 +406,11 @@
select
c.tagname as tag,
- a.patid,
+ b.tagid as tagid,
+ a.patid as id,
a.name,
a.sex,
+ d.deptname,
a.nation,
a.native_place,
a.place_of_residence,
--
Gitblit v1.9.3