From 5da519f62478f6ba83daa13003e64f7e299d5cac Mon Sep 17 00:00:00 2001
From: hujl <123@qq.com>
Date: Mon, 24 May 2021 09:59:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E6=9C=89=E9=97=AE=E9=A2=98=E6=94=B9=E4=B8=BA=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E4=B8=8D=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=9C=89?=
 =?UTF-8?q?=E7=BA=B8=E8=B4=A8=E9=80=81=E5=BE=80=E7=97=85=E6=A1=88=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/emr/controller/lastVerifyController.java    |  6 +++---
 .../WEB-INF/views/lastVerifyDir/lastVerifyList.jsp  | 13 ++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java
index 63e1d5dc..1309509d 100644
--- a/src/main/java/com/emr/controller/lastVerifyController.java
+++ b/src/main/java/com/emr/controller/lastVerifyController.java
@@ -292,9 +292,9 @@ public class lastVerifyController {
                     archiveMaster.setSigner("");
                     archiveMaster.setSignTime("");
                 } else if (isSign == 1) {
-                   // System.out.println((archiveMaster.getIsscaned().equals("1"))+"===="+archiveMaster.getIsscaned()!="1");
-                    if(archiveMaster.getIsscaned().equals("1") && archiveMaster.getIsscaned()!="1") {
-                        result = "该份病案签收失败,纸质病历未送病案室!";
+                    System.out.println((archiveMaster.getIsscaned().equals("1"))+"===="+archiveMaster.getIsscaned()!="1");
+                    if(archiveMaster.getIsscaned().equals("0")) {
+                        result = "无纸质，无需签收!";
                         return  result;
                     }else {
                         archiveMaster.setSigner(username);
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index f416efca..27f4494f 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -1369,12 +1369,8 @@
     </div>
 </div>
 
-
-
 <%--没签收是否强制提交弹窗--%>
-<div class="modal fade" id="
-
-" tabindex="-5" role="dialog" aria-labelledby="exampleModalLabel">
+<div class="modal fade" id="verinfyQZModal" tabindex="-5" role="dialog" aria-labelledby="exampleModalLabel">
     <div class="modal-dialog" role="document">
         <div class="modal-content ">
             <div class="modal-header2">
@@ -1397,6 +1393,8 @@
         </div>
     </div>
 </div>
+
+
 </body>
 
 <script type="text/javascript">
@@ -2232,6 +2230,7 @@
            //无纸质 或 有纸质且已签收
            verinfyFun();
        }else{
+           console.log("==========================");
            //弹窗是否强制提交
            $('#verinfyQZModal').modal({
                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
@@ -3591,10 +3590,10 @@
                                 }
                             }
                             if (index.indexOf("signFlg") != -1) {
-                               if(row.isSign==0){
+                               if(row.isSign==0 && row.isscaned==1){
                                    //签收显示取消签收
                                    html += '<button type="button" class="btn btn-sm btn-warning signInfo">签收</button>';
-                                }else{
+                                }else if(row.isSign==1 && row.isscaned==1){
                                    html += '<button type="button" class="btn btn-sm btn-warning signCancelInfo">取消签收</button>';
                                }
                             }