From 0cd7d484ebfec707951cc84b10c91ab973d8a574 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 05 七月 2025 16:06:03 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml             |    8 +++++---
 smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java |    1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
index b057eeb..298bf62 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
@@ -221,6 +221,7 @@
         if (serviceTask.getSendDay() == null) serviceTask.setSendDay(1L);
         Date newDate = addDays(patMedOperation1.getOpreqtime(), serviceTask.getSendDay().intValue());
         serviceSubtask.setLongSendTime(newDate);
+        serviceSubtask.setVisitTime(newDate);
         //鎮ｈ�呭彂閫佹椂闂�
         if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
             String remark = patArchive.getNotrequiredreason();
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 5cba952..72dba4f 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -187,7 +187,9 @@
             <if test="leavehospitaldistrictname != null  and leavehospitaldistrictname != ''">and
                 leavehospitaldistrictname = #{leavehospitaldistrictname}
             </if>
-            <if test="leavediagname != null  and leavediagname != ''">and leavediagname like concat('%', #{leavediagname}, '%')</if>
+            <if test="leavediagname != null  and leavediagname != ''">and leavediagname like concat('%',
+                #{leavediagname}, '%')
+            </if>
             <if test="sex != null  and sex != ''">and sex = #{sex}</if>
             <if test="age != null ">and age = #{age}</if>
             <if test="patguid != null ">and patguid = #{patguid}</if>
@@ -977,8 +979,8 @@
                 </foreach>
             </if>
             <if test="startTime != null and endTime!=null">
-                AND endtime > #{startTime}
-                AND endtime &lt;= #{endTime}
+                AND date_format(visit_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
+                AND date_format(visit_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
             </if>
             <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
             <if test="visitDeptName != null">abd visit_dept_name = #{visitDeptName}</if>

--
Gitblit v1.9.3