Index: ssts-web/src/main/webapp/jasperRtp/disinfectionFractionDefective.jrxml
===================================================================
diff -u -r12331 -r16451
--- ssts-web/src/main/webapp/jasperRtp/disinfectionFractionDefective.jrxml	(.../disinfectionFractionDefective.jrxml)	(revision 12331)
+++ ssts-web/src/main/webapp/jasperRtp/disinfectionFractionDefective.jrxml	(.../disinfectionFractionDefective.jrxml)	(revision 16451)
@@ -31,13 +31,10 @@
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
-	<field name="class" class="java.lang.Class">
-		<fieldDescription><![CDATA[class]]></fieldDescription>
-	</field>
 	<field name="date" class="java.lang.String">
 		<fieldDescription><![CDATA[date]]></fieldDescription>
 	</field>
-	<field name="result" class="java.lang.String">
+	<field name="result" class="java.lang.Integer">
 		<fieldDescription><![CDATA[result]]></fieldDescription>
 	</field>
 	<field name="title" class="java.lang.String">
@@ -46,6 +43,9 @@
 	<field name="titleSort" class="java.lang.Integer">
 		<fieldDescription><![CDATA[titleSort]]></fieldDescription>
 	</field>
+	<field name="percentage" class="java.lang.Double">
+		<fieldDescription><![CDATA[percentage]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -63,19 +63,19 @@
 	<summary>
 		<band height="121" splitType="Stretch">
 			<crosstab>
-				<reportElement uuid="f0c629ea-73f6-43c7-a95e-6774db630ccf" x="0" y="0" width="1100" height="121"/>
+				<reportElement uuid="5f5ca8bc-37ca-447c-8cac-7c4c3052423d" x="0" y="0" width="1100" height="121"/>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="cfd0dc9c-ff03-4e99-9c4c-95ee042a950d" style="table_TH" x="0" y="0" width="81" height="30"/>
+							<reportElement uuid="bc5d2043-86f2-441c-8f2c-2fb25d8fe889" style="table_TD" x="0" y="0" width="79" height="30"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
+								<font size="12"/>
 							</textElement>
 							<text><![CDATA[日期]]></text>
 						</staticText>
 					</cellContents>
 				</crosstabHeaderCell>
-				<rowGroup name="date" width="81">
+				<rowGroup name="date" width="79" totalPosition="End">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{date}]]></bucketExpression>
 					</bucket>
@@ -85,7 +85,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="936ac4b6-fb95-4813-8b07-5f41e40d1a65" style="Crosstab Data Text" x="0" y="0" width="81" height="25"/>
+								<reportElement uuid="19976db0-51a9-4b6d-ac03-0fcae3e32f73" style="Crosstab Data Text" x="0" y="0" width="79" height="25"/>
 								<textElement verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -94,121 +94,127 @@
 						</cellContents>
 					</crosstabRowHeader>
 					<crosstabTotalRowHeader>
-						<cellContents/>
+						<cellContents backcolor="#BFE1FF" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
 					</crosstabTotalRowHeader>
 				</rowGroup>
-				<columnGroup name="titleSort" height="0">
+				<columnGroup name="titleSort" height="0" totalPosition="End">
 					<bucket class="java.lang.Integer">
 						<bucketExpression><![CDATA[$F{titleSort}]]></bucketExpression>
 					</bucket>
 					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
+						<cellContents backcolor="#F0F8FF" mode="Transparent">
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 						</cellContents>
 					</crosstabColumnHeader>
 					<crosstabTotalColumnHeader>
-						<cellContents/>
+						<cellContents backcolor="#005FB3" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement uuid="45322562-4f21-41f1-9a5b-e0f98df7866a" x="0" y="0" width="70" height="30" forecolor="#000000"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12"/>
+								</textElement>
+								<text><![CDATA[不合格率]]></text>
+							</staticText>
+						</cellContents>
 					</crosstabTotalColumnHeader>
 				</columnGroup>
