Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizingStove_child.java
===================================================================
diff -u -r12331 -r16946
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizingStove_child.java	(.../SterilizingStove_child.java)	(revision 12331)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizingStove_child.java	(.../SterilizingStove_child.java)	(revision 16946)
@@ -6,6 +6,22 @@
 	private String sterilizerName;
 	private Integer successCount;
 	private Integer failureCount;
+	/**
+	 * 灭菌时间
+	 */
+	private String sterilizaTime;
+	/**
+	 * 灭菌次数
+	 */
+	private Integer totalSterilizaCount = 0;
+	/**
+	 * 生物监测次数
+	 */
+	private Integer biologicalMonitoringCount = 0;
+	/**
+	 * 显示统计次数的字符串
+	 */
+	private String countStr  = "";
 	
 	public String getDepartName() {
 		return departName;
@@ -31,7 +47,28 @@
 	public void setFailureCount(Integer failureCount) {
 		this.failureCount = failureCount;
 	}
-	
-	
-	
+	public String getSterilizaTime() {
+		return sterilizaTime;
+	}
+	public void setSterilizaTime(String sterilizaTime) {
+		this.sterilizaTime = sterilizaTime;
+	}
+	public Integer getTotalSterilizaCount() {
+		return totalSterilizaCount;
+	}
+	public void setTotalSterilizaCount(Integer totalSterilizaCount) {
+		this.totalSterilizaCount = totalSterilizaCount;
+	}
+	public Integer getBiologicalMonitoringCount() {
+		return biologicalMonitoringCount;
+	}
+	public void setBiologicalMonitoringCount(Integer biologicalMonitoringCount) {
+		this.biologicalMonitoringCount = biologicalMonitoringCount;
+	}
+	public String getCountStr() {
+		return countStr;
+	}
+	public void setCountStr(String countStr) {
+		this.countStr = countStr;
+	}
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r16943 -r16946
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 16943)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 16946)
@@ -42,6 +42,7 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SignGoodsItemVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove_child;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SummaryUseRecordForGoodsVO;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseDeliverDetailVO;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseWorkLoadVO;
@@ -288,7 +289,6 @@
 	 */
 	public List<UseRecordOperatorBean> getUseRecordOperatorTotalViewData(
 			String sql) throws SQLException;
-	
 	/**
 	 * 灭菌记录使用次数统计报表
 	 * @param startTime 开始时间
@@ -298,7 +298,17 @@
 	 * @param sterilizationPurpose 灭菌目的
 	 * @return
 	 */
-	public List<SterilizingStove> getSterilizingStoveUseCountData(String startTime,String endTime,String depart , String departCoding,String sterilizationPurpose);
+	public List<SterilizingStove> getSterilizingStoveUseCountData(String startTime,String endTime,String depart,String departCoding,String sterilizationPurpose);
+	/**
+	 *  获取灭菌炉使用次数报表在一个时间段内明细的数据
+	 * @param startTime 开始时间
+	 * @param endTime 结束时间
+	 * @param depart 科室名称
+	 * @param departCoding 科室编码
+	 * @param sterilizationPurpose 灭菌目的
+	 * @return
+	 */
+	public List<SterilizingStove_child> getSterilizingStoveUseCountDetailData(String startTime,String endTime,String depart,String departCoding,String sterilizationPurpose);
 	
 	public List<TousseDeliverDetailVO> getTousseDeliverDetailData(String startTime,String endTime,String departCoding);
 	
Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r16943 -r16946
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16943)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16946)
@@ -8789,11 +8789,11 @@
 		 }
 		return resultList;
 	}
-	
-	public List<SterilizingStove> getSterilizingStoveUseCountData(String startTime,String endTime,String depart , String departCoding,String sterilizationPurpose) {
-		
-		
-		
+	/**
+	 * 灭菌记录使用次数统计报表，在一个时间段内的汇总数据
+	 */
+	public List<SterilizingStove> getSterilizingStoveUseCountData(String startTime,String endTime,String depart,
+			 String departCoding, String sterilizationPurpose) {
 		List<SterilizingStove> ssList = new ArrayList<SterilizingStove>();
 		SterilizingStove ss = new SterilizingStove();
 		List<SterilizingStove_child> list = new ArrayList<SterilizingStove_child>();
@@ -8835,7 +8835,7 @@
 							, "yyyy-mm-dd  HH24:MI") 
 					+" and "+dateQueryAdapter.dateConverAdapter2( endTime
 							, "yyyy-mm-dd  HH24:MI"); 
-			if(StringUtils.isNotBlank(sterilizationPurpose))
+			if(StringUtils.isNotBlank(sterilizationPurpose) && !"全部".equals(sterilizationPurpose))
 			{
 				sql += " and sr.sterilizationPurpose = '" + sterilizationPurpose + "' ";
 			}
@@ -8865,8 +8865,67 @@
 			}
 			return map;
 	}
