提交工作看板数据修改

src/main/java/com/emr/service/ipml/WorkHomeService.java

@@ -76,11 +76,12 @@ public class WorkHomeService {
                 //判断出科
                 String archivestate = archiveMaster.getArchivestate();
                 if(StringUtils.isNotBlank(archivestate)) {
+                    String t1 = archiveMaster.getT1();
                     if ("64".equals(archivestate) || "128".equals(archivestate)) {
                         sumbitCount++;
                     }
-                    //判断归档
-                    if ("128".equals(archivestate)) {
+                    //判断归档 待终审且已签收+已归档
+                    if ("128".equals(archivestate) || ("64".equals(archivestate) && StringUtils.isNotBlank(t1) && !"1801-02-03".equals(t1.substring(0,10)))) {
                         recordCount++;
                     }
                 }
@@ -232,20 +233,20 @@ public class WorkHomeService {
      * @param endDateTo
      */
     public Map<String,String> medicalRoomManageData(String startDateTo, String endDateTo) throws Exception{
-        //查询总数据 1.出院人数 2.待终审数量 3.已归档数量 4.已签收数量 5.已扫描数量 6.待终审已扫描
+        //查询总数据 1.出院人数 2.待终审数量 3.已终审数量 4.已签收数量 5.已扫描数量 6.待终审已签收
         List<Integer> list = archiveMasterMapper.selectStatisticsCount(startDateTo, endDateTo);
         //组织返回数据
         //定义出院人数
         int disCount = 0;
         //定义待终审数量
         int headNurseCount = 0;
-        //定义归档数量
+        //定义归档数量 已终审+待终审已签收
         int recordCount = 0;
         //定义签收数量
         int signCount = 0;
         //已扫描数量
         int isScanCount = 0;
-        //待终审未扫描数量
+        //未扫描数量
         int notScanCount = 0;
         //超期病历
         int overTimeCount = 0;
@@ -255,13 +256,13 @@ public class WorkHomeService {
         int recordRate = 0;
         //签收率 已签收/总出院人数
         int signRate = 0;
-        //扫描率
+        //扫描率 已扫描/已签收
         int scanRate = 0;
         Map<String, String> map = new HashMap<>();
         if (!CollectionUtils.isEmpty(list)) {
             disCount = list.get(0);
             headNurseCount = list.get(1);
-            recordCount = list.get(2);
+            recordCount = list.get(2) + list.get(5);
             signCount = list.get(3);
             isScanCount = list.get(4);
             //待终审未扫描数量 = 待终审总数 - 已扫描
@@ -288,12 +289,12 @@ public class WorkHomeService {
             recordRate = recordCount * 100 / disCount;
         }
         map.put("recordRate",recordRate  + "%");
-        //终审数量
+        //归档数量
         map.put("recordCount", recordCount + "");
         //待终审数量
         map.put("headNurseCount", headNurseCount + "");
         //出科数量 待终审数量+终审数量
-        map.put("submitCount", (recordCount + headNurseCount) + "");
+        map.put("submitCount", (list.get(2) + headNurseCount) + "");
         //签收数量
         map.put("signCount", signCount + "");
         //待签收数量 总出院人数-已签收数量
@@ -309,11 +310,11 @@ public class WorkHomeService {
         map.put("reOverTimeCount",reOverTimeCount + "");
         //已扫描数量
         map.put("isScanCount",isScanCount + "");
-        //待终审未扫描数量
-        map.put("notScanCount",notScanCount + "");
+        //未扫描数量 已签收-已扫描
+        map.put("notScanCount",(signCount - isScanCount) + "");
         //扫描率
         if(disCount != 0){
-            scanRate = (isScanCount * 100 / disCount);
+            scanRate = (isScanCount * 100 / signCount);
         }
         map.put("scanRate",scanRate + "%");
         return map;

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -1466,9 +1466,9 @@
         union all
         select COUNT(1) count from archive_master where ArchiveState = '64'
         <include refid="disDateRangeWhereSql"></include>
-        --3.已归档数量
+        --3.已终审数量
         union all
-        select COUNT(1) count from archive_master where (ArchiveState = '128' or (ArchiveState = '64' and T1 is not null and T1 != '' and T1 >= '1801-02-04'))
+        select COUNT(1) count from archive_master where ArchiveState = '128'
         <include refid="disDateRangeWhereSql"></include>
         --4.已签收数量
         union all
@@ -1479,11 +1479,10 @@
         select count(MasterID) count from ( select distinct MasterID from archive_detail
         inner join archive_master on archive_detail.MasterID = archive_master.id
         where archive_detail.Source = '扫描上传' and flag = 0  <include refid="disDateRangeWhereSql"></include>) temp
-        --6.待终审已扫描
+        --6.待终审已签收
         union all
-        select count(MasterID) count from ( select distinct MasterID from archive_detail
-        inner join archive_master on archive_detail.MasterID = archive_master.id
-        where ArchiveState = '64' and archive_detail.Source = '扫描上传' and flag = 0  <include refid="disDateRangeWhereSql"></include>) temp
+        select COUNT(1) count from archive_master where ArchiveState = '64' and T1 is not null and T1 != '' and T1 >= '1801-02-04'
+        <include refid="disDateRangeWhereSql"></include>
     </select>
 
     <!--超期与预超期数量-->

src/main/webapp/WEB-INF/views/workHome/medicalRoomManage.jsp

@@ -69,7 +69,7 @@
                 </div>
                 <div class="alignCenter" style="flex-flow: column">
                     <div class="data-num" style="margin-left: 0" id="recordCount">0</div>
-                    <div class="data-title">终审数量</div>
+                    <div class="data-title">归档数量</div>
                 </div>
             </div>
         </div>

src/main/webapp/WEB-INF/views/workHome/workHomeList.jsp

@@ -31,7 +31,7 @@
 <div class="searchDiv">
     <form style="margin-top:5px;margin-bottom: 0!important;">
         <div class="form-inline">
-            <div class="form-group" style="margin-left: 62%">
+            <div class="form-group" style="margin-left: 60%">
                 <label for="startDateTo">出院日期:</label>
                 <div class="input-group input-daterange">
                     <input type="text" class="input-sm form-control" name="start" id="startDateTo"