From fa27f4693363b7ca709273508d39a7209118cb99 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 07 七月 2025 14:14:19 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java                   |   15 +++++++++++++++
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |    2 +-
 smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml             |    7 -------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
index 9c1129f..ba5e435 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
@@ -219,4 +219,19 @@
     @Excel(name = " 璇佷欢鍙风爜 ")
     private String idcardno;
 
+
+    /**
+     * 灏辫瘖寮�濮嬫椂闂�
+     */
+    @ApiModelProperty(value = "灏辫瘖寮�濮嬫椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date starttime;
+
+    /**
+     * 灏辫瘖缁撴潫鏃堕棿
+     */
+    @ApiModelProperty(value = "灏辫瘖缁撴潫鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endtime;
+
 }
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index f9ba7d0..4123c7d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -292,7 +292,7 @@
         Integer dsf = 0;
         for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
             if (serviceSubtask.getSendstate() == 4L) wzx = wzx + 1;
-            else if (serviceSubtask.getSendstate() != 4L) ysf = ysf + 1;
+            else if (serviceSubtask.getSendstate() != 4L && serviceSubtask.getSendstate() != 2L) ysf = ysf + 1;
             if (serviceSubtask.getSendstate() == 5L) fssb = fssb + 1;
             if (serviceSubtask.getSendstate() >= 3L || serviceSubtask.getSendstate() == 1L) yfs = yfs + 1;
             if (serviceSubtask.getSendstate() == 2L) dsf = dsf + 1;
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 7d6c976..84fedd6 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -122,13 +122,6 @@
             <if test="deptname != null  and deptname != ''">and pmo.deptname like concat('%', #{deptname}, '%')</if>
             <if test="drname != null  and drname != ''">and pmo.drname like concat('%', #{drname}, '%')</if>
             <if test="patname != null  and patname != ''">and pmo.patname like concat('%', #{patname}, '%')</if>
-
-            <!--<if test="beginTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') &gt;=
-                date_format(#{beginTime},'%Y%m%d%H%i%s')
-            </if>
-            <if test="endTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') &lt;=
-                date_format(#{endTime},'%Y%m%d%H%i%s')
-            </if>-->
             <if test="beginTime != null ">and date_format(pmo.admitdate,'%y%m%d') &gt;=
                 date_format(#{beginTime},'%y%m%d')
             </if>

--
Gitblit v1.9.3