From 669dc914e6666e3cce3ee353f305af22a186af84 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 26 Aug 2020 14:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=97=85=E6=A1=88=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2=E9=A1=B5=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emr/service/ipml/StatisticsService.java   | 36 ++++++++++---------
 .../mapper/RecordStatisticsMapper.xml         | 10 +++---
 .../static/js/statistics/recordStatistics.js  |  2 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/emr/service/ipml/StatisticsService.java b/src/main/java/com/emr/service/ipml/StatisticsService.java
index c892b8e..ecd0d8d 100644
--- a/src/main/java/com/emr/service/ipml/StatisticsService.java
+++ b/src/main/java/com/emr/service/ipml/StatisticsService.java
@@ -220,29 +220,21 @@ public class StatisticsService {
             //查询总文件数
             fileCountList = recordStatisticsMapper.getFileCount(recordStatistics);
         }
-        //计算总文件数,总自动采集文件数，扫描上传文件数
+        //计算总文件数,总自动采集文件数，扫描上传文件数,计算页数
         setFileCounts(record, fileCountList,null,null);
-        //计算总页数,自动采集总页数,扫描上传总页数
-        setPageCounts(record);
         list.add(record);
         return list;
     }
 
-    //计算总页数,自动采集总页数,扫描上传总页数
-    private void setPageCounts(RecordStatistics record) {
-        //TODO 设置总页数
-        record.setAllPageCount(null);
-        //TODO 设置自动采集总页数
-        record.setAutoCollectionPageCount(null);
-        //TODO 设置扫描上传总页数
-        record.setManualScanPageCount(null);
-    }
-
     //计算总文件数,总自动采集文件数，扫描上传文件数
     private void setFileCounts(RecordStatistics record, List<RecordStatistics> fileCountList,String param,String paramFlag) {
         int allFileCount = 0;
         int autoFileCount = 0;
         int scanFileCount = 0;
+        //页数计算
+        int allPageCount = 0;
+        int autoCollectionPageCount = 0;
+        int manualScanPageCount = 0;
         if(!CollectionUtils.isEmpty(fileCountList) && (record.getAllRecordCount() == null || record.getAllRecordCount() != 0)){
             for(RecordStatistics recordTemp : fileCountList){
                 //定义是否匹配标识
@@ -258,12 +250,20 @@ public class StatisticsService {
                     //计算总文件数
                     allFileCount += fileCount;
                     String source = recordTemp.getSource();
+                    //获取分类页数
+                    Integer allPageCountTemp = recordTemp.getAllPageCount();
+                    //总页数
+                    allPageCount += allPageCountTemp;
                     if (StringUtils.isNotBlank(source) && "扫描上传".equals(source)) {
                         //计算扫描上传的文件数
                         scanFileCount += fileCount;
+                        //计算扫描上传的页数
+                        manualScanPageCount += allPageCountTemp;
                     } else {
                         //计算自动采集的文件数
                         autoFileCount += fileCount;
+                        //计算自动采集的页数
+                        autoCollectionPageCount += allPageCountTemp;
                     }
                 }
             }
@@ -274,6 +274,12 @@ public class StatisticsService {
         record.setAutoCollectionFileCount(autoFileCount);
         //设置扫描上传总文件数
         record.setManualScanFileCount(scanFileCount);
+        //设置总页数
+        record.setAllPageCount(allPageCount);
+        //设置自动采集总页数
+        record.setAutoCollectionPageCount(autoCollectionPageCount);
+        //设置扫描上传总页数
+        record.setManualScanPageCount(manualScanPageCount);
     }
 
     /**
@@ -298,8 +304,6 @@ public class StatisticsService {
                 String deptName = record.getDeptName();
                 //计算总文件数,总自动采集文件数，扫描上传文件数
                 setFileCounts(record, fileList,deptName,"deptName");
-                //计算总页数,自动采集总页数,扫描上传总页数
-                setPageCounts(record);
             }
         }
         return list;
@@ -336,8 +340,6 @@ public class StatisticsService {
                 String masterId = record.getMasterId();
                 //计算总文件数,总自动采集文件数，扫描上传文件数
                 setFileCounts(record, fileCountList,masterId,"masterId");
-                //计算总页数,自动采集总页数,扫描上传总页数
-                setPageCounts(record);
             }
         }
         return list;
diff --git a/src/main/resources/mapper/RecordStatisticsMapper.xml b/src/main/resources/mapper/RecordStatisticsMapper.xml
index b58303e..07b41c8 100644
--- a/src/main/resources/mapper/RecordStatisticsMapper.xml
+++ b/src/main/resources/mapper/RecordStatisticsMapper.xml
@@ -32,14 +32,14 @@
     </sql>
     <!--总病历数-->
     <select id="getRecordCount" resultType="java.lang.Integer" parameterType="com.emr.vo.RecordStatistics">
-      SELECT COUNT(archive_master.id) allRecordCount FROM archive_master
+        SELECT COUNT(archive_master.id) allRecordCount FROM archive_master
       <where>
           <include refid="commomSearch"/>
       </where>
     </select>
     <!--总文件数-->
     <select id="getFileCount" resultMap="BaseResultMap" parameterType="com.emr.vo.RecordStatistics">
-        SELECT COUNT(archive_detail.id) allFileCount,Source source FROM archive_detail
+        SELECT COUNT(archive_detail.id) allFileCount,Source source,ISNULL(SUM(archive_detail.PageCount),0) allPageCount FROM archive_detail
         <if test="(deptName != null and deptName != '')
         or (startDate != null and startDate != '' and endDate != null and endDate != '')
         or (inpNo != null and inpNo != '')
@@ -76,7 +76,8 @@
         SELECT
             dept_name deptName,
             COUNT( archive_detail.id ) allFileCount,
-            archive_detail.Source source
+            archive_detail.Source source,
+            ISNULL(SUM(archive_detail.PageCount),0) allPageCount
         FROM
             archive_master
             INNER JOIN archive_detail ON archive_master.id = archive_detail.MasterID
@@ -110,7 +111,8 @@
         SELECT
             MasterID masterId,
             COUNT( id ) allFileCount,
-            Source
+            Source,
+            ISNULL(SUM(archive_detail.PageCount),0) allPageCount
         FROM
             archive_detail
         WHERE
diff --git a/src/main/webapp/static/js/statistics/recordStatistics.js b/src/main/webapp/static/js/statistics/recordStatistics.js
index cc9010f..862b7f8 100644
--- a/src/main/webapp/static/js/statistics/recordStatistics.js
+++ b/src/main/webapp/static/js/statistics/recordStatistics.js
@@ -385,7 +385,7 @@ $('#searchBtnStatistics').click(function () {
         }else if(level == '2') {
             $("#table1").bootstrapTable("refreshOptions", {pageNumber: 1});
         }else if(level == '3') {
-            $(".table2").bootstrapTable("refreshOptions", {pageNumber: 1});
+            $("#table2").bootstrapTable("refreshOptions", {pageNumber: 1});
         }
     } else {
         toastr.warning("正在查询，请稍等...");