Index: ssts-web/src/main/webapp/jasperRtp/WashAndDisinfectRecordReport.jrxml
===================================================================
diff -u -r27617 -r31219
--- ssts-web/src/main/webapp/jasperRtp/WashAndDisinfectRecordReport.jrxml	(.../WashAndDisinfectRecordReport.jrxml)	(revision 27617)
+++ ssts-web/src/main/webapp/jasperRtp/WashAndDisinfectRecordReport.jrxml	(.../WashAndDisinfectRecordReport.jrxml)	(revision 31219)
@@ -116,21 +116,21 @@
 	</columnHeader>
 	<detail>
 		<band height="30" splitType="Stretch">
-			<textField>
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="46ee3081-d868-46f1-bee3-1b9031359548" style="table_TD" x="0" y="0" width="150" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{rinserName}==null?"":$F{rinserName}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="007f7452-c88f-49e4-aea6-8c4cf4d41dcf" style="table_TD" x="150" y="0" width="60" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{disinfectProgram}==null?"":$F{disinfectProgram}]]></textFieldExpression>
 			</textField>
-			<textField>
+			<textField isBlankWhenNull="true">
 				<reportElement uuid="47dec957-0601-4ed1-b37e-4155eec51208" style="table_TD" x="210" y="0" width="137" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
Index: ssts-web/src/main/webapp/jasperRtp/WashAndDisinfectRecordReport.jasper
===================================================================
diff -u -r27617 -r31219
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r31211 -r31219
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31211)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31219)
@@ -21448,7 +21448,9 @@
 			+ " join ClassifyBasket cb on cw.ClassifyBasket_ID=cb.id"
 			+ " join ClassifiedItem ci on ci.classifybasket_id=cb.id"
 			+ " where ci.itemType='"+ TousseDefinition.PACKAGE_TYPE_INSIDE +"'"
-			+ " ) alias" + queryCondition
+			+ " union all select wr.orgUnitCoding,r.name rinserName, wr.disinfectProgram disinfectProgram,null tousseName,wrm.amount tousseAmount,wr.startDate,wr.endDate,wr.operator "
+			+ " from "+ WashAndDisinfectRecord.class.getSimpleName() +" wr inner join WashRecord_WashMaterial wm on wm.WashAndDisinfectRecord_ID = wr.id "
+			+ " inner join "+ WashAndDisinfectRecordMaterial.class.getSimpleName() +" wrm on wrm.id = wm.WashAndDisinfectMaterial_ID inner join "+ MaterialDefinition.class.getSimpleName() +" md on wrm.materialDefinition_id = md.id inner join "+ Rinser.class.getSimpleName() +" r on r.id=wr.rinserId) alias" + queryCondition
 			+ " group by alias.startDate,alias.endDate,alias.rinserName,alias.disinfectProgram,alias.tousseName,alias.operator";
 		ResultSet rs = null;
 		List<WashAndDisinfectRecordItemBean> dataList = new ArrayList<WashAndDisinfectRecordItemBean>();