Index: ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jasper
===================================================================
diff -u -r14473 -r14755
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jrxml
===================================================================
diff -u -r14473 -r14755
--- ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jrxml	(.../materialTypeWorkloadReport.jrxml)	(revision 14473)
+++ ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jrxml	(.../materialTypeWorkloadReport.jrxml)	(revision 14755)
@@ -73,7 +73,7 @@
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="c2669219-e345-46ab-a0d7-7de189751f5c" style="table_TH" mode="Opaque" x="0" y="0" width="78" height="39"/>
+							<reportElement uuid="c2669219-e345-46ab-a0d7-7de189751f5c" style="table_CH" mode="Opaque" x="0" y="0" width="78" height="39"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
@@ -93,12 +93,12 @@
 						</cellContents>
 					</crosstabRowHeader>
 					<crosstabTotalRowHeader>
-						<cellContents backcolor="#005FB3" mode="Opaque">
+						<cellContents backcolor="#FFFFFF" mode="Opaque">
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="97241822-fb0d-42e9-a84d-8381e80f777a" x="0" y="0" width="78" height="25" forecolor="#FFFFFF"/>
+								<reportElement uuid="97241822-fb0d-42e9-a84d-8381e80f777a" style="table_TD" mode="Opaque" x="0" y="0" width="78" height="25" forecolor="#FFFFFF" backcolor="#005FB3"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 								</textElement>
@@ -150,21 +150,28 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="60211ff5-5fc7-434c-b4a2-06a1beeea777" style="table_CH" x="0" y="0" width="112" height="39" forecolor="#333333"/>
+								<reportElement uuid="60211ff5-5fc7-434c-b4a2-06a1beeea777" style="table_CH" x="0" y="0" width="211" height="19" forecolor="#333333"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 								</textElement>
 								<text><![CDATA[合计]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="743e9abd-450c-4f45-8e51-519a0b1154ce" style="table_CH" x="112" y="0" width="70" height="39" forecolor="#333333"/>
+								<reportElement uuid="743e9abd-450c-4f45-8e51-519a0b1154ce" style="table_CH" x="0" y="19" width="70" height="20" forecolor="#333333"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 								</textElement>
+								<text><![CDATA[清洗数量]]></text>
+							</staticText>
+							<staticText>
+								<reportElement uuid="e4714c9c-32bf-46e5-98b9-7b23914de03c" style="table_CH" x="70" y="19" width="70" height="20" forecolor="#333333"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="true"/>
+								</textElement>
 								<text><![CDATA[不合格数]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="e4714c9c-32bf-46e5-98b9-7b23914de03c" style="table_CH" x="182" y="0" width="71" height="39" forecolor="#333333"/>
+								<reportElement uuid="743e9abd-450c-4f45-8e51-519a0b1154ce" style="table_CH" x="140" y="19" width="71" height="20" forecolor="#333333"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 								</textElement>
@@ -183,8 +190,8 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="da9ab996-9e89-4149-af75-e1cb21f974d2" style="Crosstab Data Text" x="0" y="0" width="77" height="39"/>
-								<textElement verticalAlignment="Middle">
+								<reportElement uuid="da9ab996-9e89-4149-af75-e1cb21f974d2" style="table_CH" x="0" y="0" width="190" height="39"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 								</textElement>
 								<textFieldExpression><![CDATA[$V{materialType}]]></textFieldExpression>
@@ -202,93 +209,124 @@
 				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
 					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
 				</measure>
-				<measure name="measure1" class="java.lang.Integer" calculation="Sum">
+				<measure name="measure1" class="java.lang.Integer">
 					<measureExpression><![CDATA[$F{washUnqualifiedAmount}]]></measureExpression>
 				</measure>
 				<measure name="measure2" class="java.lang.Double">
 					<measureExpression><![CDATA[$F{washUnqualifiedPercentage}]]></measureExpression>
 				</measure>
-				<crosstabCell width="77" height="25">
+				<measure name="measure3" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{washUnqualifiedAmount}]]></measureExpression>
+				</measure>
+				<crosstabCell width="190" height="25">
 					<cellContents>
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="e9da56b0-dd66-47fb-8c48-d6fffa8b2cb1" style="Crosstab Data Text" x="0" y="0" width="77" height="25"/>
-							<textElement verticalAlignment="Middle">
+							<reportElement uuid="e9da56b0-dd66-47fb-8c48-d6fffa8b2cb1" style="table_TD" mode="Opaque" x="0" y="0" width="60" height="25" backcolor="#FFFFFF"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
+						<textField>
+							<reportElement uuid="cc53bb27-d46c-4297-b015-1b0ed5ec1156" style="table_TD" mode="Opaque" x="60" y="0" width="60" height="25" backcolor="#FFFFFF"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{measure1}==null?0:$V{measure1}]]></textFieldExpression>
+						</textField>
+						<textField pattern="#,##0.0000 %">
+							<reportElement uuid="29eeab05-fb00-4768-9bb2-f6b2431b5689" style="table_TD" x="120" y="0" width="70" height="25" backcolor="#FFFFFF"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{measure2}==null?0.00:$V{measure2}]]></textFieldExpression>
+						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="77" height="25" rowTotalGroup="rowNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
+				<crosstabCell width="190" height="25" rowTotalGroup="rowNum">
+					<cellContents backcolor="#FFFFFF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="7f0c21e2-598c-465d-882d-5d3cf4b726b5" style="Crosstab Data Text" x="0" y="0" width="77" height="25" forecolor="#FFFFFF"/>
-							<textElement verticalAlignment="Middle">
+							<reportElement uuid="7f0c21e2-598c-465d-882d-5d3cf4b726b5" style="table_TD" mode="Opaque" x="0" y="0" width="60" height="25" forecolor="#FFFFFF" backcolor="#005FB3"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
+						<textField>
+							<reportElement uuid="df302c5c-94fb-49bb-b89f-cfb807b30fcc" style="table_TD" mode="Opaque" x="60" y="0" width="60" height="25" forecolor="#FFFFFF" backcolor="#005FB3"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{measure3}]]></textFieldExpression>
+						</textField>
+						<textField pattern="#,##0.0000 %">
+							<reportElement uuid="2994ce8d-85fb-4d8e-b2a5-7334a64e7e5c" style="table_TD" mode="Opaque" x="120" y="0" width="70" height="25" forecolor="#FFFFFF" backcolor="#005FB3"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="12" isBold="true"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{measure3}/$V{amountMeasure}]]></textFieldExpression>
+						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="253" height="25" columnTotalGroup="columnNum">
+				<crosstabCell width="211" height="25" columnTotalGroup="columnNum">
 					<cellContents backcolor="#FFFFFF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="20d589a9-e912-4298-bd9a-64639196e525" style="table_CH" mode="Opaque" x="0" y="0" width="112" height="25" forecolor="#000000"/>
