From 0f71707f68578f65a255b97ebfb6afee8883a01f Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Wed, 18 Sep 2024 13:40:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=B8=8D=E7=8E=B0=E5=AE=9E?=
 =?UTF-8?q?=E7=AD=BE=E7=AB=A0=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emr/controller/lastVerifyController.java  |  2 +-
 src/main/resources/mapper/StatementMapper.xml | 22 ++++++++++++++-----
 .../views/statementDir/ThreeDaysFile.jsp      |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java
index 14d4c438..3a0efd82 100644
--- a/src/main/java/com/emr/controller/lastVerifyController.java
+++ b/src/main/java/com/emr/controller/lastVerifyController.java
@@ -263,10 +263,10 @@ public class lastVerifyController {
         archiveMaster.setId(emrFaultDetail.getArchiveDetailId());
         archiveMaster.setArchivestate("已归档");
         archiveMaster.setCmtDoctor(1);
-        archiveMaster.setCmtNurse(1);
         int bol = archiveMasterService.updateByClo(archiveMaster);
         //归档记录添加到commomtable表
         CommomVo commomVo = new CommomVo();
+        archiveMaster.setCmtNurse(1);
         List<Archive_Master> archiveMasters = archiveMasterService.selectCommonlyUsed(emrFaultDetail.getArchiveDetailId());
         for (Archive_Master list : archiveMasters) {
             commomVo.setPatientId(list.getId());
diff --git a/src/main/resources/mapper/StatementMapper.xml b/src/main/resources/mapper/StatementMapper.xml
index 41d9db8b..b8dbcd2a 100644
--- a/src/main/resources/mapper/StatementMapper.xml
+++ b/src/main/resources/mapper/StatementMapper.xml
@@ -4,15 +4,27 @@
 
     <select id="getThreeDaysFileList" resultType="com.emr.vo.ThreeDaysFileVo">
         SELECT COUNT
-                   ( * ) AS outNum,
-               dept_name  as deptCode
+        ( * ) AS outNum,
+        dept_name as deptCode
         FROM
-            Archive_Master
+        Archive_Master
         WHERE
-            ArchiveState NOT IN ( '作废', '已封存', '取消入院' ) AND id is not null AND dept_name is not null  and id!=''
+        ArchiveState NOT IN ( '作废', '已封存', '取消入院' ) AND id is not null AND dept_name is not null and id!=''
+        <choose>
+            <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
+                and CONVERT(VARCHAR(20),discharge_date_time,23) between #{startDateTo} and
+                #{endDateTo}
+            </when>
+            <when test="startDateTo != null and startDateTo != ''">
+                and CONVERT(VARCHAR(20),discharge_date_time,23) >=#{startDateTo}
+            </when>
+            <when test="endDateTo != null and endDateTo != ''">
+                and CONVERT(VARCHAR(20),discharge_date_time,23) &lt;= #{endDateTo}
+            </when>
+        </choose>
         AND inp_no NOT LIKE 'LG%'
         GROUP BY
-            dept_name
+        dept_name
     </select>
     <select id="getDay3Rate" resultType="com.emr.vo.ThreeDaysFileVo">
         SELECT
diff --git a/src/main/webapp/WEB-INF/views/statementDir/ThreeDaysFile.jsp b/src/main/webapp/WEB-INF/views/statementDir/ThreeDaysFile.jsp
index 485c67ce..f09f8dab 100644
--- a/src/main/webapp/WEB-INF/views/statementDir/ThreeDaysFile.jsp
+++ b/src/main/webapp/WEB-INF/views/statementDir/ThreeDaysFile.jsp
@@ -211,7 +211,6 @@
     <form class="formCss">
         <div class="form-inline">
             <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
-            <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
             <button type="button" class="btn btn-success btn-sm divCss" id="execute">执行计划</button>
         </div>
     </form>
@@ -484,6 +483,7 @@
             toastr.warning("正在查询，请稍等...");
         }
     });
+
     //保存执行计划
     $("#save").click(function () {
         var day = $('#day').val()