From d381ca5f089d6b2edf14d4f63b9a43b816972984 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期一, 28 四月 2025 14:50:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
index e673eac..aba4680 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
@@ -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}
--
Gitblit v1.9.3