Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.jsp
===================================================================
diff -u -r33148 -r33415
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.jsp	(.../yearWorkloadReportView2.jsp)	(revision 33148)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.jsp	(.../yearWorkloadReportView2.jsp)	(revision 33415)
@@ -1,9 +1,15 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.text.SimpleDateFormat"%>
 <%@ include file="/common/taglibs.jsp"%>
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%
+	SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd");
+	request.setAttribute("newDate", dateFormat.format(new Date()));
+ %>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/ReportFormsCenterTableManager.js?version=${svnRevision}"></script>
@@ -35,6 +41,7 @@
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 <script type="text/javascript">
 	var ALL = '全部';
+	var newDate = "${newDate}";
 	//当前用户所在的当前科室
 	var currentOrgUnitCoding = '<%=AcegiHelper.getCurrentOrgUnitCode()%>';
 	//查看所有供应室报表的权限
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
===================================================================
diff -u -r33351 -r33415
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js	(.../yearWorkloadReportView2.js)	(revision 33351)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js	(.../yearWorkloadReportView2.js)	(revision 33415)
@@ -68,7 +68,8 @@
 	});
 
 	function reloadReport() {
-		var monthSearch = $Id('year').value;
+		var year = $Id('year').value;
+		var month = $Id('month').value;
 		var departCoding = Ext.getCmp('querySupplyRoom').getValue();
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
@@ -92,20 +93,41 @@
 			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: monthSearch,
+			year: yearStr,
+			month:monthStr,
 			isSpecial: isSpecial,
 			addEndoscopic: addEndoscopic,
 			statisticDisposableGoodsSendAmount: statisticDisposableGoodsSendAmount,
 			reportName: 'yearWorkloadReport2'
 		}
-
 		searchReport(url, params);
 	}
 
+	var timeTypeStore = new Ext.data.SimpleStore({
+		fields: ['value'],
+		data: [['年份'], ['年月']]
+	});
+
 	var form = new Ext.form.FormPanel({
 		title: entityName,
 		region: 'north',
@@ -123,21 +145,73 @@
 			layout: 'column',
 			height: 40,
 			items: [{
-				width: 220,
+				columnWidth: .2,
 				layout: 'form',
+				items: [{
+					xtype: 'combo',
+					fieldLabel: "日期类型",
+					valueField: 'value',
+					displayField: 'value',
+					store: timeTypeStore,
+					triggerAction: 'all',
+					editable: false,
+					mode: 'local',
+					forceSelection: false,
+					name: "timeType",
+					id: "timeType",
+					anchor: '95%',
+					value: '年份',
+					listeners: {
+						select: function () {
+							if ('年份' == this.value) {
+								Ext.getCmp('yearSearch_id').show();
+								Ext.getCmp('monthSearch_id').hide();
+							} else {
+								Ext.getCmp('yearSearch_id').hide();
+								Ext.getCmp('monthSearch_id').show();
+							}
+						}
+					}
+				}]
+			}, {
+				columnWidth: .2,
+				layout: 'form',
+				id: 'yearSearch_id',
 				items: [
 					new Ext.ux.MonthField({
 						id: 'year',
 						name: 'year',
 						fieldLabel: '年份',
 						readOnly: true,
-						width: 120,
+						anchor: '95%',
 						format: 'Y',
-						value: new Date()
+						value: newDate
 					})]
 			}, {
-				width: 300,
+				columnWidth: .2,
 				layout: 'form',
+				id: 'monthSearch_id',
+				hidden: false,
+				items: [
+					new Ext.ux.MonthField({
+						id: 'month',
+						name: 'month',
+						fieldLabel: '年月',
+						readOnly: true,
+						anchor: '95%',
+						format: 'Y-m',
+						value: newDate,
+						listeners: {
+							render: function () {
+								setTimeout(function () {
+									Ext.getCmp('monthSearch_id').hide();
+								}, 100);
+							}
+						}
+					})]
+			}, {
+				columnWidth: .2,
+				layout: 'form',
 				labelSeparator: '选择供应室:',
 				items: [{
 					xtype: 'multiSelect',