-
 	/**
+	 * 获取灭菌炉使用次数报表在一个时间段内明细的数据
+	 */
+	public List<SterilizingStove_child> getSterilizingStoveUseCountDetailData(String startTime,String endTime,String depart,String departCoding,String sterilizationPurpose){
+		List<SterilizingStove_child> scList = new ArrayList<SterilizingStove_child>();
+		Map<String ,SterilizingStove_child> keyResultMap = new HashMap<String ,SterilizingStove_child>();
+		try{
+			String sql = " where po.endDate between "
+					+ dateQueryAdapter.dateConverAdapter2( startTime
+							, "yyyy-mm-dd  HH24:MI")
+					+ " and " + ""
+					+ dateQueryAdapter.dateConverAdapter2( endTime
+							, "yyyy-mm-dd  HH24:MI")
+					+ (StringUtils.isNotBlank(departCoding) ? (" and po.sterilizer.orgUnitCoding = '"+departCoding+"'") : (" and po.sterilizer.department = '"+depart+"'"));
+			if(StringUtils.isNotBlank(sterilizationPurpose) && !"全部".equals(sterilizationPurpose))
+			{
+				sql += " and po.sterilizationPurpose = '" + sterilizationPurpose + "' ";
+			}
+			List<SterilizationRecord> srList = objectDao.findBySql(SterilizationRecord.class.getSimpleName(), sql);
+			for (SterilizationRecord sr : srList) {
+				String dateStr = "";
+				if(sr.getEndDate() != null){
+					dateStr = Constants.SIMPLEDATEFORMAT_YYYYMMDD.format(sr.getEndDate());
+				}
+				String key = null;
+				if(sr.getSterilizer() != null){
+					key = dateStr + sr.getSterilizer().getName();
+					if(StringUtils.isNotBlank(key)){
+						SterilizingStove_child sc = null;
+						if(keyResultMap.containsKey(key)){
+							sc = keyResultMap.get(key);
+						}else{
+							sc = new SterilizingStove_child();
+							sc.setSterilizerName(sr.getSterilizer().getName());
+						}
+						int curCount = sc.getTotalSterilizaCount();
+						sc.setTotalSterilizaCount(curCount + 1);
+						sc.setSterilizaTime(dateStr);
+						String biologicalMonitoringStatus = sr.getBiologicalMonitoringStatus();
+						if(biologicalMonitoringStatus != null && !SterilizationRecord.BIOLOGICALMONITORING_STATUS_NOTDO.equals(biologicalMonitoringStatus)){
+							// 如果有做生物监测，增加生物监测次数
+							int bmCount = sc.getBiologicalMonitoringCount();
+							sc.setBiologicalMonitoringCount(bmCount + 1);
+						}
+						int bioloicalMonitoringCount = sc.getBiologicalMonitoringCount();
+						if(bioloicalMonitoringCount > 0){
+							sc.setCountStr(sc.getTotalSterilizaCount() + "/" + bioloicalMonitoringCount);
+						}else{
+							sc.setCountStr(sc.getTotalSterilizaCount() + "");
+						}
+						keyResultMap.put(key, sc);
+					}
+				}
+			}
+		}catch(Exception ex){
+			ex.printStackTrace();
+		}
+		scList = (List<SterilizingStove_child>)Arrays.asList(keyResultMap.values().toArray());
+		return scList;
+	}
+	/**
 	 * 这个方法只在getTousseDeliverDetailData内被调用，解决数据库的in()函数内的参数个数有限制
 	 * 
 	 */
Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml	(revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml	(revision 16946)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="yearWorkloadReport" language="groovy" pageWidth="760" pageHeight="842" columnWidth="760" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d9e5c598-08b2-4b9c-b6c8-46674b3aec2b">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="Crosstab Data Text" hAlign="Center"/>
+	<subDataset name="Table Dataset 1" uuid="a4160b11-e96a-4eb4-a8c3-18c4b4bf6c8e"/>
+	<parameter name="queryYear" class="java.lang.String">
+		<defaultValueExpression><![CDATA[""]]></defaultValueExpression>
+	</parameter>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
+		<defaultValueExpression><![CDATA["C:\\Users\\wang\\"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="title" class="java.lang.String"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="totalSterilizaCount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[totalSterilizaCount]]></fieldDescription>
+	</field>
+	<field name="sterilizaTime" class="java.lang.String">
+		<fieldDescription><![CDATA[sterilizaTime]]></fieldDescription>
+	</field>
+	<field name="biologicalMonitoringCount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[biologicalMonitoringCount]]></fieldDescription>
+	</field>
+	<field name="sterilizerName" class="java.lang.String">
+		<fieldDescription><![CDATA[sterilizerName]]></fieldDescription>
+	</field>
+	<field name="countStr" class="java.lang.String">
+		<fieldDescription><![CDATA[countStr]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="25" splitType="Stretch">
+			<textField>
+				<reportElement uuid="a70c7921-055d-4e07-8f4b-ad40d72ec6aa" x="0" y="0" width="740" height="25"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<summary>
+		<band height="130">
+			<crosstab>
+				<reportElement uuid="73e516ba-6033-4b62-a5ad-c9117cf69b7f" x="0" y="0" width="1000" height="130"/>
+				<crosstabHeaderCell>
+					<cellContents>
+						<staticText>
+							<reportElement uuid="13cf84b0-a980-4f53-8c23-daa0319efac8" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="89" height="57"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<text><![CDATA[日期]]></text>
+						</staticText>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="sterilizaTime" width="89">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{sterilizaTime}]]></bucketExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField>
+								<reportElement uuid="738e9adb-7c0c-4a94-b25e-26be6c382705" style="Crosstab Data Text" x="0" y="0" width="89" height="25"/>
+								<textElement verticalAlignment="Middle">
+									<font size="13"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{sterilizaTime}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents/>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="sterilizerName" height="57">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{sterilizerName}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField>
+								<reportElement uuid="6b9791df-a228-46b5-9ac7-48d7d8282e86" style="table_TD" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="57"/>
+								<textElement verticalAlignment="Middle">
+									<font size="12"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{sterilizerName}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="totalSterilizaCountMeasure" class="java.lang.String">
+					<measureExpression><![CDATA[$F{countStr}]]></measureExpression>
+				</measure>
+				<crosstabCell width="100" height="25">
+					<cellContents>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField isBlankWhenNull="true">
+							<reportElement uuid="21d62b16-5102-4728-8a63-60af2e7edd8f" style="Crosstab Data Text" x="0" y="0" width="100" height="25"/>
+							<textElement verticalAlignment="Middle">
+								<font size="14"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{totalSterilizaCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell height="25" rowTotalGroup="sterilizaTime">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField>
+							<reportElement uuid="fc130f79-5e09-49df-85ce-38db85d74da4" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{totalSterilizaCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="50" columnTotalGroup="sterilizerName">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField>
+							<reportElement uuid="47ae9ddb-74e9-4747-a214-81f1e4780477" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{totalSterilizaCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="sterilizaTime" columnTotalGroup="sterilizerName">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField>
+							<reportElement uuid="b17930d1-eef6-49ad-bd98-dec55b804ade" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{totalSterilizaCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+			</crosstab>
+		</band>
+	</summary>
+</jasperReport>
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js
===================================================================
diff -u -r16943 -r16946
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js	(.../sterilizingStoveUseCountView.js)	(revision 16943)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.js	(.../sterilizingStoveUseCountView.js)	(revision 16946)
@@ -22,6 +22,7 @@
 	//所选供应室编码
 	var querySupplyRoomCoding = Ext.getCmp('querySupplyRoom').getValue();
 	var sterilizationPurpose = Ext.getCmp('sterilizationPurpose').getRawValue();
+	var queryType = Ext.getCmp('queryType').getRawValue();
 	//不是一级供应室
 	if(querySupplyRoom == null || querySupplyRoom == ""){
 		showResult('请选择供应室。');
@@ -32,7 +33,11 @@
 		removeMask: true
 	});
 	myMask.show();
-	window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=sterilizingStoveUseCount.jasper&startTime="+startTime+"&endTime="+endTime+"&reportName=sterilizingStoveUseCount&querySupplyRoom="+querySupplyRoom+"&querySupplyRoomCoding="+querySupplyRoomCoding+"&sterilizationPurpose="+sterilizationPurpose,'thisIframe','_self');
+	var jasperReportName = "sterilizingStoveUseCount.jasper";
+	if(queryType == "明细"){
+		jasperReportName = "sterilizingStoveUseCountDetail.jasper";
+	}
+	window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=" + jasperReportName + "&startTime="+startTime+"&endTime="+endTime+"&reportName=sterilizingStoveUseCount&querySupplyRoom="+querySupplyRoom+"&querySupplyRoomCoding="+querySupplyRoomCoding+"&sterilizationPurpose="+sterilizationPurpose+"&queryType="+queryType,'thisIframe','_self');
 }
 
 
@@ -57,7 +62,7 @@
 	//远程方法请求后台查询灭菌目的
 	sterilizationPurposeJsonStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!getSterilizationPurposeList.do',
+			url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!getSterilizationPurposeListAddAll.do',
 			method : 'POST'
 		}),
 		reader : new Ext.data.JsonReader( {
@@ -66,10 +71,23 @@
 		  	    {name : 'optionText'},
 		  	    {name : 'optionValue'}
 		  	]
-		})
+		}),
+		listeners:{
+			load : function(thiz,records,options){
+				Ext.getCmp('sterilizationPurpose').setValue(records[0].data.optionText);
+			}
+		}
 	});
 	sterilizationPurposeJsonStore.load();
 	
