修改预超期通知，提交报表的最后一层增加完整性一列

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;//完整性描述
 }
  
 

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<User> 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);
                 }

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 = "护士已提交";
             }

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 + "%");
                 }
             }
         }

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<String> roleList){
-        return name + roleList.get(0) + ",您有"+count+"份病历是"+roleList.get(1)+"状态，请及时查阅";
+        return name + roleList.get(0) + ",您有"+count+"份日期已超过预超期日期是"+roleList.get(1)+"状态的病历，请及时查阅";
     }
 
     /**