From 1e709b3057a2d8af8bfd8e04e92dfd1a855f6fa5 Mon Sep 17 00:00:00 2001
From: wengjx <2365319070@qq.com>
Date: Tue, 19 Jul 2022 15:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E7=B3=BB=E7=BB=9F=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BA=BA=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medicalRecallDateController.java          |  2 +-
 .../js/lastVerifyList/lastVerifyList.js       | 52 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/emr/controller/medicalRecallDateController.java b/src/main/java/com/emr/controller/medicalRecallDateController.java
index c309588..eef1df0 100644
--- a/src/main/java/com/emr/controller/medicalRecallDateController.java
+++ b/src/main/java/com/emr/controller/medicalRecallDateController.java
@@ -71,7 +71,7 @@ public class medicalRecallDateController {
                 }
             }
             //文件名
-            String fileName = "召回记录" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
+            String fileName = "病案终审退回日志"  + ".xls";
             //ExportExcelUtil
             ExportExcelUtil exportExcelUtil = new ExportExcelUtil();
             //导出excel的操作
diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
index dd639ba..ee79a7d 100644
--- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
+++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
@@ -188,32 +188,32 @@ function initTable() {
                         return str;
                     }
                 },
-                {
-                    title: 'HIS召回状态',
-                    field: 'callBackStatus',
-                    align: 'center',
-                    valign: 'middle',
-                    formatter:function(value, row){
-                        if(value == '召回中'){
-                            return '<span style="color:green">召回中</span>';
-                        }else{
-                            return '<span style="color:red">未召回</span>';
-                        }
-                    }
-                },
-                {
-                    title: '打印状态',
-                    field: 'printStatus',
-                    align: 'center',
-                    valign: 'middle',
-                    formatter:function(value, row){
-                        if(value == '是'){
-                            return '<span style="color:green">是</span>';
-                        }else{
-                            return '<span style="color:red">否</span>';
-                        }
-                    }
-                },
+                // {
+                //     title: 'HIS召回状态',
+                //     field: 'callBackStatus',
+                //     align: 'center',
+                //     valign: 'middle',
+                //     formatter:function(value, row){
+                //         if(value == '召回中'){
+                //             return '<span style="color:green">召回中</span>';
+                //         }else{
+                //             return '<span style="color:red">未召回</span>';
+                //         }
+                //     }
+                // },
+                // {
+                //     title: '打印状态',
+                //     field: 'printStatus',
+                //     align: 'center',
+                //     valign: 'middle',
+                //     formatter:function(value, row){
+                //         if(value == '是'){
+                //             return '<span style="color:green">是</span>';
+                //         }else{
+                //             return '<span style="color:red">否</span>';
+                //         }
+                //     }
+                // },
                 {
                     title: "操作",
                     align: 'left',