From 23cff7fd4f9b3e1fb7f5e0ed07d3e0c464ac4659 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 21 Apr 2020 10:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/recordManage/templateSearch/searchCommomMethod.js | 9 ++++-----
 .../templateSearch/searchCommomMethodBlood.js            | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethod.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethod.js
index 8f43cbc..75cf0d1 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethod.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethod.js
@@ -327,12 +327,11 @@ function AddFunctionAlty(value, row, index) {
 				str += '<button type="button" class="btn btn-primary TableView btn-sm" onclick="borrowing('+patientId+')"  data-toggle="modal" data-target="#myModal1">借阅申请</button>';
 			}
 		}
-		debugger
 		//判断可否下载
-		if((null != isDownload && isDownload == 1) || downloadRecord == '1'){
-			str += '<button type="button" class="btn btn-sm btn-info TableView btn-sm" onclick="downloadPdf('+patientId+')">下载PDF</button>';
-		}else{
-			if(downloadOper == 1){
+		if(downloadOper == 1){
+			if((null != isDownload && isDownload == 1) || downloadRecord == '1'){
+				str += '<button type="button" class="btn btn-sm btn-info TableView btn-sm" onclick="downloadPdf('+patientId+')">下载PDF</button>';
+			}else{
 				str += '<button type="button" class="btn btn-success TableView btn-sm" onclick="downBorrowing('+patientId+')"  data-toggle="modal" data-target="#myModal1">下载申请</button>';
 			}
 		}
diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js
index 24a1df0..304199d 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodBlood.js
@@ -369,10 +369,10 @@ function AddFunctionAlty(value, row, index) {
 			}
 		}
 		//判断可否下载
-		if((null != isDownload && isDownload == 1) || downloadRecord == '1'){
-			str += '<button type="button" class="btn btn-sm btn-info TableView btn-sm" onclick="downloadPdf('+patientId+')">下载PDF</button>';
-		}else{
-			if(downloadOper == 1){
+		if(downloadOper == 1){
+			if((null != isDownload && isDownload == 1) || downloadRecord == '1'){
+				str += '<button type="button" class="btn btn-sm btn-info TableView btn-sm" onclick="downloadPdf('+patientId+')">下载PDF</button>';
+			}else{
 				str += '<button type="button" class="btn btn-success TableView btn-sm" onclick="downBorrowing('+patientId+')"  data-toggle="modal" data-target="#myModal1">下载申请</button>';
 			}
 		}