-				<columnGroup name="title" height="30">
+				<columnGroup name="title" height="30" totalPosition="End">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{title}]]></bucketExpression>
 					</bucket>
 					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
+						<cellContents backcolor="#F0F8FF" mode="Transparent">
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="7c4b3cb2-18c5-4bb8-b1fb-fdd967e7e289" style="Crosstab Data Text" x="0" y="0" width="79" height="30"/>
+								<reportElement uuid="7dcd2bec-5c79-4e5e-a23e-de1549ac4f6e" style="Crosstab Data Text" x="1" y="0" width="77" height="30"/>
 								<textElement verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
+									<font size="12"/>
 								</textElement>
 								<textFieldExpression><![CDATA[$V{title}]]></textFieldExpression>
 							</textField>
 						</cellContents>
 					</crosstabColumnHeader>
 					<crosstabTotalColumnHeader>
-						<cellContents/>
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
 					</crosstabTotalColumnHeader>
 				</columnGroup>
-				<measure name="resultMeasure" class="java.lang.String" calculation="First">
+				<measure name="resultMeasure" class="java.lang.Integer" calculation="Sum">
 					<measureExpression><![CDATA[$F{result}]]></measureExpression>
 				</measure>
-				<crosstabCell width="79" height="25">
+				<measure name="measure1" class="java.lang.Double">
+					<measureExpression><![CDATA[$F{percentage}]]></measureExpression>
+				</measure>
+				<crosstabCell width="78" height="25">
 					<cellContents>
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="0ab0cd1e-c5a1-4023-9a22-f7abc5c36fee" style="Crosstab Data Text" x="0" y="0" width="79" height="25"/>
+							<reportElement uuid="a6ac4e2f-5d7b-47b5-b0fa-015599f9bad1" style="Crosstab Data Text" x="0" y="0" width="78" height="25"/>
 							<textElement verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
-							<textFieldExpression><![CDATA[$V{resultMeasure}==null?0:$V{resultMeasure}]]></textFieldExpression>
+							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell height="25" rowTotalGroup="date">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
+				<crosstabCell width="78" height="0" rowTotalGroup="date">
+					<cellContents backcolor="#BFE1FF" mode="Transparent">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="3ab78136-a3e1-457e-b4cb-476d9a6d0cd5" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
-						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="50" columnTotalGroup="titleSort">
-					<cellContents backcolor="#005FB3" mode="Opaque">
+				<crosstabCell width="70" height="25" columnTotalGroup="titleSort">
+					<cellContents backcolor="#005FB3" mode="Transparent">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="3d919f84-b202-40c9-9a27-60921af827a5" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
+						<textField pattern="#,##0.0000 %">
+							<reportElement uuid="e8424529-c060-4a7b-8462-ae70e1b7987a" style="Crosstab Data Text" x="0" y="0" width="70" height="25">
+								<property name="net.sf.jasperreports.export.jxl.cell.complex.format" value="true"/>
+							</reportElement>
+							<textElement verticalAlignment="Middle">
+								<font size="12"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{measure1}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="date" columnTotalGroup="titleSort">
-					<cellContents backcolor="#005FB3" mode="Opaque">
+				<crosstabCell width="70" height="0" rowTotalGroup="date" columnTotalGroup="titleSort">
+					<cellContents backcolor="#005FB3" mode="Transparent">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="d1a39452-82d3-4028-909b-846b516539a5" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
-						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="50" columnTotalGroup="title">
+				<crosstabCell width="0" height="25" columnTotalGroup="title">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="d13387bb-3be5-414d-b417-11816d147797" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
-						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="date" columnTotalGroup="title">
+				<crosstabCell width="0" height="0" rowTotalGroup="date" columnTotalGroup="title">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="c6978014-0d01-4a48-8333-cf1d17a5f7c6" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{resultMeasure}]]></textFieldExpression>
-						</textField>
 					</cellContents>
 				</crosstabCell>
 			</crosstab>