Index: ssts-web/src/main/webapp/jasperRtp/qualityMonitoringReportTaskGroupReport.jasper
===================================================================
diff -u -r34549 -r34551
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/qualityMonitoringReportTaskGroupReport.jrxml
===================================================================
diff -u -r34549 -r34551
--- ssts-web/src/main/webapp/jasperRtp/qualityMonitoringReportTaskGroupReport.jrxml	(.../qualityMonitoringReportTaskGroupReport.jrxml)	(revision 34549)
+++ ssts-web/src/main/webapp/jasperRtp/qualityMonitoringReportTaskGroupReport.jrxml	(.../qualityMonitoringReportTaskGroupReport.jrxml)	(revision 34551)
@@ -1,7 +1,7 @@
 <?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="recycleMaterialReport" language="groovy" pageWidth="1210" pageHeight="842" columnWidth="1210" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="2ea57afd-2fda-484a-a7cb-7259daaba5b2">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="86"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -166,14 +166,14 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{totalProMaterialAmount}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{monitoringObject}.contains('高温灭菌')||$F{monitoringObject}.contains('低温灭菌')?"-":$F{totalProMaterialAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="2ed1a2f6-ee3f-47bf-a9fb-f4b2681c4227" style="table_TD" x="730" y="0" width="120" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qualityMonitoringMaterialAmount}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{monitoringObject}.contains('高温灭菌')||$F{monitoringObject}.contains('低温灭菌')?"-":$F{qualityMonitoringMaterialAmount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
 				<reportElement uuid="078ddca2-b35c-479d-9897-60e2268a4d14" style="table_TD" x="1130" y="0" width="80" height="30"/>
@@ -187,42 +187,42 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qualifiedMaterialAmount}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{monitoringObject}.contains('高温灭菌')||$F{monitoringObject}.contains('低温灭菌')?"-":$F{qualifiedMaterialAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="fdcc1f3a-0802-4db4-a232-a496ccef6340" style="table_TD" x="490" y="0" width="120" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{totalProTousseAmount}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{monitoringObject}.contains('清洗')?"-":$F{totalProTousseAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="fdcc1f3a-0802-4db4-a232-a496ccef6340" style="table_TD" x="610" y="0" width="120" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qualifiedTousseAmount}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{monitoringObject}.contains('清洗')?"-":$F{qualifiedTousseAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="2ed1a2f6-ee3f-47bf-a9fb-f4b2681c4227" style="table_TD" x="850" y="0" width="120" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{qualityMonitoringTousseAmount}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{monitoringObject}.contains('清洗')?"-":$F{qualityMonitoringTousseAmount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
 				<reportElement uuid="078ddca2-b35c-479d-9897-60e2268a4d14" style="table_TD" x="1050" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{backwashRate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{monitoringObject}.contains('清洗')?$F{backwashRate}:"-"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement uuid="2ed1a2f6-ee3f-47bf-a9fb-f4b2681c4227" style="table_TD" x="970" y="0" width="80" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{backWashMaterialAmount}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{monitoringObject}.contains('清洗')?$F{backWashMaterialAmount}:"-"]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>