Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
===================================================================
diff -u -r35686 -r35687
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 35686)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 35687)
@@ -59,7 +59,7 @@
 					headerArr[department]['数量合计'] += data[i].amount
 				} else if (columnName.indexOf('包内材料') >= 0) {
 					headerArr[department][columnName] = data[i].amount
-					headerArr[department]['包内材料合计'] += (data[i].amount || 0)
+					headerArr[department]['包内材料数量合计'] += (data[i].amount || 0)
 				} else if (columnName.indexOf('记支') >= 0) {
 					headerArr[department][columnName] = data[i].money
 					headerArr[department]['科室记支合计'] += (data[i].money || 0)
@@ -88,7 +88,7 @@
 			var headerColumn = headerTitle[k].children;
 			if (headerColumn) {
 				for (var i = 0; i < headerColumn.length; i++) {
-					if (headerColumn[i].name !== '价格合计' && headerColumn[i].name !== '数量合计' && headerColumn[i].name !== '科室记支合计' && headerColumn[i].name !== '包内材料合计' && headerColumn[i].displayName.indexOf('可收费') == -1) {
+					if (headerColumn[i].name !== '价格合计' && headerColumn[i].name !== '数量合计' && headerColumn[i].name !== '科室记支合计' && headerColumn[i].name !== '包内材料数量合计' && headerColumn[i].displayName.indexOf('可收费') == -1) {
 						if (headerColumn[i].rowspan && !headerColumn[i].colspan) {
 							tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:12px;height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:120px' rowspan=" + headerColumn[i].rowspan + ">" + headerColumn[i].name + "</td>";
 						} else if (!headerColumn[i].rowspan && headerColumn[i].colspan) {
@@ -185,7 +185,7 @@
 					headerArr[department]['数量合计'] += parseInt(data[i].amount);
 				} else if (columnName.indexOf('包内材料') >= 0) {
 					headerArr[department][columnName] = data[i].amount
-					headerArr[department]['包内材料合计'] += parseInt(data[i].amount);
+					headerArr[department]['包内材料数量合计'] += parseInt(data[i].amount);
 				} else if (columnName.indexOf('记支') >= 0) {
 					headerArr[department][columnName] = data[i].money
 					headerArr[department]['科室记支合计'] += (data[i].money || 0)
@@ -214,7 +214,7 @@
 			var headerColumn = headerTitle[j].children;
 			if (headerColumn) {
 				for (var i = 0; i < headerColumn.length; i++) {
-					if (headerColumn[i].name !== '价格合计' && headerColumn[i].name !== '数量合计' && headerColumn[i].name !== '科室记支合计' && headerColumn[i].name !== '包内材料合计') {
+					if (headerColumn[i].name !== '价格合计' && headerColumn[i].name !== '数量合计' && headerColumn[i].name !== '科室记支合计' && headerColumn[i].name !== '包内材料数量合计') {
 						tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:12px;height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:100px'>" + headerColumn[i].displayName + "</td>";
 					}
 				}
@@ -604,6 +604,7 @@
 				url: url,
 				async: false,
 				params: params,
+				timeout: 300000,
 				success: function (response) {
 					var result = Ext.decode(response.responseText);
 					var title = result.parametMap.title;