Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/RinserStove.java
===================================================================
diff -u
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/RinserStove.java	(revision 0)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/RinserStove.java	(revision 27498)
@@ -0,0 +1,30 @@
+package com.forgon.disinfectsystem.jasperreports.javabeansource;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * 清洗机使用次数统计报表bean
+ */
+public class RinserStove {
+
+	private String departName;
+	
+	private List<RinserStove_child> list = new ArrayList<RinserStove_child>();
+
+	public String getDepartName() {
+		return departName;
+	}
+
+	public void setDepartName(String departName) {
+		this.departName = departName;
+	}
+
+	public List<RinserStove_child> getList() {
+		return list;
+	}
+
+	public void setList(List<RinserStove_child> list) {
+		this.list = list;
+	}
+	
+}
Index: ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCount_child.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCount_child.jrxml	(revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCount_child.jrxml	(revision 27498)
@@ -0,0 +1,84 @@
+<?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="sterilizingStoveUseCount_child" language="groovy" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="9653d4f6-fc92-4f00-983c-4ae4b0119999">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="failureCount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[failureCount]]></fieldDescription>
+	</field>
+	<field name="rinserName" class="java.lang.String">
+		<fieldDescription><![CDATA[rinserName]]></fieldDescription>
+	</field>
+	<field name="successCount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[successCount]]></fieldDescription>
+	</field>
+	<variable name="successCountAmount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{successCount}]]></variableExpression>
+	</variable>
+	<variable name="failureCountAmount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{failureCount}]]></variableExpression>
+	</variable>
+	<detail>
+		<band height="50" splitType="Stretch">
+			<textField>
+				<reportElement uuid="b3ce7486-440d-47e0-847c-7eb842ab7e0e" mode="Opaque" x="0" y="0" width="172" height="50"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{rinserName}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="ee7f7148-e8ab-4a37-aad3-bb65bc72753d" mode="Opaque" x="172" y="0" width="125" height="50"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{successCount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="ee7f7148-e8ab-4a37-aad3-bb65bc72753d" mode="Opaque" x="297" y="0" width="125" height="50"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{failureCount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="256439c9-ea24-45c9-afd0-83fc36dcadf9" mode="Opaque" x="422" y="0" width="133" height="50" backcolor="#F0F8FF"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{failureCount}+$F{successCount}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+</jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCount.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCount.jrxml	(revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCount.jrxml	(revision 27498)
@@ -0,0 +1,224 @@
+<?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="sterilizingStoveUseCount" language="groovy" pageWidth="700" pageHeight="842" columnWidth="700" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="aa979892-1856-4053-a698-5118f961f8a4">
+	<property name="ireport.zoom" value="1.210000000000001"/>
+	<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>
+	<subDataset name="Table Dataset 1" uuid="bf60b979-a3e8-4a34-a61e-e172745dcd17"/>
+	<parameter name="title" class="java.lang.String"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
+		<defaultValueExpression><![CDATA["C:\\workspace\\sterile\\WebContent\\jasperRtp\\"]]></defaultValueExpression>
+	</parameter>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="departName" class="java.lang.String">
+		<fieldDescription><![CDATA[departName]]></fieldDescription>
+	</field>
+	<field name="list" class="java.util.List">
+		<fieldDescription><![CDATA[list]]></fieldDescription>
+	</field>
+	<variable name="successCountAmount" class="java.lang.Integer" calculation="Sum"/>
+	<variable name="failureCountAmount" class="java.lang.Integer" calculation="Sum"/>
+	<title>
+		<band height="35" splitType="Stretch">
+			<textField>
+				<reportElement uuid="ca358ad0-a064-4fbc-a5b2-ccd593e955f7" mode="Opaque" x="0" y="0" width="680" height="35"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<columnHeader>
+		<band height="38" splitType="Stretch">
+			<staticText>
+				<reportElement uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249" style="table_TH" mode="Opaque" x="305" y="0" width="125" height="38"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[清洗完成次数]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249" style="table_TH" mode="Opaque" x="133" y="0" width="172" height="38"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[清洗机]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249" style="table_TH" mode="Opaque" x="0" y="0" width="133" height="38"/>
+				<box>
+					<pen lineWidth="1.0" lineStyle="Solid"/>
+					<topPen lineWidth="1.0" lineStyle="Solid"/>
+					<leftPen lineWidth="1.0" lineStyle="Solid"/>
+					<bottomPen lineWidth="1.0" lineStyle="Solid"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[科室名称]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249" style="table_TH" mode="Opaque" x="430" y="0" width="125" height="38"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[清洗失败次数]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249" style="table_TH" mode="Opaque" x="555" y="0" width="133" height="38"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[总次数]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="50" splitType="Stretch">
+			<textField>
+				<reportElement uuid="1429a7de-63e7-4a3a-948d-b7e3d76ea1ab" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="133" height="50"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{departName}]]></textFieldExpression>
+			</textField>
+			<subreport>
+				<reportElement uuid="dad27028-c60b-47eb-81eb-299d37714a81" style="table_TD" mode="Opaque" x="133" y="0" width="555" height="50"/>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{list})]]></dataSourceExpression>
+				<returnValue subreportVariable="successCountAmount" toVariable="successCountAmount" calculation="Sum"/>
+				<returnValue subreportVariable="failureCountAmount" toVariable="failureCountAmount"/>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "rinserStoveUseCount_child.jasper"]]></subreportExpression>
+			</subreport>
+		</band>
+	</detail>
+	<summary>
+		<band height="50">
+			<textField>
+				<reportElement uuid="aa5ef2ba-82d1-4673-a432-08396715c06f" mode="Opaque" x="305" y="0" width="125" height="50" backcolor="#F0F8FF"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{successCountAmount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="963434b1-2cc0-4988-ad4d-196f45800734" mode="Opaque" x="430" y="0" width="125" height="50" backcolor="#F0F8FF"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{failureCountAmount}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement uuid="1285b261-e098-4be7-bff0-a9fa5cf3ba73" mode="Opaque" x="0" y="0" width="133" height="50" backcolor="#F0F8FF"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[合计]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="89b44be3-c3a4-4c30-a8b4-3983f2fecafa" mode="Opaque" x="133" y="0" width="172" height="50" backcolor="#F0F8FF"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement/>
+				<text><![CDATA[]]></text>
+			</staticText>
+			<textField>
+				<reportElement uuid="6c7dba19-a649-4830-bc83-2464c9bb73a5" mode="Opaque" x="555" y="0" width="133" height="50" backcolor="#F0F8FF"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{successCountAmount}+$V{failureCountAmount}]]></textFieldExpression>
+			</textField>
+		</band>
+	</summary>
+</jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCount.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java
===================================================================
diff -u -r25035 -r27498
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java	(.../RinserAction.java)	(revision 25035)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java	(.../RinserAction.java)	(revision 27498)
@@ -412,4 +412,18 @@
 	public void prepare() throws Exception {
 		iniInfo();
 	}
