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('作废') and m.id = #{id,jdbcType=NVARCHAR} 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;