Index: ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jrxml
===================================================================
diff -u -r17229 -r17231
--- ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jrxml	(.../tousseOverLoadReport.jrxml)	(revision 17229)
+++ ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jrxml	(.../tousseOverLoadReport.jrxml)	(revision 17231)
@@ -1,27 +1,181 @@
 <?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="tousseOverLoadReport" language="groovy" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="2503b904-1361-436b-92af-e168d0355905">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="Crosstab Data Text" hAlign="Center"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="combinationCode" class="java.lang.String">
+		<fieldDescription><![CDATA[combinationCode]]></fieldDescription>
+	</field>
+	<field name="combinationCodeCount" class="java.lang.String">
+		<fieldDescription><![CDATA[combinationCodeCount]]></fieldDescription>
+	</field>
+	<field name="date" class="java.lang.String">
+		<fieldDescription><![CDATA[date]]></fieldDescription>
+	</field>
+	<field name="frequency" class="java.lang.String">
+		<fieldDescription><![CDATA[frequency]]></fieldDescription>
+	</field>
+	<field name="rowNum" class="java.lang.String">
+		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
+	</field>
+	<field name="sterileProgram" class="java.lang.String">
+		<fieldDescription><![CDATA[sterileProgram]]></fieldDescription>
+	</field>
+	<field name="tousseName" class="java.lang.String">
+		<fieldDescription><![CDATA[tousseName]]></fieldDescription>
+	</field>
+	<field name="tousseCount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[tousseCount]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<title>
 		<band height="79" splitType="Stretch"/>
 	</title>
-	<pageHeader>
-		<band height="35" splitType="Stretch"/>
-	</pageHeader>
-	<columnHeader>
-		<band height="61" splitType="Stretch"/>
-	</columnHeader>
-	<detail>
-		<band height="125" splitType="Stretch"/>
-	</detail>
-	<columnFooter>
-		<band height="45" splitType="Stretch"/>
-	</columnFooter>
-	<pageFooter>
-		<band height="54" splitType="Stretch"/>
-	</pageFooter>
 	<summary>
-		<band height="42" splitType="Stretch"/>
+		<band height="42" splitType="Stretch">
+			<crosstab>
+				<reportElement uuid="39301aa4-d4ab-4dea-ab7b-eafd4fddbaa5" x="0" y="0" width="555" height="42"/>
+				<rowGroup name="rowNum" width="70">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{rowNum}]]></bucketExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<textField>
+								<reportElement uuid="f64000ba-0cff-4b2f-839c-06786096beae" style="Crosstab Data Text" x="0" y="0" width="70" height="25"/>
+								<textElement/>
+								<textFieldExpression><![CDATA[$V{rowNum}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents/>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<rowGroup name="date" width="70">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{date}]]></bucketExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<textField>
+								<reportElement uuid="2ef2dafb-e7cf-4af1-8fc3-cdaa3b290e25" style="Crosstab Data Text" x="0" y="0" width="70" height="25"/>
+								<textElement/>
+								<textFieldExpression><![CDATA[$V{date}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents/>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="tousseName" height="30" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{tousseName}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<textField>
+								<reportElement uuid="68fb9106-30b6-4f1f-8344-fafa78a687f7" style="Crosstab Data Text" x="0" y="0" width="50" height="30"/>
+								<textElement/>
+								<textFieldExpression><![CDATA[$V{tousseName}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<staticText>
+								<reportElement uuid="52774a20-2005-4f5b-b0e9-9f72700a00f5" x="0" y="0" width="69" height="30"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle"/>
+								<text><![CDATA[组合编号]]></text>
+							</staticText>
+							<staticText>
+								<reportElement uuid="97345a38-7d09-4ef4-8927-4294a89de4fb" x="69" y="0" width="66" height="30"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle"/>
+								<text><![CDATA[组合出现次数]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="tousseCountMeasure" class="java.lang.Integer" calculation="Count">
+					<measureExpression><![CDATA[$F{tousseCount}]]></measureExpression>
+				</measure>
+				<measure name="combinationCode" class="java.lang.String" calculation="Count">
+					<measureExpression><![CDATA[$F{combinationCode}]]></measureExpression>
+				</measure>
+				<measure name="combinationCodeCount" class="java.lang.String" calculation="Count">
+					<measureExpression><![CDATA[$F{combinationCodeCount}]]></measureExpression>
+				</measure>
+				<crosstabCell width="50" height="25">
+					<cellContents>
+						<textField>
+							<reportElement uuid="04402f30-97e7-45ad-9aae-e9a23926814c" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{tousseCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell height="25" rowTotalGroup="rowNum">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<textField>
+							<reportElement uuid="0a941ae6-e96f-4ac8-b3a8-1069b2eeb259" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{tousseCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="136" height="25" columnTotalGroup="tousseName">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<textField>
+							<reportElement uuid="66754ba1-c5f4-4226-bc97-d8684f92f2da" style="Crosstab Data Text" x="0" y="0" width="69" height="24"/>
+							<textElement>
+								<font size="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{combinationCode}]]></textFieldExpression>
+						</textField>
+						<textField>
+							<reportElement uuid="b9802fd8-a007-4bee-a90e-1b861f4a06fc" style="Crosstab Data Text" x="69" y="0" width="66" height="24"/>
+							<textElement>
+								<font size="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{combinationCodeCount}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="rowNum" columnTotalGroup="tousseName">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<textField>
+							<reportElement uuid="0ac4cdc6-bc3c-420c-bb3a-89b15f7ce696" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{tousseCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell height="25" rowTotalGroup="date">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<textField>
+							<reportElement uuid="f5d952c2-ae07-434e-8703-9f67ff26061c" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{tousseCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="date" columnTotalGroup="tousseName">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<textField>
+							<reportElement uuid="dc0ca951-b29e-4232-bd65-06b490621b85" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{tousseCountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+			</crosstab>
+		</band>
 	</summary>
 </jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/tousseOverLoadReport.jasper
===================================================================
diff -u -r17229 -r17231
Binary files differ