From 9f27952cb4010cc6fefed7f46c6a74f561eade05 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 25 Nov 2020 17:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC20201125?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emr/controller/StatisticsController.java  |   4 +-
 src/main/java/com/emr/entity/TUuInfo.java     |  10 ++
 .../emr/service/ipml/StatisticsService.java   |  27 +++-
 src/main/java/com/emr/vo/TUuPrintSearch.java  |   2 +
 src/main/resources/mapper/TUuInfoMapper.xml   | 134 +++++++++++++++++-
 .../views/beHospitaledDir/beHospList.jsp      |   2 +-
 src/main/webapp/WEB-INF/views/index.jsp       |   2 +-
 .../WEB-INF/views/record/signedRecord.jsp     |   5 +-
 .../WEB-INF/views/statistics/scanCount.jsp    |  48 +++++--
 .../WEB-INF/views/statistics/scanInfo.jsp     |   2 +-
 .../webapp/static/js/beHospList/beHospList.js |   1 +
 ...tStartDateAndEndDateGroupbyDayMonthYear.js |  96 +++++++++++++
 .../webapp/static/js/record/signedRecord.js   |  95 +------------
 .../webapp/static/js/statistics/scanCount.js  |  66 ++++++---
 .../webapp/static/js/statistics/scanInfo.js   |  30 ++--
 15 files changed, 383 insertions(+), 141 deletions(-)
 create mode 100644 src/main/webapp/static/js/record/getStartDateAndEndDateGroupbyDayMonthYear.js

