Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r26213 -r26345
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 26213)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 26345)
@@ -611,9 +611,11 @@
 			boolean applyMonthReportOneColumnTemplate = CssdUtils
 					.getSystemSetConfigByNameBool("applyMonthReportOneColumnTemplate");
 			// 如果启用了仅仅显示价格，不显示数量的核算月报模板
-			boolean applyMonthReportOnlyPriceTemplate = CssdUtils
-					.getSystemSetConfigByNameBool("applyMonthReportOnlyPriceTemplate");
-			
+			boolean applyMonthReportOnlyPriceTemplate = true;
+			String patternOfReport = StrutsParamUtils.getPraramValue("patternOfReport", null);
+			if("oldPattern".equals(patternOfReport)){
+				applyMonthReportOnlyPriceTemplate = false;
+			}
 			// 核算月报的价格列在最右边
 			boolean priceOnTheRightOfMonthReport = CssdUtils
 					.getSystemSetConfigByNameBool("priceOnTheRightOfMonthReport", false);
Index: ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
===================================================================
diff -u -r26323 -r26345
--- ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js	(.../config.js)	(revision 26323)
+++ ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js	(.../config.js)	(revision 26345)
@@ -198,7 +198,6 @@
   // 是否统计一次性物品发放数量（年度消毒供应中心工作量报表）
   statisticDisposableGoodsSendAmount : true,
   monthReportName:"科室领用供应室物品报表",
-  applyMonthReportOnlyPriceTemplate:true,
   //发货计划扫码变色颜色设置（颜色名    颜色值    类名）
   /* （白 #ffffff my_row_white）（黑 #000000  my_row_black）
    * （ 红  #ff0000 my_row_red）（橙红  #ff3300 my_row_orangeRed）（橙  #ff6600 my_row_orange）
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
===================================================================
diff -u -r21036 -r26345
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 21036)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 26345)
@@ -29,19 +29,28 @@
 		}
 	});
 	diposableGooodsStore.load();
+	var patternOfReport = new Ext.data.SimpleStore({
+        fields : ['id', 'name'],
+        data : [['newPattern','新格式'],['oldPattern', '原有格式']]
+    });
 	// 记录cookie（3步）
 	function reloadReport(){
 		var startTime = $Id('startTime').value;
 		var endTime = $Id('endTime').value;
 		var departSearch = $Id('departSearch').value;
 		var disposableGoodsType = Ext.getCmp("disposableGoodsType").value;
+		var patternOfReport = Ext.getCmp("patternOfReport").value;
 		if(disposableGoodsType == "全部"){
 			disposableGoodsType = "";
 		}
 		if(startTime == null || startTime == "" ||  endTime == null || endTime == ""){
 			showResult('请选择查询时间。');
 			return false;
 		}
+		if(patternOfReport == ""){
+			showResult('请选择报表格式。');
+			return false;
+		}
 		//物品类型
 		var tousseType = $Id('tousseType').value;
 		if(tousseType == "全部"){
@@ -56,7 +65,7 @@
 		if(sstsConfig.hasOwnProperty('isMonthReportShowCustonTousseAmount') && sstsConfig.isMonthReportShowCustonTousseAmount){
 			showCustonTousseAmount = true;
 		}
-		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=monthReport.jasper&depart="+departSearch+"&startTime="+startTime+"&endTime="+endTime+"&tousseType="+tousseType+ "&disposableGoodsType="+disposableGoodsType+"&showCustonTousseAmount="+showCustonTousseAmount+"&reportName=monthReport",'thisIframe','_self');
+		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=monthReport.jasper&depart="+departSearch+"&startTime="+startTime+"&endTime="+endTime+"&tousseType="+tousseType+ "&disposableGoodsType="+disposableGoodsType+"&patternOfReport="+patternOfReport+"&showCustonTousseAmount="+showCustonTousseAmount+"&reportName=monthReport",'thisIframe','_self');
 	}
 
 		var columns = [
@@ -274,6 +283,26 @@
 						value : '',
 						anchor : '95%'
 					}]
+				},{
+					columnWidth : 0.2,
+					layout : 'form',
+					labelWidth : 100,
+					items : [{
+						xtype : 'combo',
+						fieldLabel : "报表格式",
+						displayField : 'name',
+						valueField : 'id',
+						store : patternOfReport,
+						forceSelection : true,
+						listWidth:150,
+						value:"newPattern",
+						editable : true,
+						mode : 'local',
+						triggerAction : 'all',
+						name : "patternOfReport",
+						id : "patternOfReport",
+						anchor : '95%'
+					}]
 				}]
 			}],
 			buttons:[{
@@ -313,5 +342,6 @@
 				items : reportForm
 			}]
 		});
+	   Ext.getCmp('patternOfReport').setValue("newPattern"); 
 		 
 	});
\ No newline at end of file