From 0c621621889c90a119e2ff9e41c4f5528f395f7e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 五月 2025 16:04:18 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 88 ++++++++++++++++++++++++++++++-------------
1 files changed, 61 insertions(+), 27 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 95018be..0314b0c 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -47,7 +47,9 @@
<result property="patname" column="patname"/>
<result property="patno" column="patno"/>
<result property="inhospstate" column="inhospstate"/>
- <result property="checkFlag" column="check_flag"/>
+ <result property="deptcheckFlag" column="deptcheck_flag"/>
+ <result property="wardcheckFlag" column="wardcheck_flag"/>
+ <result property="diagcheckFlag" column="diagcheck_flag"/>
<result property="age" column="age"/>
<result property="sex" column="sex"/>
<result property="telcode" column="telcode"/>
@@ -66,7 +68,7 @@
<result property="fuperiod" column="fuperiod"/>
<result property="futypecode" column="futypecode"/>
<result property="futypedesc" column="futypedesc"/>
- <result property="fuadivce" column="fuadivce"/>
+ <result property="fuadvice" column="fuadvice"/>
<result property="fuspecialadvice" column="fuspecialadvice"/>
</resultMap>
@@ -78,7 +80,7 @@
fuperiod,
futypecode,
futypedesc,
- fuadivce,
+ fuadvice,
fuspecialadvice,
remark,
guid,
@@ -88,7 +90,9 @@
out_way_name,
nurse_id,
nurse_name,
- check_flag,
+ deptcheck_flag,
+ wardcheck_flag,
+ diagcheck_flag,
inhospstate,
patno,
long_task_reason,
@@ -143,7 +147,9 @@
b.patname,
b.out_way_id,
b.out_way_name,
- b.check_flag,
+ b.deptcheck_flag,
+ b.wardcheck_flag,
+ b.diagcheck_flag,
b.inhospstate,
b.patno,
b.inhospno,
@@ -190,8 +196,9 @@
b.fuperiod,
b.futypecode,
b.futypedesc,
- b.fuadivce,
- b.fuspecialadvice
+ b.fuadvice,
+ b.fuspecialadvice,
+ a.idcardno
FROM
pat_med_inhosp b
JOIN
@@ -202,7 +209,7 @@
a.del_flag = 0
AND b.del_flag = 0
AND a.idcardno IS NOT NULL
- <if test="startOutHospTime != null">
+ <!--<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">
@@ -215,6 +222,18 @@
</if>
<if test="endInHospTime != null">
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},
'%')
@@ -230,8 +249,10 @@
<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="checkFlag != null ">and b.check_flag = #{checkFlag}</if>
+ <if test="nurseName != null and nurseName != ''">and b.nurse_name = #{nurseName}</if>
+ <if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
+ <if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
+ <if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</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>
<if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
@@ -273,7 +294,12 @@
a.telcode,
a.id,
a.sex
- order by b.inhospid desc
+ <if test="cry==1">
+ order by b.endtime desc
+ </if>
+ <if test="cry==0">
+ order by b.starttime desc
+ </if>
</select>
<select id="selectPatMedInhospListByCondition" parameterType="com.smartor.domain.PatMedInhospVO"
resultMap="PatMedInhospResult">
@@ -288,7 +314,9 @@
b.out_way_name,
b.nurse_id,
b.nurse_name,
- b.check_flag,
+ b.deptcheckFlag,
+ b.diagcheckFlag,
+ b.wardcheckFlag,
b.inhospstate,
b.patno,
b.inhospno,
@@ -334,7 +362,7 @@
b.fuperiod,
b.futypecode,
b.futypedesc,
- b.fuadivce,
+ b.fuadvice,
b.fuspecialadvice
b.schemetime
FROM
@@ -357,7 +385,9 @@
<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>
- <if test="checkFlag != null ">and b.check_flag = #{checkFlag}</if>
+ <if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
+ <if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
+ <if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
<if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
<if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
<if test="leavediagname != null and leavediagname != ''">and b.leavediagname like concat('%',
@@ -439,7 +469,9 @@
<if test="patname!= null">patname,</if>
<if test="patno != null">patno,</if>
<if test="inhospstate != null">inhospstate,</if>
- <if test="checkFlag != null">check_flag,</if>
+ <if test="deptcheckFlag != null">deptcheck_flag,</if>
+ <if test="wardcheckFlag != null">wardcheck_flag,</if>
+ <if test="diagcheckFlag != null">diagcheck_flag,</if>
<if test="longTaskReason != null">long_task_reason,</if>
<if test="nurseId != null ">nurse_id,</if>
<if test="nurseName != null ">nurse_name,</if>
@@ -455,7 +487,7 @@
<if test="fuperiod != null ">fuperiod,</if>
<if test="futypecode != null ">futypecode,</if>
<if test="futypedesc != null ">futypedesc,</if>
- <if test="fuadivce != null ">fuadivce,</if>
+ <if test="fuadvice != null ">fuadvice,</if>
<if test="fuspecialadvice != null ">fuspecialadvice,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -499,7 +531,9 @@
<if test="patname!= null">#{patname},</if>
<if test="patno != null">#{patno},</if>
<if test="inhospstate != null">#{inhospstate},</if>
- <if test="checkFlag != null">#{checkFlag},</if>
+ <if test="deptcheckFlag != null">#{deptcheckFlag},</if>
+ <if test="wardcheckFlag != null">#{wardcheckFlag},</if>
+ <if test="diagcheckFlag != null">#{diagcheckFlag},</if>
<if test="longTaskReason != null">#{longTaskReason},</if>
<if test="nurseId != null ">#{nurseId},</if>
<if test="nurseName != null ">#{nurseName},</if>
@@ -515,7 +549,7 @@
<if test="fuperiod != null ">#{fuperiod},</if>
<if test="futypecode != null ">#{futypecode},</if>
<if test="futypedesc != null ">#{futypedesc},</if>
- <if test="fuadivce != null ">#{fuadivce},</if>
+ <if test="fuadvice != null ">#{fuadvice},</if>
<if test="fuspecialadvice != null ">#{fuspecialadvice},</if>
</trim>
</insert>
@@ -563,7 +597,9 @@
<if test="patname!= null">patname = #{patname},</if>
<if test="patno != null">patno = #{patno},</if>
<if test="inhospstate != null">inhospstate = #{inhospstate},</if>
- <if test="checkFlag != null">check_flag = #{checkFlag},</if>
+ <if test="deptcheckFlag != null">deptcheck_flag = #{deptcheckFlag},</if>
+ <if test="wardcheckFlag != null">wardcheck_flag = #{wardcheckFlag},</if>
+ <if test="diagcheckFlag != null">diagcheck_flag = #{diagcheckFlag},</if>
<if test="longTaskReason != null">long_task_reason = #{longTaskReason},</if>
<if test="nurseId != null ">nurse_id = #{nurseId},</if>
<if test="nurseName != null ">nurse_name = #{nurseName},</if>
@@ -578,7 +614,7 @@
<if test="fuperiod != null ">fuperiod = #{fuperiod},</if>
<if test="futypecode != null ">futypecode = #{futypecode},</if>
<if test="futypedesc != null ">futypedesc = #{futypedesc},</if>
- <if test="fuadivce != null ">fuadivce = #{fuadivce},</if>
+ <if test="fuadvice != null ">fuadvice = #{fuadvice},</if>
<if test="fuspecialadvice != null ">fuspecialadvice = #{fuspecialadvice},</if>
</trim>
where inhospid = #{inhospid}
@@ -615,7 +651,7 @@
FROM pat_med_outhosp
<where>
del_flag=0
- <if test="deptcodeList != null">
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
@@ -632,7 +668,7 @@
<where>
del_flag=0
and inhospstate=0
- <if test="deptcodeList != null">
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
@@ -647,7 +683,7 @@
<where>
del_flag=0
and inhospstate=1
- <if test="deptcodeList != null">
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
@@ -662,7 +698,7 @@
<where>
del_flag=0
and inhospstate=1
- <if test="deptcodeList != null">
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
@@ -672,8 +708,6 @@
</if>
) AS combined
GROUP BY deptname;
-
-
</select>
<select id="selectPatMedInhospCount" parameterType="com.smartor.domain.PatMedReq"
resultType="com.smartor.domain.PatMedRes">
@@ -694,7 +728,7 @@
and date_format(endtime,'%y%m%d') >= date_format(#{startDate},'%y%m%d')
and date_format(endtime,'%y%m%d') <= date_format(#{endDate},'%y%m%d')
</if>
- <if test="deptcodeList != null">
+ <if test="deptcodeList != null and deptcodeList.size() > 0">
and deptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
--
Gitblit v1.9.3