+	var queryTypeStore = new Ext.data.SimpleStore( {
+		fields : [ 'value' ],
+		data : [['汇总'], ['明细']]
+	});
+	
+	var dt = new Date();
+	var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
+	
 		var form = new Ext.form.FormPanel({
 			title : '灭菌炉使用次数统计报表',
 			region : 'north',
@@ -81,7 +99,7 @@
 			border : 0,
 			frame : true,
 			bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-			height : 105,
+			height : 130,
 			items : [{
 				layout : 'column',
 				labelWidth : 60,
@@ -98,7 +116,7 @@
 						altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 						allowBlank : true,
 						anchor : '95%',
-						value: new Date(),
+						value: new Date(startDayofMonth),
 						listeners : {
 							specialkey : function(field, e) {
 								if (e.getKey() == Ext.EventObject.ENTER) {
@@ -172,12 +190,32 @@
 							store : sterilizationPurposeJsonStore,
 							triggerAction : 'all',
 							mode : 'remote',
-							listWidth:120,
+							listWidth:170,
 							editable : false,
 							forceSelection : true,
 							allowBlank : true,
 							anchor : '95%'
 					}]
+				},{
+					layout:'form',
+					width:300,
+					labelWidth : 100,
+					labelSeparator : '查询类型:',
+					items:[{
+							id : 'queryType',
+							name : 'queryType',
+							xtype : 'combo',
+							valueField : 'value',
+							displayField : 'value',
+							store : queryTypeStore,
+							triggerAction : 'all',
+							mode : 'local',
+							listWidth:170,
+							editable : false,
+							forceSelection : true,
+							allowBlank : true,
+							anchor : '95%'
+					}]
 				}]
 			}],
 			buttons:[{
@@ -219,4 +257,5 @@
 				items : reportForm
 			}]
 		});
