Index: ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jrxml
===================================================================
diff -u -r16038 -r17791
--- ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jrxml	(.../mainWashWorkloadReprot.jrxml)	(revision 16038)
+++ ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jrxml	(.../mainWashWorkloadReprot.jrxml)	(revision 17791)
@@ -1,5 +1,5 @@
 <?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="mainWashWorkloadReprot" language="groovy" pageWidth="860" pageHeight="1010" whenNoDataType="AllSectionsNoDetail" columnWidth="860" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="0c6f37ac-fdd3-421e-ae7c-077bed75cba6">
+<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="1224" pageHeight="1062" columnWidth="1224" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" 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"/>
@@ -23,225 +23,171 @@
 			<pen lineWidth="0.5" lineColor="#000000"/>
 		</box>
 	</style>
-	<subDataset name="Table Dataset 1" uuid="b94c3a9b-b3cb-43ad-a378-02b590cb6022"/>
+	<style name="Crosstab Data Text" hAlign="Center"/>
+	<subDataset name="Table Dataset 1" uuid="a4160b11-e96a-4eb4-a8c3-18c4b4bf6c8e"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["C:\\WorkspaceIndigoSR2\\SterileSupplySystem\\WebContent\\jasperRtp\\"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["C:\\Users\\wang\\"]]></defaultValueExpression>
 	</parameter>
-	<parameter name="queryMonth" class="java.lang.String"/>
 	<parameter name="title" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
-	<field name="main_disqualifiedRate" class="java.lang.Double">
-		<fieldDescription><![CDATA[main_disqualifiedRate]]></fieldDescription>
+	<field name="queryDate" class="java.lang.String">
+		<fieldDescription><![CDATA[queryDate]]></fieldDescription>
 	</field>
-	<field name="main_washTotalAmount" class="java.lang.Double">
-		<fieldDescription><![CDATA[main_washTotalAmount]]></fieldDescription>
+	<field name="colummTitle" class="java.lang.String">
+		<fieldDescription><![CDATA[colummTitle]]></fieldDescription>
 	</field>
-	<field name="main_disqualifiedAmount" class="java.lang.Double">
-		<fieldDescription><![CDATA[main_disqualifiedAmount]]></fieldDescription>
+	<field name="value" class="java.lang.String">
+		<fieldDescription><![CDATA[value]]></fieldDescription>
 	</field>
-	<field name="main_disinfection" class="java.lang.Integer">
-		<fieldDescription><![CDATA[main_disinfection]]></fieldDescription>
+	<field name="columnNum" class="java.lang.Integer">
+		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
 	</field>
-	<field name="main_outsideMaterial" class="java.lang.Integer">
-		<fieldDescription><![CDATA[main_outsideMaterial]]></fieldDescription>
-	</field>
-	<field name="s_DATE" class="java.lang.String">
-		<fieldDescription><![CDATA[s_DATE]]></fieldDescription>
-	</field>
-	<field name="childList" class="java.util.List">
-		<fieldDescription><![CDATA[childList]]></fieldDescription>
-	</field>
-	<field name="main_ordinaryMaterial" class="java.lang.Integer">
-		<fieldDescription><![CDATA[main_ordinaryMaterial]]></fieldDescription>
-	</field>
-	<field name="e_DATE" class="java.lang.String">
-		<fieldDescription><![CDATA[e_DATE]]></fieldDescription>
-	</field>
-	<field name="main_operationMaterial" class="java.lang.Integer">
-		<fieldDescription><![CDATA[main_operationMaterial]]></fieldDescription>
-	</field>
-	<variable name="ordinaryMaterial" class="java.lang.Integer" calculation="Sum"/>
-	<variable name="operationMaterial" class="java.lang.Integer" calculation="Sum"/>
-	<variable name="outsideMaterial" class="java.lang.Integer" calculation="Sum"/>
-	<variable name="disinfection" class="java.lang.Integer" calculation="Sum"/>
-	<variable name="washTotalAmount" class="java.lang.Integer" calculation="Sum"/>
-	<variable name="disqualifiedAmount" class="java.lang.Integer" calculation="Sum"/>
-	<variable name="disqualifiedRate" class="java.lang.Double" calculation="Sum"/>
-	<variable name="secondWashAmount" class="java.lang.Integer" calculation="Sum"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="26" splitType="Stretch">
+		<band height="25" splitType="Stretch">
 			<textField>
-				<reportElement uuid="2b053927-410c-4cc7-8e50-a7480c11693e" x="0" y="0" width="860" height="26"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
+				<reportElement uuid="a70c7921-055d-4e07-8f4b-ad40d72ec6aa" x="0" y="0" width="740" height="25"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
 		</band>
 	</title>
