From 2689ad946ad9974d42ac70b7752033aae1d4ad7d Mon Sep 17 00:00:00 2001
From: wzqgit <568275241@qq.com>
Date: Mon, 7 Jun 2021 15:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E6=A1=88=E7=A4=BA=E8=B8=AA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E5=86=8D=E6=9F=A5=E8=AF=A2=E4=BD=9C=E5=BA=9F?=
 =?UTF-8?q?=E7=97=85=E5=8E=86=20=E4=BF=AE=E5=A4=8D=E5=87=BA=E9=99=A2?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E9=A1=B5=E9=9D=A2=E5=8C=BB=E7=94=9F=E6=8A=A4?=
 =?UTF-8?q?=E5=A3=AB=E6=8F=90=E4=BA=A4=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E7=BB=88=E5=AE=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=90=8E=EF=BC=8C=E6=B8=85=E7=A9=BA=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=A1=86=206/7=20wzq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/Archive_MasterMapper.xml     |  2 +-
 .../WEB-INF/views/beHospitaledDir/beHospList.jsp       | 10 +++++++---
 .../WEB-INF/views/lastVerifyDir/lastVerifyList.jsp     |  2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index b0a849ff..42054d6e 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -510,7 +510,7 @@
     LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and content!='' and content is not null and back_flag is not null GROUP BY archive_detail_id) s
     on m.id=s.archive_detail_id
     where 1=1
-    --and m.ArchiveState in('归档中','初审','复审退回','提交','主任退回' )
+    and m.ArchiveState not in('作废')
     <if test="id != null and id != ''">
       and m.id = #{id,jdbcType=NVARCHAR}
     </if>
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index b81a92ab..729e2c9a 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -2653,7 +2653,7 @@
                 data: {cmtDoctor: doctorFlag, id: id, lockinfo: lockinfo, content: content, isscaned: isScanedChk},
                 success: function (result) {
                     $("#doctorModal").modal('hide');
-                    if (result.indexOf("成功")) {
+                    if (result.indexOf("成功")!=-1) {
                         $("#table").bootstrapTable("refresh");
                         toastr.success("归档医生提交成功!");
                     } else {
@@ -2661,6 +2661,7 @@
                     }
                 }
             });
+            $("input[name='isScanedChk']").prop("checked",false);
         }else{
             //如果缺失病案首页或入院记录则无法强制提交
             if (lockinfo.indexOf("病案首页") != -1 || lockinfo.indexOf("入院记录") != -1) {
@@ -2706,14 +2707,15 @@
                 data: {cmtNurse: nursFlag, id: id, lockinfo: lockinfo, content: content, isscaned: isScanedChk2},
                 success: function (result) {
                     $("#nursModal").modal('hide');
-                    if (result.indexOf("成功")) {
+                    if (result.indexOf("成功")!=-1) {
                         $("#table").bootstrapTable("refresh");
                         toastr.success("归档护士提交成功!");
                     } else {
-                        toastr.error("归档护士提交失败!");
+                        toastr.error(result);
                     }
                 }
             });
+            $("input[name='isScanedChk2']").prop("checked",false);
         }else{
             $("#flagStaff").val(1);
             //弹窗提示是否强制性
@@ -2773,6 +2775,8 @@
                 }
             }
         });
+        $("input[name='isScanedChk']").prop("checked",false);
+        $("input[name='isScanedChk2']").prop("checked",false);
     });
 
     $("#wzSaveBtn").on('click', function () {
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index 0a39b478..ab0fe5c8 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -4312,6 +4312,7 @@
             var visitId=signArr[1];
             var isSign=1;
             updateSignStateFun(inpNo,visitId,isSign);
+            $('#archiveIdSign').val('');
         }else{
             toastr.warning("签收值格式应为：住院号-住院次数!");
             return;
@@ -4334,6 +4335,7 @@
             var visitId=signArr[1];
             var isSign=0;
             updateSignStateFun(inpNo,visitId,isSign);
+            $('#archiveIdSign').val('');
         }else{
             toastr.warning("签收值格式应为：住院号-住院次数");
             return;