From 3c46b264b86bb38984370f685c6866c5f7784808 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期三, 16 四月 2025 21:42:39 +0800
Subject: [PATCH] 04-16改_手术病人分页and患者信息子页面时间查询
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 84 +++++++++++++++++++++++++++++++++++-------
1 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 9a114e5..e17bbef 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -61,11 +61,25 @@
<result property="operatorId" column="operator_id"/>
<result property="remark" column="remark"/>
<result property="tagname" column="tagname"/>
+ <result property="fuflag" column="fuflag"/>
+ <result property="fudate" column="fudate"/>
+ <result property="fuperiod" column="fuperiod"/>
+ <result property="futypecode" column="futypecode"/>
+ <result property="futypedesc" column="futypedesc"/>
+ <result property="fuadvice" column="fuadvice"/>
+ <result property="fuspecialadvice" column="fuspecialadvice"/>
</resultMap>
<sql id="selectPatMedInhospVo">
select inhospid,
patname,
+ fuflag,
+ fudate,
+ fuperiod,
+ futypecode,
+ futypedesc,
+ fuadvice,
+ fuspecialadvice,
remark,
guid,
operator,
@@ -170,14 +184,14 @@
b.deptid,
b.leaveldeptid,
b.long_task_reason,
- b.schemetime
- -- COALESCE (
- -- (
- -- SELECT GROUP_CONCAT(d.tagname, ', ')
- -- FROM pat_archivetag d
- -- WHERE d.patid = a.id
- -- AND d.del_flag = 0
- -- ), '') AS tagname
+ b.schemetime,
+ b.fuflag,
+ b.fudate,
+ b.fuperiod,
+ b.futypecode,
+ b.futypedesc,
+ b.fuadvice,
+ b.fuspecialadvice
FROM
pat_med_inhosp b
JOIN
@@ -188,19 +202,31 @@
a.del_flag = 0
AND b.del_flag = 0
AND a.idcardno IS NOT NULL
- <if test="startOutHospTime != null">
- AND TO_DATE(b.endtime,'YYYY-MM-DD') >= TO_DATE(#{startOutHospTime},'YYYY-MM-DD')
+ <!--<if test="startOutHospTime != null">
+ AND STR_TO_DATE(b.endtime,'%Y-%m-%d') >= STR_TO_DATE(#{startOutHospTime},'%Y-%m-%d')
</if>
<if test="endOutHospTime != null">
- AND TO_DATE(b.endtime,'YYYY-MM-DD') <= TO_DATE(#{endOutHospTime},'YYYY-MM-DD')
+ AND STR_TO_DATE(b.endtime,'%Y-%m-%d') <= STR_TO_DATE(#{endOutHospTime},'%Y-%m-%d')
</if>
<if test="tagname != null and tagname != ''">and c.tagname like concat('%', #{tagname}, '%')</if>
<if test="startInHospTime != null">
- AND TO_DATE(b.starttime, 'YYYY-MM-DD') >= TO_DATE(#{startInHospTime}, 'YYYY-MM-DD')
+ AND STR_TO_DATE(b.starttime, '%Y-%m-%d') >= STR_TO_DATE(#{startInHospTime}, '%Y-%m-%d')
</if>
<if test="endInHospTime != null">
- AND TO_DATE(b.starttime, 'YYYY-MM-DD') <= TO_DATE(#{startInHospTime}, 'YYYY-MM-DD')
+ AND STR_TO_DATE(b.starttime, '%Y-%m-%d') <= STR_TO_DATE(#{startInHospTime}, '%Y-%m-%d')
+ </if>-->
+ <if test="startOutHospTime != null ">and date_format(b.endtime,'%y%m%d') >=
+ date_format(#{startOutHospTime},'%y%m%d')
+ </if>
+ <if test="endOutHospTime != null ">and date_format(b.endtime,'%y%m%d') <=
+ date_format(#{endOutHospTime},'%y%m%d')
+ </if>
+ <if test="startInHospTime != null ">and date_format(b.starttime,'%y%m%d') >=
+ date_format(#{startInHospTime},'%y%m%d')
+ </if>
+ <if test="endInHospTime != null ">and date_format(b.starttime,'%y%m%d') <=
+ date_format(#{endInHospTime},'%y%m%d')
</if>
<if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
'%')
@@ -211,11 +237,12 @@
</if>
<if test="endtime != null ">and b.endtime = #{endtime}</if>
<if test="inhospno != null ">and b.inhospno = #{inhospno}</if>
+ <if test="fuflag != null ">and b.fuflag = #{fuflag}</if>
<if test="serialnum != null ">and b.serialnum = #{serialnum}</if>
<if test="endtime != null ">and b.endtime = #{endtime}</if>
<if test="patno != null ">and b.patno = #{patno}</if>
<if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
- <if test="nurseName != null ">and b.nurse_name = #{nurseName}</if>
+ <if test="nurseName != null and nurseName != ''">and b.nurse_name = #{nurseName}</if>
<if test="checkFlag != null ">and b.check_flag = #{checkFlag}</if>
<if test="cry != null and cry == 0 ">and b.endtime is null</if>
<if test="cry != null and cry == 1 ">and b.endtime is not null</if>
@@ -314,6 +341,13 @@
b.deptid,
b.leaveldeptid,
b.long_task_reason,
+ b.fuflag,
+ b.fudate,
+ b.fuperiod,
+ b.futypecode,
+ b.futypedesc,
+ b.fuadvice,
+ b.fuspecialadvice
b.schemetime
FROM
pat_med_inhosp b,
@@ -331,6 +365,7 @@
concat('%', #{hospitaldistrictname}, '%')
</if>
<if test="endtime != null ">and b.endtime = #{endtime}</if>
+ <if test="fuflag != null ">and b.fuflag = #{fuflag}</if>
<if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
<if test="nurseName != null ">and b.nurse_name = #{nurseName}</if>
<if test="patno != null ">and b.patno = #{patno}</if>
@@ -427,6 +462,13 @@
<if test="operatorId != null ">operator_id,</if>
<if test="inhospno != null ">inhospno,</if>
<if test="remark != null ">remark,</if>
+ <if test="fuflag != null ">fuflag,</if>
+ <if test="fudate != null ">fudate,</if>
+ <if test="fuperiod != null ">fuperiod,</if>
+ <if test="futypecode != null ">futypecode,</if>
+ <if test="futypedesc != null ">futypedesc,</if>
+ <if test="fuadvice != null ">fuadvice,</if>
+ <if test="fuspecialadvice != null ">fuspecialadvice,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialnum != null">#{serialnum},</if>
@@ -480,6 +522,13 @@
<if test="operatorId != null ">#{operatorId},</if>
<if test="inhospno != null ">#{inhospno},</if>
<if test="remark != null ">#{remark},</if>
+ <if test="fuflag != null ">#{fuflag},</if>
+ <if test="fudate != null ">#{fudate},</if>
+ <if test="fuperiod != null ">#{fuperiod},</if>
+ <if test="futypecode != null ">#{futypecode},</if>
+ <if test="futypedesc != null ">#{futypedesc},</if>
+ <if test="fuadvice != null ">#{fuadvice},</if>
+ <if test="fuspecialadvice != null ">#{fuspecialadvice},</if>
</trim>
</insert>
@@ -536,6 +585,13 @@
<if test="operator != null ">operator = #{operator},</if>
<if test="operatorId != null ">operator_id = #{operatorId},</if>
<if test="remark != null ">remark = #{remark},</if>
+ <if test="fuflag != null ">fuflag = #{fuflag},</if>
+ <if test="fudate != null ">fudate = #{fudate},</if>
+ <if test="fuperiod != null ">fuperiod = #{fuperiod},</if>
+ <if test="futypecode != null ">futypecode = #{futypecode},</if>
+ <if test="futypedesc != null ">futypedesc = #{futypedesc},</if>
+ <if test="fuadvice != null ">fuadvice = #{fuadvice},</if>
+ <if test="fuspecialadvice != null ">fuspecialadvice = #{fuspecialadvice},</if>
</trim>
where inhospid = #{inhospid}
</update>
--
Gitblit v1.9.3