Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
===================================================================
diff -u -r33415 -r33428
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js	(.../yearWorkloadReportView2.js)	(revision 33415)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js	(.../yearWorkloadReportView2.js)	(revision 33428)
@@ -79,10 +79,27 @@
 			showResult("请选择供应室。");
 			return;
 		}
+		var yearStr = '';
+		var monthStr = '';
 		myMask.show();
 		var isSpecial = false;
 		if (sstsConfig.hasOwnProperty('isYearWorkloadReportSpecial') && sstsConfig.isYearWorkloadReportSpecial) {
 			isSpecial = true;
+			yearStr = $Id('year').value;
+		}else {
+			// 时间方式
+			var timeType = Ext.getCmp('timeType').getRawValue();
+			if ('年份' == timeType) {
+				yearStr = $Id('year').value;
+			} else {
+				var monthSearch = $Id('month').value;
+				var arr = new Array();
+				arr = monthSearch.split('-');
+				if (arr.length > 1) {
+					yearStr = arr[0];
+					monthStr = arr[1];
+				}
+			}
 		}
 		var addEndoscopic = false;
 		if (sstsConfig.isYearWorkloadReportAddEndoscopic == true) {
@@ -93,41 +110,26 @@
 			statisticDisposableGoodsSendAmount = true;
 		}
 
-		// 时间方式
-		var timeType = Ext.getCmp('timeType').getRawValue();
-		var yearStr = '';
-		var monthStr = '';
-		if ('年份' == timeType) {
-			yearStr = $Id('year').value;
-		} else {
-			var monthSearch = $Id('month').value;
-			var arr = new Array();
-			arr = monthSearch.split('-');
-			if (arr.length > 1) {
-				yearStr = arr[0];
-				monthStr = arr[1];
-			}
-		}
-
 		var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do';
 		var params = {
 			jasperreportName: 'yearWorkloadReport2.jasper',
 			departCoding: departCoding,
 			year: yearStr,
-			month:monthStr,
 			isSpecial: isSpecial,
 			addEndoscopic: addEndoscopic,
 			statisticDisposableGoodsSendAmount: statisticDisposableGoodsSendAmount,
 			reportName: 'yearWorkloadReport2'
 		}
+		if (!sstsConfig.isYearWorkloadReportSpecial) {
+			params.month = monthStr;
+		}
 		searchReport(url, params);
 	}
 
 	var timeTypeStore = new Ext.data.SimpleStore({
 		fields: ['value'],
 		data: [['年份'], ['年月']]
 	});
-
 	var form = new Ext.form.FormPanel({
 		title: entityName,
 		region: 'north',
@@ -147,6 +149,7 @@
 			items: [{
 				columnWidth: .2,
 				layout: 'form',
+				hidden:sstsConfig.isYearWorkloadReportSpecial,
 				items: [{
 					xtype: 'combo',
 					fieldLabel: "日期类型",