From fe47ff909096722ba8e9172c3e1f0f7910b16909 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 21 十月 2025 14:49:18 +0800
Subject: [PATCH] 结束出院日期格式
---
smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml | 78 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 50f29e7..52f3ec3 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -7,6 +7,7 @@
<resultMap type="com.smartor.domain.PatMedOuthosp" id="PatMedOuthospResult">
<result property="id" column="id"/>
<result property="serialnum" column="serialnum"/>
+ <result property="fuflag" column="fuflag"/>
<result property="patid" column="patid"/>
<result property="hospitalname" column="hospitalname"/>
<result property="hospitalcode" column="hospitalcode"/>
@@ -37,6 +38,7 @@
<result property="diagcheckFlag" column="diagcheck_flag"/>
<result property="idcardno" column="idcardno"/>
<result property="remark" column="remark"/>
+ <result property="fudate" column="fudate"/>
</resultMap>
<sql id="selectPatMedOuthospVo">
@@ -45,6 +47,8 @@
diagcheck_flag,
patno,
remark,
+ fudate,
+ fuflag,
serialnum,
patid,
hospitalname,
@@ -79,6 +83,7 @@
select
pmo.id,
pmo.remark,
+ pmo.fudate,
pmo.outhospno,
pmo.diagcheck_flag,
pmo.patno,
@@ -106,12 +111,10 @@
pmo.deptid,
pmo.schemetime,
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>
@@ -129,9 +132,11 @@
date_format(#{endTime},'%y%m%d')
</if>
<if test="patid != null ">and pmo.patid = #{patid}</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>
<if test="diagcheckFlag != null and diagcheckFlag != ''">and pmo.diagcheck_flag = #{diagcheckFlag}</if>
+ <if test="diagname != null and diagname != ''">and pmo.diagname like concat('%',#{diagname}, '%')</if>
</where>
order by pmo.update_time desc
</select>
@@ -175,6 +180,8 @@
<if test="patno != null">patno,</if>
<if test="diagcheckFlag != null">diagcheck_flag,</if>
<if test="remark != null">remark,</if>
+ <if test="fuflag != null">fuflag,</if>
+ <if test="fudate != null">fudate,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialnum != null">#{serialnum},</if>
@@ -207,6 +214,8 @@
<if test="patno != null">#{patno},</if>
<if test="diagcheckFlag != null">#{diagcheckFlag},</if>
<if test="remark != null">#{remark},</if>
+ <if test="fuflag != null">#{fuflag},</if>
+ <if test="fudate != null">#{fudate},</if>
</trim>
</insert>
@@ -242,6 +251,8 @@
guid,
patno,
diagcheck_flag,
+ fuflag,
+ fudate,
remark)
values
<foreach collection="list" item="item" separator=",">
@@ -269,13 +280,14 @@
#{item.deptid},
#{item.schemetime},
#{item.hpi},
- #{item.hpi},
#{item.mainsuit},
#{item.outhospno},
#{item.patname},
#{item.guid},
#{item.patno},
#{item.diagcheckFlag},
+ #{item.fuflag},
+ #{item.fudate},
#{item.remark}
)
</foreach>
@@ -315,6 +327,8 @@
<if test="patno != null">patno = #{patno},</if>
<if test="diagcheckFlag != null">diagcheck_flag = #{diagcheckFlag},</if>
<if test="remark != null">remark = #{remark},</if>
+ <if test="fuflag != null">fuflag = #{fuflag},</if>
+ <if test="fudate != null">fudate = #{fudate},</if>
</trim>
where id = #{id}
</update>
@@ -334,13 +348,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">
@@ -350,6 +370,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">
@@ -371,11 +417,16 @@
<!-- PatMedOuthospMapper.xml -->
<select id="countPatMedOuthosp" resultType="int">
- SELECT COUNT(*) FROM pat_med_outhosp
+ SELECT COUNT(*)
+ FROM pat_med_outhosp
</select>
<update id="renameTable">
- RENAME TABLE ${oldName} TO ${newName}
+ RENAME
+ TABLE
+ ${oldName}
+ TO
+ ${newName}
</update>
<update id="createPatMedOuthosp">
@@ -391,12 +442,15 @@
</update>
<select id="getAllOuthospTableNames" resultType="String">
- SELECT table_name FROM information_schema.tables
- WHERE table_schema = DATABASE() AND table_name LIKE 'pat_med_outhosp%'
+ SELECT table_name
+ FROM information_schema.tables
+ WHERE table_schema = DATABASE()
+ AND table_name LIKE 'pat_med_outhosp%'
</select>
<select id="getMaxIdFromTable" resultType="Long">
- SELECT IFNULL(MAX(id), 0) FROM ${tableName}
+ SELECT IFNULL(MAX(id), 0)
+ FROM ${tableName}
</select>
<update id="createOrReplaceView">
--
Gitblit v1.9.3