+		Ext.getCmp("queryType").setValue("汇总");
 	});
\ No newline at end of file
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r16939 -r16946
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 16939)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 16946)
@@ -193,6 +193,25 @@
 			e.printStackTrace();
 		}
 	}
+	/**
+	 * 获取灭菌目的，包含全部选项
+	 */
+	public void getSterilizationPurposeListAddAll(){
+		HttpOption allOption = new HttpOption();
+		allOption.setOptionText("全部");
+		List<HttpOption> retList = new ArrayList<HttpOption>();
+		retList.add(allOption);
+		List<HttpOption> list = httpOptionManager.getHttpOptionListById(HttpOption.SYSTEMSETTING_STERILIZATIONPURPOSE);
+		retList.addAll(list);
+		try{
+			HttpServletResponse response = StrutsParamUtils
+					.getResponse();
+			response.setContentType("text/json;charset=UTF-8");
+			response.getWriter().print(JSONArray.fromObject(retList).toString());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 
 	public String savesterilizationRecord() {
 		try {
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r16943 -r16946
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 16943)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 16946)
@@ -725,8 +725,14 @@
 			//科室编码
 			String querySupplyRoomCoding = StrutsParamUtils.getPraramValue("querySupplyRoomCoding", "");
 			String sterilizationPurpose = StrutsParamUtils.getPraramValue("sterilizationPurpose", "");
+			String queryType = StrutsParamUtils.getPraramValue("queryType", "");
 			if(StringUtils.isNotBlank(querySupplyRoom) && StringUtils.isNotBlank(startTime)){
-				return jasperReportManager.getSterilizingStoveUseCountData(startTime,endTime,querySupplyRoom , querySupplyRoomCoding,sterilizationPurpose);
+				if("汇总".equals(queryType)){
+					return jasperReportManager.getSterilizingStoveUseCountData(startTime,endTime,querySupplyRoom, querySupplyRoomCoding,sterilizationPurpose);
+				}else{
+					// 获取统计明细
+					return jasperReportManager.getSterilizingStoveUseCountDetailData(startTime,endTime,querySupplyRoom, querySupplyRoomCoding,sterilizationPurpose);
+				}
 			}
 		}else if(reportName.equals("tousseDeliverDetail")){
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");