+	/**
+	 * 查询所有清洗机的信息,现只有id和名字
+	 */
+	public void getAllRinserInfo(){
+		JSONObject obj = null;
+		try {
+			JSONArray arr = rinserManager.getAllRinserIdAndName();
+			obj = JSONUtil.buildJsonObject(true, arr);
+		} catch (Exception e) {
+			obj = JSONUtil.buildJsonObject(false);
+			e.printStackTrace();
+		}
+		StrutsResponseUtils.output(obj);
+	}
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManager.java
===================================================================
diff -u -r26433 -r27498
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManager.java	(.../ReportManager.java)	(revision 26433)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManager.java	(.../ReportManager.java)	(revision 27498)
@@ -42,12 +42,21 @@
 	/**
 	 * 获取灭菌炉使用次数统计报表数据
 	 * @param reportType 查询类型
-	 * @param departCoding 供应商编码
+	 * @param departCoding 供应室编码
 	 * @param sterilizationPurpose 灭菌目的
 	 * @param dateStr 时间
 	 * @param sterilizerId 灭菌炉id
 	 * @return
 	 */
 	public JSONObject getSterilizingStoveUseCountData(String queryType, String departCoding,String sterilizationPurpose,
 			String dateStr, Long sterilizerId);
+	/**
+	 * 获取清洗机使用次数统计报表数据
+	 * @param queryType 查询类型 
+	 * @param departCoding 供应室编码
+	 * @param dateStr 时间(年月)
+	 * @param rinserId 清洗机id
+	 * @return
+	 */
+	public JSONObject getWashingMachineStoveUseCountDate(String queryType, String departCoding, String dateStr, Long rinserId);
 }
