From 6659135780e718758417efde4c8c351c69e3755b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 11 十二月 2025 15:52:19 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml | 150 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 143 insertions(+), 7 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 7bfeba3..68bc33f 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -39,11 +39,15 @@
<result property="idcardno" column="idcardno"/>
<result property="remark" column="remark"/>
<result property="fudate" column="fudate"/>
+ <result property="serverState" column="server_state"/>
+ <result property="campusid" column="campusid"/>
</resultMap>
<sql id="selectPatMedOuthospVo">
select id,
outhospno,
+ campusid,
+ server_state,
diagcheck_flag,
patno,
remark,
@@ -82,8 +86,10 @@
resultMap="PatMedOuthospResult">
select
pmo.id,
+ pmo.campusid,
pmo.remark,
pmo.fudate,
+ pmo.server_state,
pmo.outhospno,
pmo.diagcheck_flag,
pmo.patno,
@@ -113,17 +119,23 @@
pmo.hpi,
pmo.fuflag,
pmo.patname,
- CONCAT(pa.age,pa.age_unit,pa.age2,pa.age_unit2) AS age,
- pa.telcode,
- pmo.mainsuit,
- pa.idcardno
- from pat_med_outhosp pmo left join pat_archive pa on pmo.patid = pa.id
+ pmo.mainsuit
+ from pat_med_outhosp pmo
<where>
pmo.del_flag=0
<if test="orgid != null ">and pmo.orgid = #{orgid}</if>
+ <if test="serialnum != null ">and pmo.serialnum = #{serialnum}</if>
+ <if test="serverState != null ">and pmo.server_state = #{serverState}</if>
<if test="hospitalname != null and hospitalname != ''">and pmo.hospitalname like concat('%',
#{hospitalname},
'%')
+ </if>
+ <if test="deptcodes != null and deptcodes.size()>0">
+ AND pmo.deptcode IN
+ <foreach collection="deptcodes" item="deptcode" open="(" separator=","
+ close=")">
+ #{deptcode}
+ </foreach>
</if>
<if test="deptname != null and deptname != ''">and pmo.deptname like concat('%', #{deptname}, '%')</if>
<if test="drname != null and drname != ''">and pmo.drname like concat('%', #{drname}, '%')</if>
@@ -135,6 +147,7 @@
date_format(#{endTime},'%y%m%d')
</if>
<if test="patid != null ">and pmo.patid = #{patid}</if>
+ <if test="campusid != null ">and pmo.campusid = #{campusid}</if>
<if test="fuflag != null ">and pmo.fuflag = #{fuflag}</if>
<if test="patno != null ">and pmo.patno = #{patno}</if>
<if test="outhospno != null and outhospno != ''">and pmo.outhospno = #{outhospno}</if>
@@ -185,6 +198,8 @@
<if test="remark != null">remark,</if>
<if test="fuflag != null">fuflag,</if>
<if test="fudate != null">fudate,</if>
+ <if test="campusid != null">campusid,</if>
+ <if test="serverState != null">server_state,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialnum != null">#{serialnum},</if>
@@ -219,6 +234,8 @@
<if test="remark != null">#{remark},</if>
<if test="fuflag != null">#{fuflag},</if>
<if test="fudate != null">#{fudate},</if>
+ <if test="campusid != null">#{campusid},</if>
+ <if test="serverState != null">#{serverState},</if>
</trim>
</insert>
@@ -256,6 +273,8 @@
diagcheck_flag,
fuflag,
fudate,
+ campusid,
+ server_state,
remark)
values
<foreach collection="list" item="item" separator=",">
@@ -291,6 +310,86 @@
#{item.diagcheckFlag},
#{item.fuflag},
#{item.fudate},
+ #{item.campusid},
+ #{item.serverState},
+ #{item.remark}
+ )
+ </foreach>
+ </insert>
+
+ <insert id="batchInsertIgnore">
+ insert ignore into pat_med_outhosp
+ (
+ serialnum,
+ patid,
+ hospitalname,
+ hospitalcode,
+ icd10code,
+ diagname,
+ deptcode,
+ deptname,
+ drcode,
+ drname,
+ admitdate,
+ orgid,
+ del_flag,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ schemestatus,
+ deptid,
+ schemetime,
+ hpi,
+ mainsuit,
+ outhospno,
+ patname,
+ guid,
+ patno,
+ diagcheck_flag,
+ fuflag,
+ fudate,
+ campusid,
+ server_state,
+ remark)
+ values
+ <foreach collection="list" item="item" separator=",">
+ (
+ #{item.serialnum},
+ #{item.patid},
+ #{item.hospitalname},
+ #{item.hospitalcode},
+ #{item.icd10code},
+ #{item.diagname},
+ #{item.deptcode},
+ #{item.deptname},
+ #{item.drcode},
+ #{item.drname},
+ #{item.admitdate},
+ #{item.orgid},
+ #{item.delFlag},
+ #{item.updateBy},
+ #{item.updateTime},
+ #{item.createBy},
+ #{item.createTime},
+ #{item.isupload},
+ #{item.uploadTime},
+ #{item.schemestatus},
+ #{item.deptid},
+ #{item.schemetime},
+ #{item.hpi},
+ #{item.mainsuit},
+ #{item.outhospno},
+ #{item.patname},
+ #{item.guid},
+ #{item.patno},
+ #{item.diagcheckFlag},
+ #{item.fuflag},
+ #{item.fudate},
+ #{item.campusid},
+ #{item.serverState},
#{item.remark}
)
</foreach>
@@ -332,6 +431,8 @@
<if test="remark != null">remark = #{remark},</if>
<if test="fuflag != null">fuflag = #{fuflag},</if>
<if test="fudate != null">fudate = #{fudate},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
+ <if test="serverState != null">server_state = #{serverState},</if>
</trim>
where id = #{id}
</update>
@@ -351,13 +452,19 @@
<select id="selectPatMedOuthospCount" parameterType="com.smartor.domain.PatMedReq"
resultType="com.smartor.domain.PatMedRes">
+ SELECT SUM( rs ) AS rs,
+ SUM( rc ) AS rc
+ FROM (
SELECT
COUNT(id) AS rc,
- COUNT(DISTINCT patid) AS rs
+ 0 AS rs
FROM
pat_med_outhosp
<where>
del_flag=0
+ <if test="orgid != null">
+ and orgid = #{orgid}
+ </if>
and date_format(admitdate,'%y%m%d') >= date_format(#{startDate},'%y%m%d')
and date_format(admitdate,'%y%m%d') <= date_format(#{endDate},'%y%m%d')
<if test="deptcodeList != null and deptcodeList.size()>0">
@@ -367,6 +474,32 @@
</foreach>
</if>
</where>
+ union all
+ select
+ 0 AS rc,
+ count(1) AS rs
+ FROM
+ service_subtask
+ <where>
+ del_flag = 0
+ and service_type=3
+ <if test="orgid != null">
+ and orgid = #{orgid}
+ </if>
+ <if test="startDate != null">
+ AND date_format( visit_time, '%y%m%d' ) >= date_format( #{startDate}, '%y%m%d' )
+ </if>
+ <if test="endDate != null">
+ AND date_format( visit_time, '%y%m%d' ) <= date_format(#{endDate},'%y%m%d')
+ </if>
+ <if test="deptcodeList != null and deptcodeList.size()>0">
+ and deptcode in
+ <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
+ #{deptcode}
+ </foreach>
+ </if>
+ </where>
+ ) AS combined_data
</select>
<select id="getDeptRanking" parameterType="com.smartor.domain.PatMedReq" resultType="com.smartor.domain.PatMedRes">
@@ -374,9 +507,12 @@
FROM pat_med_outhosp
<where>
del_flag=0
- <if test="inhospstate != inhospstate">
+ <if test="inhospstate != null">
and inhospstate= #{inhospstate}
</if>
+ <if test="serverState != null">
+ and server_state= #{inhospstate}
+ </if>
<if test="deptcodeList != null and deptcodeList.size()>0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
--
Gitblit v1.9.3