+							<reportElement uuid="20d589a9-e912-4298-bd9a-64639196e525" style="table_CH" mode="Opaque" x="0" y="0" width="70" height="25" forecolor="#000000"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="d7fc8a26-7a39-4775-b3a2-d53319dd500f" style="table_CH" mode="Opaque" x="112" y="0" width="70" height="25" forecolor="#000000"/>
+							<reportElement uuid="c9785660-fe4e-45aa-90cd-a0503c792da4" style="table_CH" x="70" y="0" width="70" height="25"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[$V{measure1}]]></textFieldExpression>
+							<textFieldExpression><![CDATA[$V{measure3}]]></textFieldExpression>
 						</textField>
 						<textField pattern="#,##0.0000 %">
-							<reportElement uuid="d54ee6dc-1b2e-4dee-929d-74ab49596429" style="table_CH" mode="Opaque" x="182" y="0" width="71" height="25" forecolor="#000000"/>
+							<reportElement uuid="c178af8e-77b3-4841-8982-162a2c01e98a" style="table_CH" x="140" y="0" width="71" height="25"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[$V{measure2}]]></textFieldExpression>
+							<textFieldExpression><![CDATA[$V{measure3}/$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="253" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
+				<crosstabCell width="211" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
 					<cellContents backcolor="#FFFFFF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="1a03a50b-810b-4c79-844f-4f1bc76329cc" style="table_CH" x="0" y="0" width="112" height="25" forecolor="#000000"/>
+							<reportElement uuid="1a03a50b-810b-4c79-844f-4f1bc76329cc" style="table_TD" mode="Opaque" x="0" y="0" width="70" height="25" forecolor="#FFFFFF" backcolor="#005FB3"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="688a9076-d67c-421c-965b-c26156753093" style="table_CH" x="112" y="0" width="71" height="25" forecolor="#000000"/>
+							<reportElement uuid="688a9076-d67c-421c-965b-c26156753093" style="table_TD" mode="Opaque" x="70" y="0" width="71" height="25" forecolor="#FFFFFF" backcolor="#005FB3"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[$V{measure1}]]></textFieldExpression>
+							<textFieldExpression><![CDATA[$V{measure3}]]></textFieldExpression>
 						</textField>
 						<textField pattern="#,##0.0000 %">
-							<reportElement uuid="2994ce8d-85fb-4d8e-b2a5-7334a64e7e5c" style="table_CH" x="182" y="0" width="71" height="25" forecolor="#000000"/>
+							<reportElement uuid="2994ce8d-85fb-4d8e-b2a5-7334a64e7e5c" style="table_TD" mode="Opaque" x="140" y="0" width="71" height="25" forecolor="#FFFFFF" backcolor="#005FB3"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[$V{measure1}/$V{amountMeasure}]]></textFieldExpression>
+							<textFieldExpression><![CDATA[$V{measure3}/$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
@@ -306,14 +344,14 @@
 						</box>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="77" height="0" rowTotalGroup="dayOfMonth">
+				<crosstabCell width="190" height="0" rowTotalGroup="dayOfMonth">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="253" height="0" rowTotalGroup="dayOfMonth" columnTotalGroup="columnNum">
+				<crosstabCell width="211" height="0" rowTotalGroup="dayOfMonth" columnTotalGroup="columnNum">
 					<cellContents backcolor="#005FB3" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r14749 -r14755
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14749)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14755)
@@ -9185,6 +9185,7 @@
 				}
 				totalUnqualifiedAmount += washUnqualifiedAmount;
 				data.setWashUnqualifiedAmount(washUnqualifiedAmount);
+				data.setWashUnqualifiedPercentage(MathTools.divide(washUnqualifiedAmount, amount, 4));
 				totalAmount += amount;
 				tmpList.add(data);
 			}
@@ -9193,13 +9194,6 @@
 		} finally {
 			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
-		
-		for (MaterialTypeWorkloadReport bean : tmpList) {
-			if(totalAmount > 0){
-				Double d = MathTools.divide(totalUnqualifiedAmount, totalAmount, 4);
-				bean.setWashUnqualifiedPercentage(d);
-			}
-		}
 		list.addAll(tmpList);
 	}
 	/**
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialTypeWorkloadReport.java
===================================================================
diff -u -r14473 -r14755
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialTypeWorkloadReport.java	(.../MaterialTypeWorkloadReport.java)	(revision 14473)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialTypeWorkloadReport.java	(.../MaterialTypeWorkloadReport.java)	(revision 14755)
@@ -14,7 +14,7 @@
 	
 	private Integer washUnqualifiedAmount = 0;//清洗不合数
 	
-	private Double washUnqualifiedPercentage;//清洗不合格百分比
+	private Double washUnqualifiedPercentage;//清洗不合格率
 
 	public Integer getRowNum() {
 		return rowNum;