Index: ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCountDetail.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCountDetail.jrxml	(revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCountDetail.jrxml	(revision 27498)
@@ -0,0 +1,206 @@
+<?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="10"/>
+	<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="totalWashCount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[totalWashCount]]></fieldDescription>
+	</field>
+	<field name="washTime" class="java.lang.String">
+		<fieldDescription><![CDATA[washTime]]></fieldDescription>
+	</field>
+	<field name="rinserName" class="java.lang.String">
+		<fieldDescription><![CDATA[rinserName]]></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 verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<summary>
+		<band height="130">
+			<crosstab ignoreWidth="true">
+				<reportElement uuid="73e516ba-6033-4b62-a5ad-c9117cf69b7f" x="0" y="0" width="1300" height="130"/>
+				<crosstabHeaderCell>
+					<cellContents>
+						<staticText>
+							<reportElement uuid="13cf84b0-a980-4f53-8c23-daa0319efac8" style="table_TD" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="89" height="57" forecolor="#000000" backcolor="#F0F8FF"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
+							<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+								<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+								<paragraph lineSpacing="Single"/>
+							</textElement>
+							<text><![CDATA[日期]]></text>
+						</staticText>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="washTime" width="89">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{washTime}]]></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" mode="Opaque" x="0" y="0" width="89" height="25"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="14" isBold="false"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{washTime}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents/>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="rinserName" height="57">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{rinserName}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField pattern="" isBlankWhenNull="false">
+								<reportElement uuid="6b9791df-a228-46b5-9ac7-48d7d8282e86" style="table_TD" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="100" height="57" forecolor="#000000" backcolor="#F0F8FF"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+									<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+									<paragraph lineSpacing="Single"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{rinserName}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="totalRinserCountMeasure" class="java.lang.String">
+					<measureExpression><![CDATA[$F{totalWashCount}]]></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"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
+							<textElement verticalAlignment="Middle">
+								<font size="14"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{totalRinserCountMeasure}==null?"0":$V{totalRinserCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell height="25" rowTotalGroup="washTime">
+					<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{totalRinserCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="50" columnTotalGroup="rinserName">
+					<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{totalRinserCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="washTime" columnTotalGroup="rinserName">
+					<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{totalRinserCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+			</crosstab>
+		</band>
+	</summary>
+</jasperReport>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r27493 -r27498
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27493)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27498)
@@ -1359,6 +1359,20 @@
 			int frequency = StrutsParamUtils.getPraramValue("frequency", -1);
 			String sterilizerNameGroup = StrutsParamUtils.getPraramValue("sterilizerNameGroupHidden", "");
 			return jasperReportManager.getSterilizationEffectMonitorReportData(startDay, endDay, sterilizerName, frequency, sterilizerNameGroup);
+		}else if(reportName.equals("rinserStoveUseCount")){
+			String startTime = StrutsParamUtils.getPraramValue("startTime", "");
+			String endTime = StrutsParamUtils.getPraramValue("endTime", "");
+			String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", "");
+			//科室编码
+			String querySupplyRoomCoding = StrutsParamUtils.getPraramValue("querySupplyRoomCoding", "");
+			String queryType = StrutsParamUtils.getPraramValue("queryType", "");
+			if(StringUtils.isNotBlank(querySupplyRoom) && StringUtils.isNotBlank(startTime)){
+				if("汇总".equals(queryType)){
+					return jasperReportManager.getRinserStoveUseCountData(startTime, endTime, querySupplyRoom, querySupplyRoomCoding);
+				}else{// 获取统计明细
+					return jasperReportManager.getRinserStoveUseCountDetailData(startTime, endTime, querySupplyRoom, querySupplyRoomCoding);
+				}
+			}
 		}
 		return null;
 	}
