Merge branch 'master' of http://120.27.212.36:10101/r/record/EMR_Medical_Record

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('作废','已封存')
     <if test="id != null and id != ''">
       and m.id = #{id,jdbcType=NVARCHAR}
     </if>

src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp

@@ -3347,7 +3347,7 @@
                                         a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
                                     }
                                     //a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
-                                } else if (value == "已认证") {
+                                } else if (value == "已封存") {
                                     a = '<span style="color:#FF7F24"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
                                 } else if (value == "复审退回") {
                                     a = '<span style="color:#db0ead"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
@@ -3373,7 +3373,7 @@
                             var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
                             var html = "";
                             //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
-                            if (index != null && index != "" && index.indexOf("select") != -1) {
+                            if (index != null && index != "" && index.indexOf("select") != -1 && row.archivestate != "已封存") {
                                 html = '<button type="button" class="btn btn-danger btn-sm selInfo" >查看</button>';// '<a href="javascript:;" class="delete">删除</a>';
                             }
                             if (index.indexOf("qxSel") != -1) {