Index: ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport.jrxml
===================================================================
diff -u -r36324 -r37005
--- ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport.jrxml	(.../tousseTournoverDaysStatisticsReport.jrxml)	(revision 36324)
+++ ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport.jrxml	(.../tousseTournoverDaysStatisticsReport.jrxml)	(revision 37005)
@@ -1,316 +1,108 @@
-<?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="monthReport" language="groovy" pageWidth="159" pageHeight="824" columnWidth="159" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
-	<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"/>
-	<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="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
-	<parameter name="title" class="java.lang.String">
-		<parameterDescription><![CDATA[""]]></parameterDescription>
-	</parameter>
-	<parameter name="amountFormat" class="java.lang.String">
-		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
-	</parameter>
-	<parameter name="dateStr" class="java.lang.String">
-		<defaultValueExpression><![CDATA[dateStr]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="rowNum" class="java.lang.String">
-		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
-	</field>
-	<field name="columnNum" class="java.lang.String">
-		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
-	</field>
-	<field name="columnName" class="java.lang.String">
-		<fieldDescription><![CDATA[columnName]]></fieldDescription>
-	</field>
-	<field name="validDateStr" class="java.lang.String">
-		<fieldDescription><![CDATA[validDateStr]]></fieldDescription>
-	</field>
-	<field name="amount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[amount]]></fieldDescription>
-	</field>
-	<field name="averageDays" class="java.lang.Double">
-		<fieldDescription><![CDATA[averageDays]]></fieldDescription>
-	</field>
-	<field name="columnTitle" class="java.lang.String">
-		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
-	</field>
-	<field name="sequence" class="java.lang.Integer">
-		<fieldDescription><![CDATA[sequence]]></fieldDescription>
-	</field>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band height="64" splitType="Stretch">
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="240" height="34"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="34" width="159" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="12" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{dateStr}]]></textFieldExpression>
-			</textField>
-		</band>
-	</title>
-	<summary>
-		<band height="127" splitType="Stretch">
-			<crosstab>
-				<reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="159" height="103"/>
-				<crosstabParameter name="amountFormatParam">
-					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="parameter1">
-					<parameterValueExpression><![CDATA[$F{columnTitle}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabHeaderCell>
-					<cellContents>
-						<staticText>
-							<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="0" y="0" width="80" height="40" backcolor="#FFFFFF"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font isBold="true"/>
-							</textElement>
-							<text><![CDATA[年度]]></text>
-						</staticText>
-						<staticText>
-							<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="0" y="40" width="80" height="40" backcolor="#FFFFFF"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font isBold="true"/>
-							</textElement>
-							<text><![CDATA[有效期]]></text>
-						</staticText>
-					</cellContents>
-				</crosstabHeaderCell>
-				<rowGroup name="rowNum" width="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{validDateStr}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<rowGroup name="validDateStr" width="80" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{validDateStr}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="80" height="25"/>
-								<textElement verticalAlignment="Middle">
-									<font size="12"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{validDateStr}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#BFE1FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<columnGroup name="columnNum" height="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#005FB3" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnTitle" height="40" totalPosition="End" headerPosition="Stretch">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField>
-								<reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="79" height="40"/>
-								<textElement verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnName" height="40" headerPosition="Center">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents>
-							<textField>
-								<reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="79" height="40" backcolor="#FFFFFF"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents/>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<measure name="averageDaysMeasure" class="java.lang.Double" calculation="Sum">
-					<measureExpression><![CDATA[$F{averageDays}]]></measureExpression>
-				</measure>
-				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
-					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
-				</measure>
-				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
-					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
-				</measure>
-				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
-					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
-				</measure>
-				<crosstabCell width="79" height="25">
-					<cellContents>
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="###0.0000">
-							<reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25"/>
-							<textElement verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<textFieldExpression><![CDATA[$V{columnName}.contains("包数")?$V{amountMeasure}:$V{averageDaysMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[$V{columnName}.contains("包数")?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="79" height="0" rowTotalGroup="rowNum">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="79" height="0" rowTotalGroup="validDateStr">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="validDateStr" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="validDateStr" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="validDateStr" columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-			</crosstab>
-		</band>
-	</summary>
-</jasperReport>
+<?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="monthDetail_main_1" language="groovy" pageWidth="600" pageHeight="1000" whenNoDataType="AllSectionsNoDetail" columnWidth="600" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
+	<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>
+	<subDataset name="Table Dataset 1" uuid="11526d02-b294-4d96-bde0-a51b05c04838"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String">
+		<defaultValueExpression><![CDATA["D:\\ireport\\"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="title" class="java.lang.String"/>
+	<parameter name="totalRate" class="java.lang.String"/>
+	<parameter name="totalEventCount" class="java.lang.Integer"/>
+	<field name="firstColumnName" class="java.lang.String">
+		<fieldDescription><![CDATA[firstColumnName]]></fieldDescription>
+	</field>
+	<field name="firstColumnDetaileds" class="java.util.List">
+		<fieldDescription><![CDATA[firstColumnDetaileds]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<columnHeader>
+		<band height="60" splitType="Stretch">
+			<staticText>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="500" y="27" width="100" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[周转天数]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="db44711a-c56b-47ff-a1c2-f82eda2ba32f" style="table_TH" x="400" y="27" width="100" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[包数]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="54809a7e-610e-4341-9da0-ae69f240c5a4" style="table_TH" x="0" y="27" width="200" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[器械包名称]]></text>
+			</staticText>
+			<textField>
+				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="0" width="600" height="27"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="16" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement uuid="54809a7e-610e-4341-9da0-ae69f240c5a4" style="table_TH" stretchType="RelativeToBandHeight" x="200" y="27" width="200" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[有效期]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="33" splitType="Stretch">
+			<subreport>
+				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" stretchType="RelativeToBandHeight" mode="Opaque" x="200" y="0" width="400" height="33" isPrintWhenDetailOverflows="true"/>
+				<subreportParameter name="rootPath">
+					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
+				</subreportParameter>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{firstColumnDetaileds})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "tousseTournoverDaysStatisticsReport_child.jasper"]]></subreportExpression>
+			</subreport>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="false">
+				<reportElement uuid="1c775e45-a905-44cf-8b93-2a13eb0df19d" style="table_TD" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="200" height="33" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{firstColumnName}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<summary>
+		<band height="1">
+			<textField>
+				<reportElement uuid="f796cd98-8784-4d1e-a24e-b64be030ae0a" x="0" y="0" width="600" height="0"/>
+				<textElement/>
+			</textField>
+		</band>
+	</summary>
+</jasperReport>