@@ -2335,6 +2349,10 @@
 			map.put("title", "人员班次统计表");
 		}else if("sterilizationEffectMonitorReport".equals(reportName)){
 			map.put("title", "灭菌效果监测结果报表");
+		}else if(reportName.equals("rinserStoveUseCount")){
+			String startTime = StrutsParamUtils.getPraramValue("startTime", "");
+			String endTime = StrutsParamUtils.getPraramValue("endTime", "");
+			map.put("title", "清洗机使用次数统计("+startTime+" ~ "+endTime+")");
 		}
 		return map;
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java
===================================================================
diff -u -r23079 -r27498
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java	(.../RinserManagerImpl.java)	(revision 23079)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java	(.../RinserManagerImpl.java)	(revision 27498)
@@ -1,11 +1,15 @@
 package com.forgon.disinfectsystem.basedatamanager.rinser.service;
 
+import java.sql.ResultSet;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
 import org.apache.commons.lang.StringUtils;
 
 import com.forgon.directory.model.BarcodeDevice;
@@ -223,5 +227,24 @@
 			extraInfo.add(barcode);
 		}
 	}
-
+	@Override
+	public JSONArray getAllRinserIdAndName() {
+		JSONArray arr = new JSONArray();
+		ResultSet rs = null;
+		try{
+			String querySql = "select id,name from Rinser";
+			rs = objectDao.executeSql(querySql);
+			while(rs.next()){
+				JSONObject obj = new JSONObject();
+				obj.put("id", rs.getLong("id"));
+				obj.put("name", rs.getString("name"));
+				arr.add(obj);
+			}
+		}catch(Exception e){
+			e.printStackTrace();
+		}finally{
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return arr;
+	}
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/RinserStove_child.java
===================================================================
diff -u
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/RinserStove_child.java	(revision 0)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/RinserStove_child.java	(revision 27498)
@@ -0,0 +1,84 @@
+package com.forgon.disinfectsystem.jasperreports.javabeansource;
+/**
+ * 清洗机使用次数统计报表bean
+ */
+public class RinserStove_child {
+
+	/**
+	 * 科室名称
+	 */
+	private String departName;
+	
+	/**
+	 * 清洗机名称
+	 */
+	private String rinserName;
+	
+	/**
+	 * 清洗完成数量
+	 */
+	private Integer successCount;
+	
+	/**
+	 * 清洗失败数量
+	 */
+	private Integer failureCount;
+	
+	/**
+	 * 清洗时间
+	 */
+	private String washTime;
+	
+	/**
+	 * 清洗次数
+	 */
+	private Integer totalWashCount = 0;
+	
+	/**
+	 * 灭菌炉的序列号（用于排序）
+	 */
+	private Integer rinserNameSequence = 0;
+	
+	public String getDepartName() {
+		return departName;
+	}
+	public void setDepartName(String departName) {
+		this.departName = departName;
+	}
+	public Integer getSuccessCount() {
+		return successCount;
+	}
+	public void setSuccessCount(Integer successCount) {
+		this.successCount = successCount;
+	}
+	public Integer getFailureCount() {
+		return failureCount;
+	}
+	public void setFailureCount(Integer failureCount) {
+		this.failureCount = failureCount;
+	}
+	public String getRinserName() {
+		return rinserName;
+	}
+	public void setRinserName(String rinserName) {
+		this.rinserName = rinserName;
+	}
+	public String getWashTime() {
+		return washTime;
+	}
+	public void setWashTime(String washTime) {
+		this.washTime = washTime;
+	}
+	public Integer getTotalWashCount() {
+		return totalWashCount;
+	}
+	public void setTotalWashCount(Integer totalWashCount) {
+		this.totalWashCount = totalWashCount;
+	}
+	public Integer getRinserNameSequence() {
+		return rinserNameSequence;
+	}
+	public void setRinserNameSequence(Integer rinserNameSequence) {
+		this.rinserNameSequence = rinserNameSequence;
+	}
+}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/action/ReportAction.java
===================================================================
diff -u -r26448 -r27498
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/action/ReportAction.java	(.../ReportAction.java)	(revision 26448)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/action/ReportAction.java	(.../ReportAction.java)	(revision 27498)
@@ -277,15 +277,20 @@
 	 * @return
 	 */
 	private JSONObject getReportDataByReportName(String reportName){
-		JSONObject resultObj = new JSONObject();
 		if("sterilizingStoveUseCount".equals(reportName)){//灭菌炉使用次数统计报表图形数据
 			String queryType = StrutsParamUtils.getPraramValue("queryType", "");
 			String departCoding = StrutsParamUtils.getPraramValue("departCoding", "");
 			String sterilizationPurpose = StrutsParamUtils.getPraramValue("sterilizationPurpose", "");
 			String dateStr = StrutsParamUtils.getPraramValue("dateStr", "");
 			Long sterilizerId = StrutsParamUtils.getPraramLongValue("sterilizerId", null);
-			resultObj = reportManager.getSterilizingStoveUseCountData(queryType, departCoding, sterilizationPurpose, dateStr, sterilizerId);
+			return reportManager.getSterilizingStoveUseCountData(queryType, departCoding, sterilizationPurpose, dateStr, sterilizerId);
+		}else if("washingMachineStoveUseCount".equals(reportName)){//清洗机使用次数统计报表图形数据
+			String queryType = StrutsParamUtils.getPraramValue("queryType", "");
+			String departCoding = StrutsParamUtils.getPraramValue("departCoding", "");
+			String dateStr = StrutsParamUtils.getPraramValue("dateStr", "");
+			Long rinserId = StrutsParamUtils.getPraramLongValue("rinserId", null);
+			return reportManager.getWashingMachineStoveUseCountDate(queryType, departCoding, dateStr, rinserId);
 		}
-		return resultObj;
+		return new JSONObject();
 	}
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r27366 -r27498
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 27366)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 27498)
@@ -53,6 +53,8 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.PackingFractionDefectiveBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.QualityControlOfClinic;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsVo;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.RinserStove;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.RinserStove_child;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.ScheduleReportBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SignGoodsItemVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.StatisticalWorkload;
@@ -953,5 +955,24 @@
 	 * @return
 	 */
 	public List<SterilizationEffectMonitorReportVo> getSterilizationEffectMonitorReportData(String startDay,String endDay,String sterilizerName, int frequency, String sterilizerNameGroup);
