From 57f1a6994875e8a9db6b114b9b8ce177ec409153 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Fri, 25 Feb 2022 00:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A7=82=E7=97=85?=
 =?UTF-8?q?=E5=8E=86=E6=9F=A5=E8=AF=A2=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/Archive_MasterMapper.xml          | 1 -
 .../webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp   | 5 +++--
 .../webapp/static/js/lastVerify/observationRecordList.js    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

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 != '已归档'
         <if test="patientId != null and patientId != ''">
             AND patient_id LIKE '%' + #{patientId} + '%'
         </if>
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 @@
                         <select class="input-sm form-control" id="archivestate">
                             <option value="">全部</option>
                             <option value="初审">初审</option>
-                            <option value="初审退回">初审退回</option>
+                            <option value="复审退回">复审退回</option>
+                            <option value="已归档">已归档</option>
                         </select>
                     </div>
                     <div class="form-group divCss">
@@ -5393,5 +5394,5 @@
         }
     }
 </script>
-<script src="${path}/static/js/lastVerify/observationRecordList.js"></script>
+<script src="${path}/static/js/lastVerify/observationRecordList.js?time=2022-02-25"></script>
 </html>
\ 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 = '<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:red"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
                         }
                         return a;
-                    }
+                    }*/
                 },
                 {
                     title: '是否死亡',