diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 7212569c..6f91ac1b 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -513,7 +513,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 not in('作废') + and m.ArchiveState not in('作废','已封存') and m.id = #{id,jdbcType=NVARCHAR} diff --git a/src/main/webapp/WEB-INF/lib/power-foundaton-1.0-SNAPSHOT.jar b/src/main/webapp/WEB-INF/lib/power-foundaton-1.0-SNAPSHOT.jar deleted file mode 100644 index 20f77c33..00000000 Binary files a/src/main/webapp/WEB-INF/lib/power-foundaton-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index 14e4bcee..5a8f9c46 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -3347,7 +3347,7 @@ a = '' + value + ''; } //a = '' + value + ''; - } else if (value == "已认证") { + } else if (value == "已封存") { a = '' + value + ''; } else if (value == "复审退回") { a = '' + value + ''; @@ -3373,7 +3373,7 @@ var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); var html = ""; //return ''; - if (index != null && index != "" && index.indexOf("select") != -1) { + if (index != null && index != "" && index.indexOf("select") != -1 && row.archivestate != "已封存") { html = '';// '删除'; } if (index.indexOf("qxSel") != -1) {