Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r34091 -r34093
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34091)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34093)
@@ -14564,25 +14564,28 @@
 					TousseItem.class.getSimpleName()
 					+" ti on ti.recyclingApplication_ID=i.id join "+
 					TousseDefinition.class.getSimpleName()
-					+" td on td.id = ti.tousseDefinitionId join "+
-					MaterialInstance.class.getSimpleName()
-					+" mi on mi.tousse_id=td.id where not exists (select id from "+
+					+" td on td.id = ti.tousseDefinitionId "
+					+ joinMaterialInstanceSql
+					+ " where not exists (select id from "+
 					TousseInstance.class.getSimpleName()
 					+" where foreignTousseApp_id=f.id) "
 					+ timeSql
-					+ goodsNameSql
+					+ tousseSql
 					+ deptNameSql
+					+ goodsNameSql
 					+ patientNameSql
+					+ showNoInvoieSql
 					+ deliverStatusSql
 					+ departOfPatientSql
+					+ materialInstanceSql
+					+ customTimePeriodSql
 					+ filterConpanyNameSql
 					+ noDisplayTerminatedIPSql
-					+ customTimePeriodSql
 					+ " group by f.receiveTime,td.name,td.price,f.id,ti.supplierName "
 					+ " ,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus,f.bedNumber,i.applicationtime,f.id  "
-					+ " ,f.ascriptionDepartment,mi.materialName ,f.doctor,f.processType,ti.id "
 					+ customColumnName1Sql
 					+ groupByMaterialInstanceSql
+					+ ",f.doctor,f.processType,ti.id "
 					+ " ) t order by t.id asc ");
 		}else{
 			sqlBuilder.append(") t order by t.id asc ");