+	/**
+	 * 清洗机使用次数统计报表
+	 * @param startTime 开始时间
+	 * @param endTime 结束时间
+	 * @param depart 科室名称
+	 * @param departCoding 科室编码
+	 * @return
+	 */
+	public List<RinserStove> getRinserStoveUseCountData(String startTime,String endTime,String depart,String departCoding);
+	
+	/**
+	 *  获取清洗机使用次数报表在一个时间段内明细的数据
+	 * @param startTime 开始时间
+	 * @param endTime 结束时间
+	 * @param depart 科室名称
+	 * @param departCoding 科室编码
+	 * @return
+	 */
+	public List<RinserStove_child> getRinserStoveUseCountDetailData(String startTime,String endTime,String depart,String departCoding);
 }
 
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java
===================================================================
diff -u -r27357 -r27498
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java	(.../ReportManagerImpl.java)	(revision 27357)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java	(.../ReportManagerImpl.java)	(revision 27498)
@@ -20,8 +20,10 @@
 import com.forgon.disinfectsystem.basedatamanager.reportoption.GoodsOptionManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption;
+import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
+import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
 import com.forgon.disinfectsystem.jasperreports.service.dataindex.DataIndex;
 import com.forgon.disinfectsystem.reportforms.constant.ReportConstant;
 import com.forgon.disinfectsystem.reportforms.util.MapKeyComparator;
