From 393d4b6da5b9d3e783e9255db702b91854b4ac8a Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Tue, 3 Aug 2021 11:49:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=B7=A5=E4=BD=9C=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/service/ipml/WorkHomeService.java | 25 ++++++++++--------- .../resources/mapper/Archive_MasterMapper.xml | 11 ++++---- .../views/workHome/medicalRoomManage.jsp | 2 +- .../WEB-INF/views/workHome/workHomeList.jsp | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/emr/service/ipml/WorkHomeService.java b/src/main/java/com/emr/service/ipml/WorkHomeService.java index bb9de81..e0383ac 100644 --- a/src/main/java/com/emr/service/ipml/WorkHomeService.java +++ b/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 medicalRoomManageData(String startDateTo, String endDateTo) throws Exception{ - //查询总数据 1.出院人数 2.待终审数量 3.已归档数量 4.已签收数量 5.已扫描数量 6.待终审已扫描 + //查询总数据 1.出院人数 2.待终审数量 3.已终审数量 4.已签收数量 5.已扫描数量 6.待终审已签收 List 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 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; diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 2b4ae13..40978db 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1466,9 +1466,9 @@ union all select COUNT(1) count from archive_master where ArchiveState = '64' - --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' --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 ) 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 ) temp + select COUNT(1) count from archive_master where ArchiveState = '64' and T1 is not null and T1 != '' and T1 >= '1801-02-04' + diff --git a/src/main/webapp/WEB-INF/views/workHome/medicalRoomManage.jsp b/src/main/webapp/WEB-INF/views/workHome/medicalRoomManage.jsp index 9bdcf36..ca1892a 100644 --- a/src/main/webapp/WEB-INF/views/workHome/medicalRoomManage.jsp +++ b/src/main/webapp/WEB-INF/views/workHome/medicalRoomManage.jsp @@ -69,7 +69,7 @@
0
-
终审数量
+
归档数量
diff --git a/src/main/webapp/WEB-INF/views/workHome/workHomeList.jsp b/src/main/webapp/WEB-INF/views/workHome/workHomeList.jsp index 6adcbff..1d84849 100644 --- a/src/main/webapp/WEB-INF/views/workHome/workHomeList.jsp +++ b/src/main/webapp/WEB-INF/views/workHome/workHomeList.jsp @@ -31,7 +31,7 @@
-
+