diff --git a/src/main/java/com/emr/controller/StatisticsController.java b/src/main/java/com/emr/controller/StatisticsController.java
index d4538ba..d4fcf63 100644
--- a/src/main/java/com/emr/controller/StatisticsController.java
+++ b/src/main/java/com/emr/controller/StatisticsController.java
@@ -362,8 +362,8 @@ public class StatisticsController {
     public void exportExcelScanCount(HttpServletResponse response,TUuPrintSearch search,Integer isSearch){
         judgeIsSearch(search, isSearch);
         //全部明细
-        String tableThNames = "扫描人,扫描日期,扫描次数";
-        String fieldCns = "uuname,uploaddatetime,scanCount";
+        String tableThNames = "扫描人,扫描日期,扫描次数,扫描份数";
+        String fieldCns = "uuname,uploaddatetime,scanCount,scanNums";
         try {
             List<TUuInfoVo> list = statisticsService.getScanCount(search);
             //文件名
diff --git a/src/main/java/com/emr/entity/TUuInfo.java b/src/main/java/com/emr/entity/TUuInfo.java
index c197785..df597d6 100644
--- a/src/main/java/com/emr/entity/TUuInfo.java
+++ b/src/main/java/com/emr/entity/TUuInfo.java
@@ -31,6 +31,8 @@ public class TUuInfo {
 
     private String uploaddatetime;
 
+    private String title;
+
     public String getPatientId() {
         return patientId;
     }
@@ -150,4 +152,12 @@ public class TUuInfo {
     public void setUploaddatetime(String uploaddatetime) {
         this.uploaddatetime = uploaddatetime == null ? null : uploaddatetime.trim();
     }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/emr/service/ipml/StatisticsService.java b/src/main/java/com/emr/service/ipml/StatisticsService.java
index cff5e79..c444289 100644
--- a/src/main/java/com/emr/service/ipml/StatisticsService.java
+++ b/src/main/java/com/emr/service/ipml/StatisticsService.java
@@ -16,6 +16,7 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -169,10 +170,34 @@ public class StatisticsService {
     }
 
     //扫描记录报表
-    public List<TUuInfoVo> getScanCount(TUuPrintSearch search){
+    public List<TUuInfoVo> getScanCount(TUuPrintSearch search) throws Exception{
         return uuInfoMapper.getScanCount(search);
     }
 
+    private String setSearchName(TUuPrintSearch search, List<User> userList) {
+        String name = "";
+        //如果带姓名模糊查询，转换成工号
+        if(StringUtils.isNotBlank(search.getName())){
+            StringBuilder nameStr = new StringBuilder();
+            for(User user : userList){
+                if(user.getName().contains(search.getName())){
+                    if(StringUtils.isNotBlank(nameStr)){
+                        nameStr.append(",");
+                    }
+                    nameStr.append("'").append(user.getUserName()).append("'");
+                }
+            }
+            if(StringUtils.isNotBlank(nameStr)){
+                //如果不为空，带工号集合查询
+                name = nameStr.toString();
+            }else{
+                //如果为空，查询无结果，name值带&查询
+                name = "&";
+            }
+        }
+        return name;
+    }
+
     //扫描记录明细
     public List<TUuInfoVo> getScanInfo(TUuPrintSearch search){
         return uuInfoMapper.getScanInfo(search);
diff --git a/src/main/java/com/emr/vo/TUuPrintSearch.java b/src/main/java/com/emr/vo/TUuPrintSearch.java
index 4751064..e1e181d 100644
--- a/src/main/java/com/emr/vo/TUuPrintSearch.java
+++ b/src/main/java/com/emr/vo/TUuPrintSearch.java
@@ -25,5 +25,7 @@ public class TUuPrintSearch {
     private String sql;
 
     private String inpNo;
+
+    private Integer dateFlag;
 }
 
diff --git a/src/main/resources/mapper/TUuInfoMapper.xml b/src/main/resources/mapper/TUuInfoMapper.xml
index 78228ca..41fbb03 100644
--- a/src/main/resources/mapper/TUuInfoMapper.xml
+++ b/src/main/resources/mapper/TUuInfoMapper.xml
@@ -17,6 +17,7 @@
     <result column="Sys" property="sys" jdbcType="NVARCHAR" />
     <result column="uuName" property="uuname" jdbcType="NVARCHAR" />
     <result column="UpLoadDateTime" property="uploaddatetime" jdbcType="NVARCHAR" />
+    <result column="Title" property="title" jdbcType="NVARCHAR" />
   </resultMap>
   <insert id="insert" parameterType="com.emr.entity.TUuInfo" >
     insert into t_uuInfo (patient_id, inp_no, visit_id, 
@@ -130,6 +131,133 @@
     </trim>
   </insert>
   <!--查询扫描次数-->
+  <select id="getScanCount" resultMap="BaseResultMap" parameterType="com.emr.vo.TUuPrintSearch">
+    SELECT
+        powerusers.name uuName,
+        t1.UpLoadDateTime,
+        t1.allCount scanCount,
+        t2.masterIdCount scanNums
+    FROM
+        (
+        SELECT
+            Sys,
+            <include refid="formatDate"></include> UpLoadDateTime,
+            COUNT( id ) allCount
+        FROM
+            archive_detail
+        <include refid="getScanCountWhereSql"></include>
+        GROUP BY
+            Sys,
+        <include refid="formatDate"></include>) t1
+        INNER JOIN (
+        SELECT
+            Sys,
+            UpLoadDateTime,
+            count( MasterID ) masterIdCount
+        FROM
+            (
+            SELECT
+                Sys,
+                <include refid="formatDate"></include> UpLoadDateTime,
+                MasterID
+            FROM
+                archive_detail
+            <include refid="getScanCountWhereSql"></include>
+            GROUP BY
+                Sys,
+                <include refid="formatDate"></include>,
+                MasterID
+            ) t2
+        GROUP BY
+            Sys,
+            UpLoadDateTime
+        ) t2 ON t1.Sys = t2.Sys
+        AND t1.UpLoadDateTime = t2.UpLoadDateTime
+        left join
+            powerusers
+        on t1.sys = powerusers.user_id
+        <where>
+            <choose>
+                <when test="sql != null and sql != ''">
+                    ${sql}
+                </when>
+                <otherwise>
+                    <if test="name != null and name != ''">
+                        AND powerusers.name like '%${name}%'
+                    </if>
+                </otherwise>
+            </choose>
+        </where>
+    ORDER BY
+        t1.UpLoadDateTime DESC
+  </select>
+    <!--查询扫描数量次数的公共查询方法-->
+    <sql id="getScanCountWhereSql">
+        <where>
+            <choose>
+                <when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
+                    <choose>
+                        <when test="dateFlag == 1">
+                            and UpLoadDateTime between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and
+                            #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
+                        </when>
+                        <when test="dateFlag == 2">
+                            and CONVERT(VARCHAR(7),UpLoadDateTime,120) between #{startDate,jdbcType=NCHAR} and
+                            #{endDate,jdbcType=NCHAR}
+                        </when>
+                        <when test="dateFlag == 3">
+                            and CONVERT(VARCHAR(4),UpLoadDateTime,120) between #{startDate,jdbcType=NCHAR} and
+                            #{endDate,jdbcType=NCHAR}
+                        </when>
+                    </choose>
+                </when>
+                <when test="startDate != null and startDate != ''">
+                    <choose>
+                        <when test="dateFlag == 1">
+                            and UpLoadDateTime >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120)
+                        </when>
+                        <when test="dateFlag == 2">
+                            and CONVERT(VARCHAR(7),UpLoadDateTime,120) >= #{startDate,jdbcType=NCHAR}
+                        </when>
+                        <when test="dateFlag == 3">
+                            and CONVERT(VARCHAR(4),UpLoadDateTime,120) >= #{startDate,jdbcType=NCHAR}
+                        </when>
+                    </choose>
+                </when>
+                <when test="endDate != null and endDate != ''">
+                    <choose>
+                        <when test="dateFlag == 1">
+                            and UpLoadDateTime &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
+                        </when>
+                        <when test="dateFlag == 2">
+                            and CONVERT(VARCHAR(7),UpLoadDateTime,120) &lt;= #{endDate,jdbcType=NCHAR}
+                        </when>
+                        <when test="dateFlag == 3">
+                            and CONVERT(VARCHAR(4),UpLoadDateTime,120) &lt;= #{endDate,jdbcType=NCHAR}
+                        </when>
+                    </choose>
+                </when>
+            </choose>
+            And Source = '扫描上传'
+            AND Sys != '1'
+            AND Sys != 'emr_medical_record'
+        </where>
+    </sql>
+    <!---格式化时间-->
+    <sql id="formatDate">
+        <choose>
+            <when test="dateFlag == 1">
+                CONVERT ( VARCHAR ( 10 ), UpLoadDateTime, 23 )
+            </when>
+            <when test="dateFlag == 2">
+                CONVERT ( VARCHAR ( 7 ), UpLoadDateTime, 120 )
+            </when>
+            <when test="dateFlag == 3">
+                CONVERT ( VARCHAR ( 4 ), UpLoadDateTime, 120 )
+            </when>
+        </choose>
+    </sql>
+<!--
   <select id="getScanCount" resultMap="BaseResultMap" parameterType="com.emr.vo.TUuPrintSearch">
     SELECT
         uuName,
@@ -167,6 +295,7 @@
           uuName,
           UpLoadDateTime
   </select>
+-->
   <!--查询打印明细-->
   <select id="getScanInfo" resultMap="BaseResultMap" parameterType="com.emr.vo.TUuPrintSearch">
     SELECT
@@ -180,8 +309,9 @@
         a.doctor_dept,
         a.DOCTOR_IN_CHARGE,
         a.uuName,
-        a.UpLoadDateTime
-    from t_uuinfo a
+        a.UpLoadDateTime,
+        a.Title
+    from t_uuinfo1 a
     where
         isnull(a.patient_id,'')&lt;>''
         <choose>
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 43b9a4d..1dece5d 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -831,7 +831,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/beHospList/beHospList.js?time=2020-11-23_1"></script>
+<script src="${path}/static/js/beHospList/beHospList.js?time=2020-11-25_3"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-11-16"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
index 220aa3a..a4b0c96 100644
--- a/src/main/webapp/WEB-INF/views/index.jsp
+++ b/src/main/webapp/WEB-INF/views/index.jsp
@@ -355,7 +355,7 @@
     </div>
     <footer class="main-footer">
         <div class="pull-right">
-            <b>Version</b> 20201113
+            <b>Version</b> 20201125
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.
diff --git a/src/main/webapp/WEB-INF/views/record/signedRecord.jsp b/src/main/webapp/WEB-INF/views/record/signedRecord.jsp
index 2709c77..29b30b0 100644
--- a/src/main/webapp/WEB-INF/views/record/signedRecord.jsp
+++ b/src/main/webapp/WEB-INF/views/record/signedRecord.jsp
@@ -91,7 +91,7 @@
                                    maxlength="10" autocomplete="off"/>
                         </div>
                     </div>
-                    <div class="form-group divCss">
+                    <div class="form-group divCss" id="dateRange">
                         <label>出院时段:</label>
                         <select class="form-control input-sm" id="timeInterval"
                                 onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
@@ -129,6 +129,7 @@
 </div>
 <script src="${path}/static/js/statistics/getDeptCommom.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?t=2020-07-24"></script>
-<script src="${path}/static/js/record/signedRecord.js?time=2020-08-21"></script>
+<script src="${path}/static/js/record/signedRecord.js?time=2020-11-25"></script>
+<script src="${path}/static/js/record/getStartDateAndEndDateGroupbyDayMonthYear.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp b/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp
index 4b7b1ea..d088a3c 100644
--- a/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp
@@ -46,17 +46,46 @@
             <!--搜索-->
             <form style="margin-top:5px;margin-bottom: 0!important;">
                 <div class="form-inline">
-                    <div class="form-group divCss">
-                        <label>起止日期:</label>
-                        <div class="input-group" id="datepicker">
-                            <input type="text" class="input-sm form-control" name="start" id="startTime1" maxlength="10"
-                                   style="text-align: center" autocomplete="off"/>
+                    <div class="form-group divCss8">
+                        <div class="input-group">
+                            <select class="form-control" id="dateFlag">
+                                <option value="1">按日查询</option>
+                                <option value="2">按月查询</option>
+                                <option value="3">按年查询</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group divCss8" id="day">
+                        <label>出院日查询:</label>
+                        <div class="input-group">
+                            <input type="text" class="input-sm form-control" id="startTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime1" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss8" id="month" style="display: none">
+                        <label>出院月查询:</label>
+                        <div class="input-group">
+                            <input type="text" class="input-sm form-control" id="startTime3" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                            <span class="input-group-addon">-</span>
+                            <input type="text" class="input-sm form-control" id="endTime3" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
+                        </div>
+                    </div>
+                    <div class="form-group divCss8" id="year" style="display: none">
+                        <label>出院年查询:</label>
+                        <div class="input-group">
+                            <input type="text" class="input-sm form-control" id="startTime4" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
                             <span class="input-group-addon">-</span>
-                            <input type="text" class="input-sm form-control" name="end" id="endTime1"
-                                   style="text-align: center" maxlength="10" autocomplete="off"/>
+                            <input type="text" class="input-sm form-control" id="endTime4" style="text-align: center"
+                                   maxlength="10" autocomplete="off"/>
                         </div>
                     </div>
-                    <div class="form-group divCss">
+                    <div class="form-group divCss" id="dateRange">
                         <label>扫描时段:</label>
                         <select class="form-control input-sm" id="timeInterval"
                                 onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
@@ -93,7 +122,8 @@
         </div>
     </div>
 </div>
-<script src="${path}/static/js/statistics/scanCount.js?time=2020-08-18"></script>
+<script src="${path}/static/js/statistics/scanCount.js?time=2020-11-25"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-07-24"></script>
+<script src="${path}/static/js/record/getStartDateAndEndDateGroupbyDayMonthYear.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp b/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp
index 2f1f36c..762c767 100644
--- a/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp
@@ -98,6 +98,6 @@
     </div>
 </div>
 <script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-09-11"></script>
-<script src="${path}/static/js/statistics/scanInfo.js"></script>
+<script src="${path}/static/js/statistics/scanInfo.js?time=2020-11-25"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js
index 4188b27..c1c624f 100644
--- a/src/main/webapp/static/js/beHospList/beHospList.js
+++ b/src/main/webapp/static/js/beHospList/beHospList.js
@@ -450,6 +450,7 @@ function verifyInfo(role,archivestate,roleCode,masterId){
 //提交审核 单个审批② 批量审批③
 $("#verifyBtn").on('click', function () {
     $("#verifyModal").modal('hide');
+    $("#resultLabel1").text('');
     var approveCount = $("#approveCount").val();
     if(approveCount > 1) {
         //大于一个弹出确认框
diff --git a/src/main/webapp/static/js/record/getStartDateAndEndDateGroupbyDayMonthYear.js b/src/main/webapp/static/js/record/getStartDateAndEndDateGroupbyDayMonthYear.js
new file mode 100644
index 0000000..b1896bf
--- /dev/null
+++ b/src/main/webapp/static/js/record/getStartDateAndEndDateGroupbyDayMonthYear.js
@@ -0,0 +1,96 @@
+//获取时间搜索框值
+function getStartOrEndDate(dateFlag,divId){
+    if(dateFlag == 1){
+        return $("#"+divId+"1").val();
+    }else if(dateFlag == 2){
+        return $("#"+divId+"3").val();
+    }else if(dateFlag == 3){
+        return $("#"+divId+"4").val();
+    }
+}
+
+//按日期查询变更事件
+$("#dateFlag").change(function(){
+    var value = $(this).val();
+    if(value == 1){
+        $("#day").show();
+        $("#month").hide();
+        $("#year").hide();
+        $("#dateRange").show();
+    }else if(value == 2){
+        $("#day").hide();
+        $("#month").show();
+        $("#year").hide();
+        $("#dateRange").hide();
+        //获取加载层数级
+        initDateInputMonth(3);
+    }else if(value == 3){
+        $("#day").hide();
+        $("#month").hide();
+        $("#year").show();
+        $("#dateRange").hide();
+        initDateInputYear(4);
+    }
+    $("#table").bootstrapTable("refresh");
+});
+
+//加载月时间控件
+function initDateInputMonth(idVal){
+    $('#startTime'+idVal).datepicker({
+        language: "zh-CN",
+        format: "yyyy-mm",
+        startView: 'years',  //起始选择范围
+        maxViewMode:'years', //最大选择范围
+        minViewMode:'months', //最小选择范围
+        autoclose: true//选中之后自动隐藏日期选择框
+    }).on('changeDate',function(){
+        $("#beginTime-error").hide();
+        var startTime= $("#startTime"+idVal).val();
+        $("#endTime"+idVal).datepicker('setStartDate',startTime);
+        $("#startTime"+idVal).datepicker('hide');
+    });
+
+    $('#endTime'+idVal).datepicker({
+        language: "zh-CN",
+        format: "yyyy-mm",
+        startView: 'years',  //起始选择范围
+        maxViewMode:'years', //最大选择范围
+        minViewMode:'months', //最小选择范围
+        autoclose: true//选中之后自动隐藏日期选择框
+    }).on('changeDate',function(){
+        var startTime = $("#startTime"+idVal).val();
+        var endtime = $("#endTime"+idVal).val();
+        $("#startTime"+idVal).datepicker('setEndDate',endtime);
+        $("#endTime"+idVal).datepicker('hide');
+    });
+}
+//加载年时间控件
+function initDateInputYear(idVal){
+    $('#startTime'+idVal).datepicker({
+        language: "zh-CN",
+        format: "yyyy",
+        startView: 'years',  //起始选择范围
+        maxViewMode:'years', //最大选择范围
+        minViewMode:'years', //最小选择范围
+        autoclose: true//选中之后自动隐藏日期选择框
+    }).on('changeDate',function(){
+        $("#beginTime-error").hide();
+        var startTime= $("#startTime"+idVal).val();
+        $("#endTime"+idVal).datepicker('setStartDate',startTime);
+        $("#startTime"+idVal).datepicker('hide');
+    });
+
+    $('#endTime'+idVal).datepicker({
+        language: "zh-CN",
+        format: "yyyy",
+        startView: 'years',  //起始选择范围
+        maxViewMode:'years', //最大选择范围
+        minViewMode:'years', //最小选择范围
+        autoclose: true//选中之后自动隐藏日期选择框
+    }).on('changeDate',function(){
+        var startTime = $("#startTime"+idVal).val();
+        var endtime = $("#endTime"+idVal).val();
+        $("#startTime"+idVal).datepicker('setEndDate',endtime);
+        $("#endTime"+idVal).datepicker('hide');
+    });
+}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/record/signedRecord.js b/src/main/webapp/static/js/record/signedRecord.js
index 0714c4d..f3c1ae0 100644
--- a/src/main/webapp/static/js/record/signedRecord.js
+++ b/src/main/webapp/static/js/record/signedRecord.js
@@ -7,65 +7,7 @@ $(function(){
     getDeptStatistics();
     initTable();
 })
-//时间控件
-function initDateInputMonth(idVal){
-    $('#startTime'+idVal).datepicker({
-        language: "zh-CN",
-        format: "yyyy-mm",
-        startView: 'years',  //起始选择范围
-        maxViewMode:'years', //最大选择范围
-        minViewMode:'months', //最小选择范围
-        autoclose: true//选中之后自动隐藏日期选择框
-    }).on('changeDate',function(){
-        $("#beginTime-error").hide();
-        var startTime= $("#startTime"+idVal).val();
-        $("#endTime"+idVal).datepicker('setStartDate',startTime);
-        $("#startTime"+idVal).datepicker('hide');
-    });
-
-    $('#endTime'+idVal).datepicker({
-        language: "zh-CN",
-        format: "yyyy-mm",
-        startView: 'years',  //起始选择范围
-        maxViewMode:'years', //最大选择范围
-        minViewMode:'months', //最小选择范围
-        autoclose: true//选中之后自动隐藏日期选择框
-    }).on('changeDate',function(){
-        var startTime = $("#startTime"+idVal).val();
-        var endtime = $("#endTime"+idVal).val();
-        $("#startTime"+idVal).datepicker('setEndDate',endtime);
-        $("#endTime"+idVal).datepicker('hide');
-    });
-}
-function initDateInputYear(idVal){
-    $('#startTime'+idVal).datepicker({
-        language: "zh-CN",
-        format: "yyyy",
-        startView: 'years',  //起始选择范围
-        maxViewMode:'years', //最大选择范围
-        minViewMode:'years', //最小选择范围
-        autoclose: true//选中之后自动隐藏日期选择框
-    }).on('changeDate',function(){
-        $("#beginTime-error").hide();
-        var startTime= $("#startTime"+idVal).val();
-        $("#endTime"+idVal).datepicker('setStartDate',startTime);
-        $("#startTime"+idVal).datepicker('hide');
-    });
 
-    $('#endTime'+idVal).datepicker({
-        language: "zh-CN",
-        format: "yyyy",
-        startView: 'years',  //起始选择范围
-        maxViewMode:'years', //最大选择范围
-        minViewMode:'years', //最小选择范围
-        autoclose: true//选中之后自动隐藏日期选择框
-    }).on('changeDate',function(){
-        var startTime = $("#startTime"+idVal).val();
-        var endtime = $("#endTime"+idVal).val();
-        $("#startTime"+idVal).datepicker('setEndDate',endtime);
-        $("#endTime"+idVal).datepicker('hide');
-    });
-}
 //出院时段触发查询
 function loadTableByTime(value,startDateId,endDateId,tableId){
     //填空出院日期搜索框并立即查询
@@ -134,31 +76,6 @@ function getDeptStatistics() {
         }
     });
 }
-/*//科室变更事件
-$("#deptName").change(function () {
-    var text = $(this).find('option:checked').text();
-    $("#checkedOption").text(text);
-})*/
-//按日期查询变更事件
-$("#dateFlag").change(function(){
-    var value = $(this).val();
-    if(value == 1){
-        $("#day").show();
-        $("#month").hide();
-        $("#year").hide();
-    }else if(value == 2){
-        $("#day").hide();
-        $("#month").show();
-        $("#year").hide();
-        //获取加载层数级
-        initDateInputMonth(3);
-    }else if(value == 3){
-        $("#day").hide();
-        $("#month").hide();
-        $("#year").show();
-        initDateInputYear(4);
-    }
-})
 
 //格式化百分比
 function formatPercent(value){
@@ -323,14 +240,4 @@ $("#excelBtn").click(function () {
         "endDate":endDate,
         "dateFlag":dateFlag
     });
-});
-
-function getStartOrEndDate(dateFlag,divId){
-    if(dateFlag == 1){
-        return $("#"+divId+"1").val();
-    }else if(dateFlag == 2){
-        return $("#"+divId+"3").val();
-    }else if(dateFlag == 3){
-        return $("#"+divId+"4").val();
-    }
-}
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/main/webapp/static/js/statistics/scanCount.js b/src/main/webapp/static/js/statistics/scanCount.js
index 79ff2bf..7bb1081 100644
--- a/src/main/webapp/static/js/statistics/scanCount.js
+++ b/src/main/webapp/static/js/statistics/scanCount.js
@@ -1,6 +1,24 @@
 var tipLoad = 1;
 //定义表格内容最大高度
 var maxHeight = 0;
+//按日期查询变更事件
+$("#dateFlag").change(function(){
+    var value = $(this).val();
+    if(value == 1){
+        $("#day").show();
+        $("#month").hide();
+        $("#year").hide();
+    }else if(value == 2){
+        $("#day").hide();
+        $("#month").show();
+        $("#year").hide();
+    }else if(value == 3){
+        $("#day").hide();
+        $("#month").hide();
+        $("#year").show();
+    }
+    $("#table").bootstrapTable("refresh");
+})
 function initTable() {
     if(tipLoad == 1){
         $("#table").bootstrapTable({ // 对应table标签的id
@@ -50,13 +68,17 @@ function initTable() {
                     limit = currPageSize;
                     this.pageSize = currPageSize;
                 }
+                var dateFlag = $("#dateFlag").val();
+                var startDate = getStartOrEndDate(dateFlag,"startTime");
+                var endDate = getStartOrEndDate(dateFlag,"endTime");
                 var temp = {
                     limit: limit,     //页面大小
                     offset: offset,   //页码
-                    startDate: $("#startTime1").val(),
-                    endDate: $("#endTime1").val(),
+                    startDate: startDate,
+                    endDate: endDate,
                     name:$("#name").val(),
-                    isSearch:$("#isSearch").val()
+                    isSearch:$("#isSearch").val(),
+                    dateFlag:$("#dateFlag").val()
                 };
                 return temp;
             },
@@ -66,31 +88,31 @@ function initTable() {
                 checkbox: true,
                 width: 25,
                 align: 'center',
-                valign: 'middle',
+                valign: 'middle'
             },
                 {
                     title: '扫描人',
                     field: 'uuname',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '扫描日期',
                     field: 'uploaddatetime',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '扫描次数',
                     field: 'scanCount',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '扫描份数',
                     field: 'scanNums',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
             ],
             onLoadSuccess: function (result) {  //加载成功时执行
@@ -109,28 +131,40 @@ function initTable() {
 $("#excelBtn").click(function () {
     //获取选中数据记录
     var idlist = $('#table').bootstrapTable('getAllSelections');
+    var dateFlag = $("#dateFlag").val();
     var sql = '';//AND ((uuName = '何素芳' and convert(date, UpLoadDateTime, 8) = '2019-12-26') or (uuName = '何素芳' and convert(date, UpLoadDateTime, 8) = '2019-12-26'))
     if(idlist.length > 0){
+        var dateWhereSql = '';
+        if(dateFlag == 1){
+            dateWhereSql = 'CONVERT (VARCHAR(10), t1.UpLoadDateTime, 120)';
+        }else if(dateFlag == 2){
+            dateWhereSql = 'CONVERT (VARCHAR(7), t1.UpLoadDateTime, 120)';
+        }else if(dateFlag == 3){
+            dateWhereSql = 'CONVERT (VARCHAR(4), t1.UpLoadDateTime, 120)';
+        }
         for (var i = 0; i < idlist.length; i++) {
             if(idlist.length == 1){
-                sql += "AND (uuName = '"+idlist[i].uuname+"' and CONVERT (date, UpLoadDateTime, 8) = '"+idlist[i].uploaddatetime+"')";
+                sql += "AND (powerusers.name = '"+idlist[i].uuname+"' and "+dateWhereSql+" = '"+idlist[i].uploaddatetime+"')";
             }else{
                 if(i == 0){
-                    sql += "AND ((uuName = '"+idlist[i].uuname+"' and CONVERT (date, UpLoadDateTime, 8) = '"+idlist[i].uploaddatetime+"') or ";
+                    sql += "AND ((powerusers.name = '"+idlist[i].uuname+"' and "+dateWhereSql+" = '"+idlist[i].uploaddatetime+"') or ";
                 }else if(i != idlist.length - 1){
-                    sql += "(uuName = '"+idlist[i].uuname+"' and CONVERT (date, UpLoadDateTime, 8) = '"+idlist[i].uploaddatetime+"') or ";
+                    sql += "(powerusers.name = '"+idlist[i].uuname+"' and "+dateWhereSql+" = '"+idlist[i].uploaddatetime+"') or ";
                 }else if(i == idlist.length - 1){
-                    sql += "(uuName = '"+idlist[i].uuname+"' and CONVERT (date, UpLoadDateTime, 8) = '"+idlist[i].uploaddatetime+"'))";
+                    sql += "(powerusers.name = '"+idlist[i].uuname+"' and "+dateWhereSql+" = '"+idlist[i].uploaddatetime+"'))";
                 }
             }
         }
     }
     var url = path+"/statistics/exportExcelScanCount";
+    var startDate = getStartOrEndDate(dateFlag,"startTime");
+    var endDate = getStartOrEndDate(dateFlag,"endTime");
     post(url, {
-        "startDate": $("#startTime1").val(),
-        "endDate": $("#endTime1").val(),
+        "startDate": startDate,
+        "endDate": endDate,
         "name":$("#name").val(),
         "isSearch":$("#isSearch").val(),
-        "sql":sql
+        "sql":sql,
+        "dateFlag":dateFlag
     });
-});
\ No newline at end of file
+});
diff --git a/src/main/webapp/static/js/statistics/scanInfo.js b/src/main/webapp/static/js/statistics/scanInfo.js
index 39f305b..d2b3adb 100644
--- a/src/main/webapp/static/js/statistics/scanInfo.js
+++ b/src/main/webapp/static/js/statistics/scanInfo.js
@@ -67,73 +67,79 @@ function initTable() {
                 checkbox: true,
                 width: 25,
                 align: 'center',
-                valign: 'middle',
+                valign: 'middle'
             },
                 {
                     title: '记账号',
                     field: 'patientId',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '住院号',
                     field: 'inpNo',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '住院次数',
                     field: 'visitId',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '患者姓名',
                     field: 'hzname',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '性别',
                     field: 'sex',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '入院时间',
                     field: 'admissionDateTime',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '出院时间',
                     field: 'dischargeDateTime',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '出院科室',
                     field: 'doctorDept',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '主管医生',
                     field: 'doctorInCharge',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 },
                 {
                     title: '扫描人',
                     field: 'uuname',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
+                },
+                {
+                    title: '文件名',
+                    field: 'title',
+                    align: 'center',
+                    valign: 'middle'
                 },
                 {
                     title: '扫描时间',
                     field: 'uploaddatetime',
                     align: 'center',
-                    valign: 'middle',
+                    valign: 'middle'
                 }
             ],
             onLoadSuccess: function (result) {  //加载成功时执行