Merge remote-tracking branch 'origin/master'

src/main/java/com/emr/controller/lastVerifyController.java

@@ -294,9 +294,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);

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>';
                                }
                             }