@@ -357,14 +359,15 @@
 	private JSONObject getListChartData(String departCoding,String sterilizationPurpose,
 			String yearAndMonth){
 		JSONObject obj = new JSONObject();
+		ResultSet rs = null;
 		try {
 			String sql = createSqlOfListChartData(departCoding, sterilizationPurpose, yearAndMonth);
-			ResultSet resultSet = objectDao.executeSql(sql);
+			rs = objectDao.executeSql(sql);
 			JSONArray arr = new JSONArray();
-			while(resultSet.next()){
+			while(rs.next()){
 				JSONObject itemObj = new JSONObject();
-				Long amount = resultSet.getLong("amount");
-				String name = resultSet.getString("name");
+				Long amount = rs.getLong("amount");
+				String name = rs.getString("name");
 				itemObj.put("amount", amount);
 				itemObj.put("name", name);
 				arr.add(itemObj);
@@ -374,6 +377,8 @@
 		} catch (Exception e) {
 			obj.put("success", false);
 			e.printStackTrace();
+		}finally{
+			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
 		return obj;
 	}
@@ -479,4 +484,148 @@
 				+ sqlOfSterilizationPurpose + groupSql + orderBySql;
 		return sql;
 	}
+	@Override
+	public JSONObject getWashingMachineStoveUseCountDate(String queryType,
+			String departCoding, String dateStr, Long rinserId) {
+		JSONObject resultObj = null;
+		if("listChart".equals(queryType)){//图形
+			return resultObj = getListChartDataForWashingMachineStoveUseCount(departCoding, dateStr);
+		}else if("allYearChart".equals(queryType)){//图形对比(全年)
+			return resultObj = getAllYearChartDataForWashingMachineStoveUseCount(departCoding, dateStr, rinserId);
+		}
+		return new JSONObject();
+	}
+	/**
+	 * 获取清洗机使用次数统计报表的图形数据 (queryType:listChart)
+	 * @param departCoding 供应室编码
+	 * @param DateStr 时间(年月)
+	 * @return
+	 */
+	private JSONObject getListChartDataForWashingMachineStoveUseCount(String departCoding, String DateStr){
+		JSONObject obj = new JSONObject();
+		ResultSet rs = null;
+		try {
+			String sql = createSqlOfListChartDataForWashingMachineStoveUseCount(departCoding, DateStr);
+			rs = objectDao.executeSql(sql);
+			JSONArray arr = new JSONArray();
+			while(rs.next()){
+				JSONObject itemObj = new JSONObject();
+				Long amount = rs.getLong("amount");
+				String name = rs.getString("name");
+				itemObj.put("amount", amount);
+				itemObj.put("name", name);
+				arr.add(itemObj);
+			}
+			obj.put("data", arr);
+			obj.put("success", true);
+		} catch (Exception e) {
+			obj.put("success", false);
+			e.printStackTrace();
+		}finally{
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return obj;
+	
+	}
+	/**
+	 * 获取清洗机使用次数统计报表的图形数据的sql:查询符合条件的清洗机使用次数
+	 * @param departCoding 供应室编码
+	 * @param yearAndMonth 时间(年月)
+	 * @return
+	 */
+	private String createSqlOfListChartDataForWashingMachineStoveUseCount(String departCoding, String yearAndMonth){
+		String startTime = "";
+		String endTime = "";
+		if(StringUtils.isNotBlank(yearAndMonth)){
+			startTime = yearAndMonth+ "-01 00:00:00";
+			try {
+				endTime = DataIndex.getLastDayOfMonth(yearAndMonth) + " 23:59:59";
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+		}
+		StringBuffer sbf = new StringBuffer(350);
+		sbf.append("select count(*) amount,r.name from ")
+		.append(WashAndDisinfectRecord.class.getSimpleName())
+		.append(" wr inner join ")
+		.append(Rinser.class.getSimpleName())
+		.append(" r on r.id=wr.rinserId where wr.orgUnitCoding='")
+		.append(departCoding)
+		.append("' and wr.endDate between ")
+		.append(dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI:SS"))
+		.append(" and ")
+		.append(dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI:SS"))
+		.append(" group by r.name");
+		return sbf.toString();
+	
+	}
+	/**
+	 * 获取清洗机使用次数统计报表之图形对比(全年)数据
+	 * @param departCoding 供应室编码
+	 * @param year 年份
+	 * @param rinserId 清洗机id
+	 * @return
+	 */
+	private JSONObject getAllYearChartDataForWashingMachineStoveUseCount(String departCoding, String year, Long rinserId) {
+		JSONObject resultObj = new JSONObject();
+		String sql = createSqlOfAllYearChartDataForWashingMachineStoveUseCount(departCoding, year, rinserId);
+		ResultSet resultSet = objectDao.executeSql(sql);
+		try {
+			List<Long> amountList = new ArrayList<Long>();
+			Map<Integer, Long> mapOfmonthAmount = new HashMap<Integer, Long>();
+			while(resultSet.next()){
+				int month = resultSet.getInt("month");
+				Long amount = resultSet.getLong("amount");
+				mapOfmonthAmount.put(month, amount);
+			}
+			for (int i = 1; i <= 12; i++) {
+				if(mapOfmonthAmount.containsKey(i)){
+					amountList.add(mapOfmonthAmount.get(i));
+				}else{
+					amountList.add(null);
+				}
+			}
+			resultObj.put("data", amountList);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(resultSet);
+		}
+		return resultObj;
+	}
+	/**
+	 * 构建查询清洗机使用次数统计报表之图形对比(全年)数据的sql
+	 * @param departCoding 供应室编码
+	 * @param year 年份
+	 * @param rinserId 清洗机id
+	 * @return
+	 */
+	private String createSqlOfAllYearChartDataForWashingMachineStoveUseCount(String departCoding, String year, Long rinserId){
+		String startTime = "";
+		String endTime = "";
+		if(StringUtils.isNotBlank(year)){
+			startTime = year+ "-01-01 00:00:00";
+			endTime = DataIndex.getNextYear(year) + " 00:00:00";
+		}
+		String monthStr = dateQueryAdapter.dateConverAdapter3("wr.endDate","mm");
+		String groupSql = " group by r.id," + monthStr;
+		String orderBySql = " order by " + monthStr;
+		StringBuffer sbf = new StringBuffer(350);
+		sbf.append("select min(r.name) name,count(*) amount,")
+		.append(monthStr)
+		.append(" month from ")
+		.append(WashAndDisinfectRecord.class.getSimpleName())
+		.append(" wr inner join ")
+		.append(Rinser.class.getSimpleName())
+		.append(" r on r.id=wr.rinserId where r.id=")
+		.append(rinserId)
+		.append(" and wr.orgUnitCoding='")
+		.append(departCoding)
+		.append("' and wr.endDate between ")
+		.append(dateQueryAdapter.dateConverAdapter2(startTime, "yyyy-mm-dd HH24:MI:SS"))
+		.append(" and ")
+		.append(dateQueryAdapter.dateConverAdapter2(endTime, "yyyy-mm-dd HH24:MI:SS"))
+		.append(groupSql).append(orderBySql);
+		return sbf.toString();
+	}
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java
===================================================================
diff -u -r23079 -r27498
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java	(.../RinserManager.java)	(revision 23079)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManager.java	(.../RinserManager.java)	(revision 27498)
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import net.sf.json.JSONArray;
+
 import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser;
 import com.forgon.tools.hibernate.BasePoManager;
 
@@ -27,4 +29,9 @@
 	 * @param outputJson 由于要返回一个条码字符串，所以需要这个参数
 	 */
 	public void saveRinser(Rinser rinser, String cleanMethodIDs, String consumablesStr, String detectionItemsStr, List<String> extraInfo);
+	/**
+	 * 获取所有清洗机的id和名称
+	 * @return [{id,name}]
+	 */
+	public JSONArray getAllRinserIdAndName();
 }
Index: ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCountDetail.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/rinserStoveUseCount_child.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27385 -r27498
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27385)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27498)
@@ -19488,4 +19488,128 @@
 		}
 		return list;
 	}
+	@Override
+	public List<RinserStove> getRinserStoveUseCountData(String startTime,
+			String endTime, String depart, String departCoding) {
+		List<RinserStove> ssList = new ArrayList<RinserStove>();
+		RinserStove ss = new RinserStove();
+		List<RinserStove_child> list = new ArrayList<RinserStove_child>();	
+		Map<String, RinserStove_child> successMap = getSuccessDataForRinser(depart,departCoding,
+				startTime,endTime,WashAndDisinfectRecord.STATUS_WASHED);
+		Map<String, RinserStove_child> failureMap = getSuccessDataForRinser(depart,departCoding,
+				startTime,endTime,WashAndDisinfectRecord.STATUS_WASHFAILD);
+		Iterator<Entry<String, RinserStove_child>> iterator = successMap.entrySet().iterator();
+		while(iterator.hasNext()){
+			Entry<String, RinserStove_child> next = iterator.next();
+			String name = next.getKey();
+			RinserStove_child ssc = next.getValue();
+			if(failureMap.get(name) != null){
+				ssc.setFailureCount(failureMap.get(name).getFailureCount());
+			}else{
+				ssc.setFailureCount(0);
+			}
+			list.add(ssc);
+		}
+		if(list.size()>0){
+			ss.setDepartName(depart);
+			ss.setList(list);
+			ssList.add(ss);
+		}
+		return ssList;
+	}
+	/**
+	 * 获取清洗成功和失败的数据信息
+	 * @param depart 部门
+	 * @param departCoding 部门编码
+	 * @param startTime 开始时间
+	 * @param endTime 结束时间
+	 * @param type 类型 即使清洗成功或清洗失败
+	 * @return
+	 */
+	private Map<String, RinserStove_child> getSuccessDataForRinser(String depart , String departCoding,
+			String startTime, String endTime, String type){
+		String sql = "select min(r.name) name,count(*) amount from WashAndDisinfectRecord wr inner join Rinser r on r.id=wr.rinserId "
+				+" where wr.washStatus = '"+type+"'"
+				+" and wr.orgUnitCoding = '"+departCoding+"'"
+				+" and wr.endDate between "+dateQueryAdapter.dateConverAdapter2(startTime
+						, "yyyy-mm-dd  HH24:MI") 
+				+" and "+dateQueryAdapter.dateConverAdapter2(endTime
+						, "yyyy-mm-dd  HH24:MI");
+		sql += " group by r.id ";
+		Map<String,RinserStove_child> map = new LinkedHashMap<String,RinserStove_child>();
+		RinserStove_child ssc = null;
+		ResultSet resultSet = objectDao.executeSql(sql);
+		try {
+			while(resultSet.next()){
+				ssc = new RinserStove_child();
+				String name = resultSet.getString("name");
+				int count = resultSet.getInt("amount");
+				ssc.setDepartName(depart);
+				ssc.setRinserName(name);
+				if(WashAndDisinfectRecord.STATUS_WASHED.equals(type)){
+					ssc.setSuccessCount(count);
+				}else if(WashAndDisinfectRecord.STATUS_WASHFAILD.equals(type)){
+					ssc.setFailureCount(count);
+				}
+				map.put(name, ssc);
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(resultSet);
+		}
+		return map;
+	}
+	@Override
+	public List<RinserStove_child> getRinserStoveUseCountDetailData(
+			String startTime, String endTime, String depart, String departCoding) {
+		List<RinserStove_child> scList = new ArrayList<RinserStove_child>();
+		Map<String ,RinserStove_child> keyResultMap = new HashMap<String ,RinserStove_child>();
+		try{
+			String sql = " SELECT disinfectIdentification,endDate from WashAndDisinfectRecord wr where wr.endDate between "
+					+ dateQueryAdapter.dateConverAdapter2( startTime
+							, "yyyy-mm-dd  HH24:MI")
+					+ " and " + ""
+					+ dateQueryAdapter.dateConverAdapter2( endTime
+							, "yyyy-mm-dd  HH24:MI")
+					+ " and wr.orgUnitCoding = "
+					+ departCoding;
+			ResultSet rs = null;
+			try {
+				rs = objectDao.executeSql(sql);
+				while(rs.next()){
+					String rinserName = rs.getString("disinfectIdentification");
+					Date endDate = rs.getTimestamp("endDate");
+					String dateStr = null;
+					if(endDate != null){
+						dateStr = Constants.SIMPLEDATEFORMAT_YYYYMMDD.format(endDate);
+					}else{
+						dateStr = "";
+					}
+					String key = null;
+					key = dateStr + rinserName;
+					if(StringUtils.isNotBlank(key)){
+						RinserStove_child sc = null;
+						if(keyResultMap.containsKey(key)){
+							sc = keyResultMap.get(key);
+						}else{
+							sc = new RinserStove_child();
+							sc.setRinserName(rinserName);
+						}
+						Integer curCount = sc.getTotalWashCount();
+						sc.setTotalWashCount(curCount + 1);
+						sc.setWashTime(dateStr);
+						keyResultMap.put(key, sc);
+					}
+				}
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}finally {
+				DatabaseUtil.closeResultSetAndStatement(rs);
+			}
+		}catch(Exception ex){
+			ex.printStackTrace();
+		}
+		return Arrays.asList(keyResultMap.values().toArray());
+	}
 }