Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
===================================================================
diff -u -r35302 -r35380
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 35302)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 35380)
@@ -6,12 +6,12 @@
 var widthArr = [];
 
 //获取表头列
-function getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime,queryDoctorAccountDepart,queryIsUrgent) {
+function getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction, queryReceiveMan, queryReturnMan, queryReturnTime, queryDoctorAccountDepart, queryIsUrgent) {
 	var columnNameArray = [{
 		name: '申请时间',
 		width: 120
 	}];
-	if(queryReceiveMan){
+	if (queryReceiveMan) {
 		columnNameArray.push({
 			name: '接收人',
 			width: 70
@@ -24,7 +24,7 @@
 		name: '申请科室',
 		width: 70
 	});
-	if(queryDoctorAccountDepart){
+	if (queryDoctorAccountDepart) {
 		columnNameArray.push({
 			name: '主刀医生核算科室',
 			width: 70
@@ -49,7 +49,7 @@
 		name: '物品名称',
 		width: 200
 	});
-	if(queryIsUrgent){
+	if (queryIsUrgent) {
 		columnNameArray.push({
 			name: '是否急消',
 			width: 70
@@ -89,7 +89,7 @@
 		name: '外来器械包已使用',
 		width: 120
 	});
-	if(enableTousseOfExclusiveDoctorFunction){
+	if (enableTousseOfExclusiveDoctorFunction) {
 		columnNameArray.push({
 			name: '使用医生',
 			width: 60
@@ -139,9 +139,9 @@
 }
 
 //获取表头html
-function getTableHeadHtml(customColumnName1, enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime,queryDoctorAccountDepart,queryIsUrgent) {
+function getTableHeadHtml(customColumnName1, enableTousseOfExclusiveDoctorFunction, queryReceiveMan, queryReturnMan, queryReturnTime, queryDoctorAccountDepart, queryIsUrgent) {
 	var html = '';
-	var columnNameArray = getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime,queryDoctorAccountDepart,queryIsUrgent);
+	var columnNameArray = getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction, queryReceiveMan, queryReturnMan, queryReturnTime, queryDoctorAccountDepart, queryIsUrgent);
 	if (sstsConfig.enableShowForeignTousseApplicationReportSummaryOfMaterials || sstsConfig.enableTheSizeDisplayOfTheForeignTousseApplicationReport) {
 		html += '<tr>';
 		for (var i = 0; i < columnNameArray.length; i++) {
@@ -168,7 +168,7 @@
 		html += '</tr>';
 		is2Column = true;
 	} else {
-		var columnNameArray = getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime,queryDoctorAccountDepart,queryIsUrgent);
+		var columnNameArray = getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction, queryReceiveMan, queryReturnMan, queryReturnTime, queryDoctorAccountDepart, queryIsUrgent);
 		html += '<tr>';
 		for (var i = 0; i < columnNameArray.length; i++) {
 			html += getHeadTd(columnNameArray[i].name, columnNameArray[i].width, 1, 1);
@@ -180,7 +180,7 @@
 }
 
 //获取表内容的html
-function getTableBodyHtml(data, totalMaterialDetails, customColumnName1,enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime,queryDoctorAccountDepart,queryIsUrgent) {
+function getTableBodyHtml(data, totalMaterialDetails, customColumnName1, enableTousseOfExclusiveDoctorFunction, queryReceiveMan, queryReturnMan, queryReturnTime, queryDoctorAccountDepart, queryIsUrgent) {
 	var html = '';
 	var sumTousseInstanceAmount = 0;
 	var sumPrice = 0;
@@ -234,7 +234,7 @@
 					}
 					html += getBodyTd(receiveTimeStr, tousseItems.length, 1);
 					html += getBodyTd(data[i].depart, tousseItems.length, 1);
-					if(queryDoctorAccountDepart){
+					if (queryDoctorAccountDepart) {
 						html += getBodyTd(data[i].doctorAccountDepart, tousseItems.length, 1);
 					}
 					if (customColumnName1 !== '') {
@@ -244,7 +244,7 @@
 					html += getBodyTd(data[i].patient, tousseItems.length, 1);
 					html += getBodyTd(data[i].bedNumber, tousseItems.length, 1);
 					html += getBodyTd(itemName, 1, 1, '#EAFFFF');
-					if(queryIsUrgent){
+					if (queryIsUrgent) {
 						html += getBodyTd(data[i].isUrgent, 1, 1, '#EAFFFF');
 					}
 					if (sstsConfig.enableShowForeignTousseApplicationReportMaterials) {
@@ -266,7 +266,7 @@
 					html += getBodyTd(invoiceSendTimeStr, 1, 1, '#EAFFFF');
 					html += getBodyTd(supplierName, 1, 1, '#EAFFFF');
 					html += getBodyTd(used, 1, 1, '#EAFFFF');
-					if(enableTousseOfExclusiveDoctorFunction){
+					if (enableTousseOfExclusiveDoctorFunction) {
 						html += getBodyTd(tiDoctorName, 1, 1, '#EAFFFF');
 					}
 					html += getBodyTd(data[i].deliverStatus, tousseItems.length, 1);
@@ -284,7 +284,7 @@
 				} else {
 					html += '<tr>';
 					html += getBodyTd(itemName, 1, 1, '#EAFFFF');
-					if(queryIsUrgent){
+					if (queryIsUrgent) {
 						html += getBodyTd(data[i].isUrgent, 1, 1, '#EAFFFF');
 					}
 					if (sstsConfig.enableShowForeignTousseApplicationReportMaterials) {
@@ -300,7 +300,7 @@
 					html += getBodyTd(invoiceSendTimeStr, 1, 1, '#EAFFFF');
 					html += getBodyTd(supplierName, 1, 1, '#EAFFFF');
 					html += getBodyTd(used, 1, 1, '#EAFFFF');
-					if(enableTousseOfExclusiveDoctorFunction){
+					if (enableTousseOfExclusiveDoctorFunction) {
 						html += getBodyTd(tiDoctorName, 1, 1, '#EAFFFF');
 					}
 					html += '</tr>';
@@ -361,7 +361,7 @@
 			html += getBodyTd(data[i].patient, 1, 1);
 			html += getBodyTd(data[i].bedNumber, 1, 1);
 			html += getBodyTd(itemName, 1, 1, '#EAFFFF');
-			if(queryIsUrgent){
+			if (queryIsUrgent) {
 				html += getBodyTd(data[i].isUrgent, 1, 1, '#EAFFFF');
 			}
 			if (sstsConfig.enableShowForeignTousseApplicationReportMaterials) {
@@ -381,7 +381,7 @@
 			html += getBodyTd(invoiceSendTimeStr, 1, 1, '#EAFFFF');
 			html += getBodyTd(supplierName, 1, 1, '#EAFFFF');
 			html += getBodyTd(used, 1, 1, '#EAFFFF');
-			if(enableTousseOfExclusiveDoctorFunction){
+			if (enableTousseOfExclusiveDoctorFunction) {
 				html += getBodyTd(tiDoctorName, 1, 1, '#EAFFFF');
 			}
 			html += getBodyTd(data[i].deliverStatus, 1, 1);
@@ -408,10 +408,10 @@
 	if (queryReceiveMan) {
 		colspanLen++;
 	}
-	if(queryDoctorAccountDepart){
+	if (queryDoctorAccountDepart) {
 		colspanLen++;
 	}
-	if(queryIsUrgent){
+	if (queryIsUrgent) {
 		colspanLen++;
 	}
 	html += getBodyTd('', 1, colspanLen);
@@ -456,7 +456,7 @@
 	if (sstsConfig.enableTheSizeDisplayOfTheForeignTousseApplicationReport) {
 		tableWidth += 120;
 	}
-	
+
 	var totalMaterialDetails = '';
 	var customColumnName1 = '';
 	var enableTousseOfExclusiveDoctorFunction = false;
@@ -469,43 +469,43 @@
 		totalMaterialDetails = result.parametMap.totalMaterialDetails || '';
 		customColumnName1 = result.parametMap.customColumnName1 || '';
 		enableTousseOfExclusiveDoctorFunction = result.parametMap.enableTousseOfExclusiveDoctorFunction;
-		if(result.parametMap.queryReceiveMan){
+		if (result.parametMap.queryReceiveMan) {
 			queryReceiveMan = result.parametMap.queryReceiveMan;
 		}
-		if(result.parametMap.queryReturnMan){
+		if (result.parametMap.queryReturnMan) {
 			queryReturnMan = result.parametMap.queryReturnMan;
 		}
-		if(result.parametMap.queryReturnTime){
+		if (result.parametMap.queryReturnTime) {
 			queryReturnTime = result.parametMap.queryReturnTime;
 		}
-		if(result.parametMap.queryDoctorAccountDepart){
+		if (result.parametMap.queryDoctorAccountDepart) {
 			queryDoctorAccountDepart = result.parametMap.queryDoctorAccountDepart;
 		}
-		if(result.parametMap.queryIsUrgent){
+		if (result.parametMap.queryIsUrgent) {
 			queryIsUrgent = result.parametMap.queryIsUrgent;
 		}
 	}
-	if(queryReceiveMan){
+	if (queryReceiveMan) {
 		tableWidth += 70;
 	}
-	if(queryReturnMan){
+	if (queryReturnMan) {
 		tableWidth += 70;
 	}
-	if(queryReturnTime){
+	if (queryReturnTime) {
 		tableWidth += 120;
 	}
-	if(queryDoctorAccountDepart){
+	if (queryDoctorAccountDepart) {
 		tableWidth += 70;
 	}
-	if(queryIsUrgent){
+	if (queryIsUrgent) {
 		tableWidth += 70;
 	}
 	var html = "<table id='frameTable' border='0' width='" + tableWidth + "px' style='empty-cells:show; border-collapse:collapse;' align='center' cellspacing=0 cellpadding=0>";
 	html += "<thead>";
-	html += getTableHeadHtml(customColumnName1,enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime,queryDoctorAccountDepart,queryIsUrgent);
+	html += getTableHeadHtml(customColumnName1, enableTousseOfExclusiveDoctorFunction, queryReceiveMan, queryReturnMan, queryReturnTime, queryDoctorAccountDepart, queryIsUrgent);
 	html += "</thead>";
 	html += "<tbody>";
-	html += getTableBodyHtml(result.data, totalMaterialDetails, customColumnName1,enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime,queryDoctorAccountDepart,queryIsUrgent);
+	html += getTableBodyHtml(result.data, totalMaterialDetails, customColumnName1, enableTousseOfExclusiveDoctorFunction, queryReceiveMan, queryReturnMan, queryReturnTime, queryDoctorAccountDepart, queryIsUrgent);
 	html += "</tbody>";
 	html += "</table>";
 	return html;