From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
index e673eac..092198d 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
@@ -156,8 +156,8 @@
<select id="selectPatMedOperationList" parameterType="com.smartor.domain.PatMedOperation"
resultMap="PatMedOperationResult">
<include refid="selectPatMedOperationVo"/>
- <where>
- del_flag='0'
+ where 1=1
+ and del_flag='0'
<if test="patid != null ">
and patid = #{patid}
</if>
@@ -182,8 +182,14 @@
<if test="optypename != null and optypename != ''">
and optypename like concat('%', #{optypename}, '%')
</if>
- <if test="operatortime != null ">
- and operatortime = #{operatortime}
+ <!-- <if test="operatortime != null ">-->
+ <!-- and operatortime = #{operatortime}-->
+ <!-- </if>-->
+ <if test="beginTime != null ">and date_format(operatortime,'%y%m%d') >=
+ date_format(#{beginTime},'%y%m%d')
+ </if>
+ <if test="endTime != null ">and date_format(operatortime,'%y%m%d') <=
+ date_format(#{endTime},'%y%m%d')
</if>
<if test="opreqtime != null ">
and opreqtime = #{opreqtime}
@@ -350,7 +356,6 @@
<if test="opleveldesc != null and opleveldesc != ''">
and opleveldesc = #{opleveldesc}
</if>
- </where>
</select>
<select id="selectPatMedOperationById" parameterType="Long"
--
Gitblit v1.9.3