diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index a780fb9a..de5d622f 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1749,7 +1749,6 @@ Archive_Master WHERE inp_no LIKE 'LG%' - AND ArchiveState != '已归档' AND patient_id LIKE '%' + #{patientId} + '%' diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 072b82d6..d9cf1757 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -595,7 +595,8 @@
@@ -5393,5 +5394,5 @@ } } - + \ No newline at end of file diff --git a/src/main/webapp/static/js/lastVerify/observationRecordList.js b/src/main/webapp/static/js/lastVerify/observationRecordList.js index 8b9e860f..c38514d0 100644 --- a/src/main/webapp/static/js/lastVerify/observationRecordList.js +++ b/src/main/webapp/static/js/lastVerify/observationRecordList.js @@ -146,17 +146,17 @@ function initTableLg() { field: 'archivestate', align: 'center', valign: 'middle', - formatter: function (value, row, index) { + /*formatter: function (value, row, index) { //在院 未归档 归档中 初审 已归档 已认证 //在院 未归档 归档中 初审 已归档 已认证 复审退回 var a = ''; if (value == "初审") { a = '' + value + ''; - } else if (value == "初审退回") { + } else if (value == "复审退回") { a = '' + value + ''; } return a; - } + }*/ }, { title: '是否死亡',