From 272b412b5d82086728383b7bb0617de34dd35961 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Mon, 17 May 2021 00:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=B6=85=E6=9C=9F?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=EF=BC=8C=E6=8F=90=E4=BA=A4=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=9C=80=E5=90=8E=E4=B8=80=E5=B1=82=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AE=8C=E6=95=B4=E6=80=A7=E4=B8=80=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/entity/Archive_Master_Vo.java | 2 ++ src/main/java/com/emr/quart/Task1.java | 2 ++ .../java/com/emr/service/ipml/EnumVerify.java | 2 +- .../com/emr/service/ipml/RecordService.java | 31 ++++++++++++++----- .../emr/service/ipml/SendMessageService.java | 2 +- 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index 510c0c6..fe36c75 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -81,6 +81,8 @@ public class Archive_Master_Vo extends Archive_Master{ private String paperPosition3; private String paperPosition4; + + private String lockInfo;//完整性描述 } diff --git a/src/main/java/com/emr/quart/Task1.java b/src/main/java/com/emr/quart/Task1.java index a271ccf..fa9f593 100644 --- a/src/main/java/com/emr/quart/Task1.java +++ b/src/main/java/com/emr/quart/Task1.java @@ -255,6 +255,7 @@ public class Task1 { Field field = vo.getClass().getDeclaredField(fieldName); field.setAccessible(true); Integer unCheckCount = (Integer) field.get(vo); + System.out.println(unCheckCount); if(unCheckCount > 0){ List roleUserList = new ArrayList<>(); //获取该角色的用户集合 @@ -303,6 +304,7 @@ public class Task1 { User user = selectUserByUserName(key,deptCode, userList); //设置插入信息 int count = map.get(key); + user.setRoleId(1); ArchiveRemindDeptUserInfo obj = setArchiveRemindDeptUserInfo(vo, user, count); list.add(obj); } diff --git a/src/main/java/com/emr/service/ipml/EnumVerify.java b/src/main/java/com/emr/service/ipml/EnumVerify.java index 725e9aa..b8872bd 100644 --- a/src/main/java/com/emr/service/ipml/EnumVerify.java +++ b/src/main/java/com/emr/service/ipml/EnumVerify.java @@ -124,7 +124,7 @@ public class EnumVerify { { doctorV = "科主任已质控"; } - if (HasCurrentState(curState, DortorBack) && (Checker.Dortor.code != role)) + if (HasCurrentState(curState, NurseSubmit) && (Checker.Dortor.code != role)) { nurseV = "护士已提交"; } diff --git a/src/main/java/com/emr/service/ipml/RecordService.java b/src/main/java/com/emr/service/ipml/RecordService.java index e06740c..12c6ccb 100644 --- a/src/main/java/com/emr/service/ipml/RecordService.java +++ b/src/main/java/com/emr/service/ipml/RecordService.java @@ -228,23 +228,35 @@ public class RecordService { //医生质控员提交= 医生提交 - 医生质控员未提交 int doctorCheckCount = doctorSubmitCount - obj.getUnDoctorCheckCount(); obj.setDoctorCheckCount(doctorCheckCount); - obj.setDoctorCheckPercent(Math.round(doctorCheckCount * 100 / count) + "%"); - + //医生质控员提交率 + int doctorCheckPercent = 0; + if(doctorSubmitCount > 0){ + doctorCheckPercent = Math.round(doctorCheckCount * 100 / doctorSubmitCount); + } + obj.setDoctorCheckPercent(doctorCheckPercent + "%"); //科主任提交= 医生质控员提交 - 主任未提交 int directorCheckCount = doctorCheckCount - obj.getUnDirectorCheckCount(); obj.setDirectorCheckCount(directorCheckCount); - obj.setDirectorCheckPercent(Math.round(directorCheckCount * 100 / count) + "%"); - + //科主任提交率 + int directorCheckPercent = 0; + if(doctorCheckCount > 0){ + directorCheckPercent = Math.round(directorCheckCount * 100 / doctorCheckCount); + } + obj.setDirectorCheckPercent(directorCheckPercent + "%"); //护士提交= 总数 - 护士未提交 int nurseSubmitCount = count - obj.getUnNurseSubmitCount(); obj.setNurseSubmitCount(nurseSubmitCount); obj.setNurseSubmitPercent(Math.round(nurseSubmitCount * 100 / count) + "%"); - //护士质控员提交= 护士提交-护士质控员未提交 int nurseCheckCount = nurseSubmitCount - obj.getUnNurseCheckCount(); obj.setUnNurseCheckCount(nurseSubmitCount - nurseCheckCount); obj.setNurseCheckCount(nurseCheckCount); - obj.setNurseCheckPercent(Math.round(nurseCheckCount * 100 / count) + "%"); + //护士质控员提交率 + int nurseCheckPercent = 0; + if(nurseSubmitCount > 0){ + nurseCheckPercent = Math.round(nurseCheckCount * 100 / nurseSubmitCount); + } + obj.setNurseCheckPercent(nurseCheckPercent + "%"); //护士长提交= 科主任或护士质控员提交的数 - 护士长未提交 //定义护士长前提交数量,医生和护士之前的最后一个节点都提交的数量。取科主任和护士质控员中小的值 @@ -252,7 +264,12 @@ public class RecordService { int headNurseCount = beforeHeadNurse - obj.getUnHeadNurseCount(); //护士长未提交等于提交上来的减去护士上长自己提交的 obj.setHeadNurseCount(headNurseCount); - obj.setHeadNursePercent(Math.round(headNurseCount * 100 / count) + "%"); + //定义护士长提交率 + int headNursePercent = 0; + if(beforeHeadNurse > 0){ + headNursePercent = Math.round(headNurseCount * 100 / beforeHeadNurse); + } + obj.setHeadNursePercent(headNursePercent + "%"); } } } diff --git a/src/main/java/com/emr/service/ipml/SendMessageService.java b/src/main/java/com/emr/service/ipml/SendMessageService.java index 8296712..55f2671 100644 --- a/src/main/java/com/emr/service/ipml/SendMessageService.java +++ b/src/main/java/com/emr/service/ipml/SendMessageService.java @@ -98,7 +98,7 @@ public class SendMessageService { * @return */ public String selectContentByRole(String name,Integer count,List roleList){ - return name + roleList.get(0) + ",您有"+count+"份病历是"+roleList.get(1)+"状态，请及时查阅"; + return name + roleList.get(0) + ",您有"+count+"份日期已超过预超期日期是"+roleList.get(1)+"状态的病历，请及时查阅"; } /**