Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
===================================================================
diff -u -r35062 -r35281
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 35062)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 35281)
@@ -6,17 +6,24 @@
 var widthArr = [];
 
 //获取表头列
-function getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction) {
+function getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime) {
 	var columnNameArray = [{
 		name: '申请时间',
 		width: 120
-	}, {
+	}];
+	if(queryReceiveMan){
+		columnNameArray.push({
+			name: '接收人',
+			width: 70
+		})
+	}
+	columnNameArray.push({
 		name: '接收时间',
 		width: 120
 	}, {
 		name: '申请科室',
 		width: 70
-	}];
+	});
 	if (customColumnName1 !== '') {
 		columnNameArray.push({
 			name: customColumnName1,
@@ -92,6 +99,18 @@
 		name: '处理方式',
 		width: 70
 	});
+	if (queryReturnMan) {
+		columnNameArray.push({
+			name: "归还人",
+			width: 70
+		})
+	}
+	if (queryReturnTime) {
+		columnNameArray.push({
+			name: "归还时间",
+			width: 120
+		})
+	}
 	return columnNameArray;
 }
 
@@ -108,9 +127,9 @@
 }
 
 //获取表头html
-function getTableHeadHtml(customColumnName1, enableTousseOfExclusiveDoctorFunction) {
+function getTableHeadHtml(customColumnName1, enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime) {
 	var html = '';
-	var columnNameArray = getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction);
+	var columnNameArray = getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime);
 	if (sstsConfig.enableShowForeignTousseApplicationReportSummaryOfMaterials || sstsConfig.enableTheSizeDisplayOfTheForeignTousseApplicationReport) {
 		html += '<tr>';
 		for (var i = 0; i < columnNameArray.length; i++) {
@@ -137,7 +156,7 @@
 		html += '</tr>';
 		is2Column = true;
 	} else {
-		var columnNameArray = getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction);
+		var columnNameArray = getTableHeaderColumnArray(customColumnName1, enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime);
 		html += '<tr>';
 		for (var i = 0; i < columnNameArray.length; i++) {
 			html += getHeadTd(columnNameArray[i].name, columnNameArray[i].width, 1, 1);
@@ -149,7 +168,7 @@
 }
 
 //获取表内容的html
-function getTableBodyHtml(data, totalMaterialDetails, customColumnName1,enableTousseOfExclusiveDoctorFunction) {
+function getTableBodyHtml(data, totalMaterialDetails, customColumnName1,enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime) {
 	var html = '';
 	var sumTousseInstanceAmount = 0;
 	var sumPrice = 0;
@@ -198,6 +217,9 @@
 				if (j == 0) {
 					html += '<tr>';
 					html += getBodyTd(data[i].applicationTimeStr, tousseItems.length, 1);
+					if (queryReceiveMan) {
+						html += getBodyTd(data[i].receiveMan, tousseItems.length, 1);
+					}
 					html += getBodyTd(receiveTimeStr, tousseItems.length, 1);
 					html += getBodyTd(data[i].depart, tousseItems.length, 1);
 					if (customColumnName1 !== '') {
@@ -234,6 +256,12 @@
 					html += getBodyTd(data[i].surgery, tousseItems.length, 1);
 					html += getBodyTd(data[i].applicant, tousseItems.length, 1);
 					html += getBodyTd(data[i].processType, tousseItems.length, 1);
+					if (queryReturnMan) {
+						html += getBodyTd(data[i].returnMan, tousseItems.length, 1);
+					}
+					if (queryReturnTime) {
+						html += getBodyTd(data[i].returnTimeStr, tousseItems.length, 1);
+					}
 					html += '</tr>';
 				} else {
 					html += '<tr>';
@@ -254,9 +282,6 @@
 					if(enableTousseOfExclusiveDoctorFunction){
 						html += getBodyTd(tiDoctorName, 1, 1, '#EAFFFF');
 					}
-					if(enableTousseOfExclusiveDoctorFunction){
-						html += getBodyTd(tiDoctorName, 1, 1, '#EAFFFF');
-					}
 					html += '</tr>';
 				}
 			}
@@ -300,6 +325,9 @@
 
 			html += '<tr>';
 			html += getBodyTd(data[i].applicationTimeStr, 1, 1);
+			if (queryReceiveMan) {
+				html += getBodyTd(data[i].receiveMan, 1, 1);
+			}
 			html += getBodyTd(receiveTimeStr, 1, 1);
 			html += getBodyTd(data[i].depart, 1, 1);
 			if (customColumnName1 !== '') {
@@ -334,17 +362,26 @@
 			html += getBodyTd(data[i].surgery, 1, 1);
 			html += getBodyTd(data[i].applicant, 1, 1);
 			html += getBodyTd(data[i].processType, 1, 1);
+			if (queryReturnMan) {
+				html += getBodyTd(data[i].returnMan, 1, 1);
+			}
+			if (queryReturnTime) {
+				html += getBodyTd(data[i].returnTimeStr, 1, 1);
+			}
 			html += '</tr>';
 		}
 	}
 	//合计
 	html += '<tr>';
 	html += getBodyTd('合计', 1, 1);
+	var colspanLen = 6;
 	if (customColumnName1 !== '') {
-		html += getBodyTd('', 1, 7);
-	} else {
-		html += getBodyTd('', 1, 6);
+		colspanLen++;
 	}
+	if (queryReceiveMan) {
+		colspanLen++;
+	}
+	html += getBodyTd('', 1, colspanLen);
 	if (sstsConfig.enableShowForeignTousseApplicationReportMaterials) {
 		html += getBodyTd(totalMaterialDetails, 1, 1);
 	}
@@ -359,11 +396,16 @@
 	}
 	html += getBodyTd('<span style="font-weight: bold;">' + sumTousseInstanceAmount + '</span>', 1, 1);
 	html += getBodyTd('<span style="font-weight: bold;">' + ((sumPrice == 0) ? "0.00" : sumPrice) + '</span>', 1, 1);
-	if(enableTousseOfExclusiveDoctorFunction){
-		html += getBodyTd('', 1, 9);
-	}else{
-		html += getBodyTd('', 1, 8);
+	if (enableTousseOfExclusiveDoctorFunction) {
+		colspanLen++;
 	}
+	if (queryReturnMan) {
+		colspanLen++;
+	}
+	if (queryReturnTime) {
+		colspanLen++;
+	}
+	html += getBodyTd('', 1, colspanLen);
 	html += '</tr>';
 	return html;
 }
@@ -383,17 +425,29 @@
 	var totalMaterialDetails = '';
 	var customColumnName1 = '';
 	var enableTousseOfExclusiveDoctorFunction = false;
+	var queryReceiveMan = false;
+	var queryReturnMan = false;
+	var queryReturnTime = false;
 	if (result.parametMap) {
 		totalMaterialDetails = result.parametMap.totalMaterialDetails || '';
 		customColumnName1 = result.parametMap.customColumnName1 || '';
 		enableTousseOfExclusiveDoctorFunction = result.parametMap.enableTousseOfExclusiveDoctorFunction;
+		if(result.parametMap.queryReceiveMan){
+			queryReceiveMan = result.parametMap.queryReceiveMan;
+		}
+		if(result.parametMap.queryReturnMan){
+			queryReturnMan = result.parametMap.queryReturnMan;
+		}
+		if(result.parametMap.queryReturnTime){
+			queryReturnTime = result.parametMap.queryReturnTime;
+		}
 	}
 	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);
+	html += getTableHeadHtml(customColumnName1,enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime);
 	html += "</thead>";
 	html += "<tbody>";
-	html += getTableBodyHtml(result.data, totalMaterialDetails, customColumnName1,enableTousseOfExclusiveDoctorFunction);
+	html += getTableBodyHtml(result.data, totalMaterialDetails, customColumnName1,enableTousseOfExclusiveDoctorFunction,queryReceiveMan,queryReturnMan,queryReturnTime);
 	html += "</tbody>";
 	html += "</table>";
 	return html;