Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
===================================================================
diff -u -r35389 -r35391
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js	(.../tousseWorkLoadView.js)	(revision 35389)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js	(.../tousseWorkLoadView.js)	(revision 35391)
@@ -1,40 +1,30 @@
 var entityName = sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表";
 var form;
 var widthArr = [];
-var tousseGroupNameConfig = false;
-var urgentAmountConfig = false;
-var packagingAmountConfig = false;
 var is2Column = true;
 
-if (sstsConfig.extendedColumnConfigOfTousseWork) {
-	if (sstsConfig.extendedColumnConfigOfTousseWork.indexOf("tousseGroupName") >= 0) {
-		tousseGroupNameConfig = true;
-	}
-	if (sstsConfig.extendedColumnConfigOfTousseWork.indexOf("urgentAmount") >= 0) {
-		urgentAmountConfig = true;
-	}
-	if (sstsConfig.extendedColumnConfigOfTousseWork.indexOf("packagingAmount") >= 0) {
-		packagingAmountConfig = true;
-	}
-}
-
 function getTableHtml(result, statType) {
-	var materialColumnName = "件数";
-	if (result.parametMap) {
-		materialColumnName = result.parametMap.materialColumnName;
-	}
 	var html = "<table id='frameTable' border='0' width='auto' style='empty-cells:show; border-collapse:collapse;' align='center' cellspacing=0 cellpadding=0>";
 	html += "<thead>";
-	html += getTableHeadHtml(materialColumnName, statType);
+	html += getTableHeadHtml(result.parametMap, statType);
 	html += "</thead>";
 	html += "<tbody>";
-	html += getTableBodyHtml(result.data, statType);
+	html += getTableBodyHtml(result, statType);
 	html += "</tbody>";
 	html += "</table>";
 	return html;
 }
 //获取表内容的html
-function getTableBodyHtml(data, statType) {
+function getTableBodyHtml(result, statType) {
+	var data = result.data;
+	var queryPackagingAmount = false;
+	var queryTousseGroupName = false;
+	var queryUrgentAmount = false;
+	if (result.parametMap) {
+		queryPackagingAmount = result.parametMap.queryPackagingAmount;
+		queryTousseGroupName = result.parametMap.queryTousseGroupName;
+		queryUrgentAmount = result.parametMap.queryUrgentAmount;
+	}
 	var html = '';
 	var tousseAmount = 0;
 	var tousseGroupAmount = 0;
@@ -66,7 +56,7 @@
 			}
 			if (statType == 'detailQuery') {
 				html += getBodyTd(childrensItem.tousseName, 1, 1);
-				if (tousseGroupNameConfig) {
+				if (queryTousseGroupName) {
 					html += getBodyTd(childrensItem.tousseGroupName, 1, 1);
 					if (childrensItem.tousseGroupName !== '') {
 						if (tousseGroupArr.indexOf(childrensItem.tousseGroupName) == -1) {
@@ -84,15 +74,15 @@
 			html += getBodyTd(childrensItem.washMaterialAmount, 1, 1);
 			html += getBodyTd(childrensItem.packingAmount, 1, 1);
 			html += getBodyTd(childrensItem.packingMaterialAmount, 1, 1);
-			if (packagingAmountConfig) {
+			if (queryPackagingAmount) {
 				html += getBodyTd(childrensItem.packagingAmount, 1, 1);
 				html += getBodyTd(childrensItem.packagingMaterialAmount, 1, 1);
 			}
 			html += getBodyTd(childrensItem.reviewAmount, 1, 1);
 			html += getBodyTd(childrensItem.sterilizationAmount, 1, 1);
 			html += getBodyTd(childrensItem.invoiceAmount, 1, 1);
 			html += getBodyTd(childrensItem.invoiceMaterialAmount, 1, 1);
-			if (urgentAmountConfig) {
+			if (queryUrgentAmount) {
 				html += getBodyTd(childrensItem.urgentAmount || 0, 1, 1);
 				urgentAmountSum += childrensItem.urgentAmount || 0;
 			}
@@ -120,7 +110,7 @@
 	html += getHeadTd('合计', '', 1, 1);
 	if (statType == 'detailQuery') {
 		html += getHeadTd(tousseAmount, '', 1, 1);
-		if (tousseGroupNameConfig) {
+		if (queryTousseGroupName) {
 			html += getHeadTd(tousseGroupAmount, 1, 1);
 		}
 	}
@@ -132,25 +122,25 @@
 	html += getHeadTd(washMaterialAmountSum, '', 1, 1);
 	html += getHeadTd(packingAmountSum, '', 1, 1);
 	html += getHeadTd(packingMaterialAmountSum, '', 1, 1);
-	if (packagingAmountConfig) {
+	if (queryPackagingAmount) {
 		html += getHeadTd(packagingAmountSum, '', 1, 1);
 		html += getHeadTd(packagingMaterialAmountSum, '', 1, 1);
 	}
 	html += getHeadTd(reviewAmountSum, '', 1, 1);
 	html += getHeadTd(sterilizationAmountSum, '', 1, 1);
 	html += getHeadTd(invoiceAmountSum, '', 1, 1);
 	html += getHeadTd(invoiceMaterialAmountSum, '', 1, 1);
-	if (urgentAmountConfig) {
+	if (queryUrgentAmount) {
 		html += getHeadTd(urgentAmountSum, '', 1, 1);
 	}
 	html += getHeadTd(signAmountSum, '', 1, 1);
 	html += '</tr>';
 	return html;
 }
 //获取表头html
-function getTableHeadHtml(materialColumnName, statType) {
+function getTableHeadHtml(parametMap, statType) {
 	var html = '';
-	var columnNameArray = getTableHeaderColumnArray(materialColumnName, statType);
+	var columnNameArray = getTableHeaderColumnArray(parametMap, statType);
 	html += '<tr>';
 	for (var i = 0; i < columnNameArray.length; i++) {
 		var item = columnNameArray[i];
@@ -175,7 +165,17 @@
 	return html;
 }
 //获取表头列
-function getTableHeaderColumnArray(materialColumnName, statType) {
+function getTableHeaderColumnArray(parametMap, statType) {
+	var materialColumnName = "件数";
+	var queryPackagingAmount = false;
+	var queryTousseGroupName = false;
+	var queryUrgentAmount = false;
+	if (parametMap) {
+		materialColumnName = parametMap.materialColumnName;
+		queryPackagingAmount = parametMap.queryPackagingAmount;
+		queryTousseGroupName = parametMap.queryTousseGroupName;
+		queryUrgentAmount = parametMap.queryUrgentAmount;
+	}
 	var width = 60;
 	if (materialColumnName !== '件数') {
 		width = 80;
@@ -189,7 +189,7 @@
 			name: '器械包名称',
 			width: 120
 		})
-		if (tousseGroupNameConfig) {
+		if (queryTousseGroupName) {
 			columnNameArray.push({
 				name: '器械包分组',
 				width: 120
@@ -233,7 +233,7 @@
 			width: width
 		}]
 	})
-	if (packagingAmountConfig) {
+	if (queryPackagingAmount) {
 		columnNameArray.push({
 			name: '包装数量',
 			width: 60 + width,
@@ -263,7 +263,7 @@
 			width: width
 		}]
 	})
-	if (urgentAmountConfig) {
+	if (queryUrgentAmount) {
 		columnNameArray.push({
 			name: '加急数量',
 			width: 80