-	<columnHeader>
-		<band height="30">
-			<staticText>
-				<reportElement uuid="7d9f80d1-7cb7-4c7a-bc27-132d38ab3012" style="table_TH" x="0" y="0" width="100" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="宋体" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[日期]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="9dc475f5-79da-491f-be73-3afe4dbe01e5" style="table_TH" x="100" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="宋体" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[普通器械]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="ebd241ce-ae6b-411c-9575-942c3f946b85" style="table_TH" x="190" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="宋体" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[手术器械]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="a88dcfa0-080a-4cf0-ae50-cfa6fc3a0443" style="table_TH" x="280" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="宋体" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[外来器械]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="d705fe20-b0b8-43bb-a39d-81e58f135b78" style="table_TH" x="370" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="宋体" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[清洗总数]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="91972b19-03f6-4d1b-b9a0-a056675502a6" style="table_TH" x="460" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[不合格数]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="04116231-a030-4193-9fa4-823ee29a50c3" style="table_TH" x="550" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[不合格率]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="a7a40694-d180-4501-b7ea-1015bd719183" style="table_TH" x="640" y="0" width="90" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font fontName="宋体" size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[消毒物品]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="55c28372-bbab-4485-8281-b8caedd1b708" style="table_TH" mode="Opaque" x="730" y="0" width="130" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[外来器械二次清洗]]></text>
-			</staticText>
-		</band>
-	</columnHeader>
-	<detail>
-		<band height="24" splitType="Stretch">
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="7a2a06fb-e730-45b3-b36a-d782fc34edf6" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="24"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{s_DATE}]]></textFieldExpression>
-			</textField>
-			<subreport>
-				<reportElement uuid="c30704e1-9b81-4a23-bc3f-8c101a253598" x="100" y="0" width="760" height="24" isPrintWhenDetailOverflows="true"/>
-				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{childList})]]></dataSourceExpression>
-				<returnValue subreportVariable="vOrdinaryMaterial" toVariable="ordinaryMaterial" calculation="Sum"/>
-				<returnValue subreportVariable="vOperationMaterial" toVariable="operationMaterial" calculation="Sum"/>
-				<returnValue subreportVariable="vOutsideMaterial" toVariable="outsideMaterial" calculation="Sum"/>
-				<returnValue subreportVariable="vDisinfection" toVariable="disinfection" calculation="Sum"/>
-				<returnValue subreportVariable="vWashTotalAmount" toVariable="washTotalAmount" calculation="Sum"/>
-				<returnValue subreportVariable="vDisqualifiedAmount" toVariable="disqualifiedAmount" calculation="Sum"/>
-				<returnValue subreportVariable="vDisqualifiedRate" toVariable="disqualifiedRate" calculation="Sum"/>
-				<returnValue subreportVariable="vSecondWashForeignAmount" toVariable="secondWashAmount" calculation="Sum"/>
-				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "washWorkloadReport.jasper"]]></subreportExpression>
-			</subreport>
-		</band>
-	</detail>
 	<summary>
-		<band height="36">
-			<textField pattern="#,##0.0000 %" isBlankWhenNull="true">
-				<reportElement uuid="7ce4f057-5e7e-41e6-a3dd-00e3078fbd65" style="table_CH" mode="Opaque" x="550" y="0" width="90" height="28">
-					<property name="net.sf.jasperreports.export.jxl.cell.complex.format" value="true"/>
-				</reportElement>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{washTotalAmount}==0?0:$V{disqualifiedAmount}/$V{washTotalAmount}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="2008f0cc-7fff-413c-895a-ac9a2daea64c" style="table_CH" x="100" y="0" width="90" height="28"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{ordinaryMaterial}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="bd3488ed-a9df-44d8-9355-1dc0ce72a01d" style="table_CH" x="190" y="0" width="90" height="28"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{operationMaterial}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="3b7226c0-2484-4389-b7fa-14d33a8537c4" style="table_CH" x="280" y="0" width="90" height="28"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{outsideMaterial}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="b6b6f190-5560-4039-9713-f4b1afdcb897" style="table_CH" x="640" y="0" width="90" height="28"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{disinfection}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="5cc73bc4-8ed6-4794-8216-8e76fdd08ba3" style="table_CH" x="370" y="0" width="90" height="28"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{washTotalAmount}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="3124d045-c70a-4940-a4d9-218b808b08b2" style="table_CH" x="460" y="0" width="90" height="28"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{disqualifiedAmount}]]></textFieldExpression>
-			</textField>
-			<staticText>
-				<reportElement uuid="2a02ba1b-31e4-49e5-9094-89dd2bceecaa" style="table_CH" x="0" y="0" width="100" height="28"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[合计]]></text>
-			</staticText>
-			<textField>
-				<reportElement uuid="28d500ba-1f86-49de-939f-2c3eb9ce81f0" style="table_CH" mode="Opaque" x="730" y="0" width="130" height="28"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$V{secondWashAmount}]]></textFieldExpression>
-			</textField>
+		<band height="1000" splitType="Stretch">
+			<crosstab>
+				<reportElement uuid="73e516ba-6033-4b62-a5ad-c9117cf69b7f" style="table" stretchType="RelativeToTallestObject" x="0" y="0" width="1224" height="1000"/>
+				<crosstabHeaderCell>
+					<cellContents>
+						<staticText>
+							<reportElement uuid="13cf84b0-a980-4f53-8c23-daa0319efac8" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="89" height="60"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<text><![CDATA[日期]]></text>
+						</staticText>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="queryDate" width="89">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{queryDate}]]></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{queryDate}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents/>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="cloumn" height="0">
+					<bucket class="java.lang.Integer">
+						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents/>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="colummTitle" height="60">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{colummTitle}]]></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="60"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{colummTitle}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="value" class="java.lang.String">
+					<measureExpression><![CDATA[$F{value}]]></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{value}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell height="25" rowTotalGroup="queryDate">
+					<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{value}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="50" columnTotalGroup="colummTitle">
+					<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{value}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="queryDate" columnTotalGroup="colummTitle">
+					<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{value}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell columnTotalGroup="cloumn">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="queryDate" columnTotalGroup="cloumn">
+					<cellContents/>
+				</crosstabCell>
+			</crosstab>
 		</band>
 	</summary>
 </jasperReport>