From 0582783c80b7d0eecc47fe97a4784241a98ae8f7 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Fri, 14 May 2021 19:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A2=9E=E5=8A=A0=E5=87=BA?=
 =?UTF-8?q?=E9=99=A2=E6=B5=8F=E8=A7=88=E8=B6=85=E6=9C=9F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/emr/entity/Archive_Master_Vo.java     |  4 ++
 .../ipml/Archive_MasterServiceImpl.java       |  5 ++
 .../java/com/emr/service/ipml/EnumVerify.java | 56 ++++++++++++++++++-
 .../webapp/static/js/beHospList/beHospList.js |  4 +-
 4 files changed, 67 insertions(+), 2 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 0b9b0b9..510c0c6 100644
--- a/src/main/java/com/emr/entity/Archive_Master_Vo.java
+++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java
@@ -32,6 +32,10 @@ public class Archive_Master_Vo extends Archive_Master{
 
     private String status;//转换中文状态
 
+    private String currentStatus;//转换当前状态
+
+    private Integer approvedFlag;//是否已经审核
+
     private String remark;//审核内容
 
     private Integer roleCode;//审核角色stepIndex,步骤编码
diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index 917c0c3..8d0120f 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -285,8 +285,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                         boolean numeric = isNumeric(archivestate);
                         if (numeric) {
                             Integer status = Integer.valueOf(archivestate);
+                            //组织已经审核的状态
                             archivestate = EnumVerify.DocState.GetStepName(status, role.getCode());
+                            //组织未审核的状态
+                            String currentArchivestate = EnumVerify.DocState.GetCurrentStepName(status, role.getCode());
                             masterVo.setStatus(archivestate);
+                            masterVo.setCurrentStatus(currentArchivestate);
+                            //根据角色
                             //获取审核按钮和退回按钮集合
                             String btns = getBtns(status, flowRoles, masterVo.getId());
                             masterVo.setBtns(btns);
diff --git a/src/main/java/com/emr/service/ipml/EnumVerify.java b/src/main/java/com/emr/service/ipml/EnumVerify.java
index 983087b..725e9aa 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, NurseSubmit) && (Checker.Dortor.code != role))
+            if (HasCurrentState(curState, DortorBack) && (Checker.Dortor.code != role))
             {
                 nurseV = "护士已提交";
             }
@@ -172,6 +172,60 @@ public class EnumVerify {
             return tmpV;
         }
 
+        /**
+         * 获取待质控字符
+         * @param curState
+         * @param role
+         * @return
+         */
+        public static String GetCurrentStepName(Integer curState,int role)
+        {
+            String doctorV = "";
+            String nurseV = "";
+            if (HasCurrentState(curState, None) || HasCurrentState(curState, DortorBack) || !HasCurrentState(curState, DortorSubmit))
+            {
+                doctorV = ",医生未质控";
+            }
+            if (HasCurrentState(curState, DortorSubmit) && !HasCurrentState(curState, DortorCheck))
+            {
+                doctorV = ",医生质控员未质控";
+            }
+            if (HasCurrentState(curState, DortorCheck) && !HasCurrentState(curState, DirectorCheck))
+            {
+                doctorV = ",科主任未质控";
+            }
+            if (HasCurrentState(curState, None) || HasCurrentState(curState, NurseBack) || !HasCurrentState(curState, NurseSubmit))
+            {
+                nurseV = ",护士未质控";
+            }
+            if (HasCurrentState(curState, NurseSubmit) && !HasCurrentState(curState, NurseCheck))
+            {
+                nurseV = ",护士质控员未质控";
+            }
+            String tmpV = "";
+            if(Checker.Dortor.code == role){
+                tmpV = doctorV;
+            }else if(Checker.Nurse.code == role){
+                tmpV = nurseV;
+            }else if(Checker.Generate.code == role){
+                tmpV = doctorV + nurseV;
+            }
+            if (HasCurrentState(curState, DirectorCheck) && HasCurrentState(curState, NurseCheck))
+            {
+                tmpV = ",护士长未质控";
+            }
+            if (HasCurrentState(curState,HeadNurseCheck))
+            {
+                tmpV = ",病案室未质控";
+            }
+            if(tmpV.startsWith(","))
+            {
+                tmpV = tmpV.substring(1);
+            }
+
+            return tmpV;
+        }
+
         //获取当前步骤所包含的枚举值，可以返回多个值
         public static ArrayList<Integer> GetCurrentStepContainStates(int curState) throws Exception
         {
diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js
index ae9e5f2..0dfb749 100644
--- a/src/main/webapp/static/js/beHospList/beHospList.js
+++ b/src/main/webapp/static/js/beHospList/beHospList.js
@@ -418,7 +418,9 @@ function paramsMatter(value, row) {
     if(value == null){
         value = '';
     }
-    value = '<p title="'+value+'">'+result+value+'</p>';
+    if(result != '') {
+        return  '<p title="' + value + '">' + result + row.currentStatus + '</p>';
+    }
     return value;
 }
 //审核弹窗 单个审批①