Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33981 -r33995
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33981)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33995)
@@ -21046,8 +21046,20 @@
 						"where ri.urgentAmount > 0 " +
 						"and (ti.isTerminated is null or ti.isTerminated<>1) " +
 						"and (ti.id is null or ti.id not in (select tousseItemId from TousseInstance where tousseItemId is not null)) " + 
-						"and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " +
-					") temp where 1=1 " + betweenSql + tousseNameSql + whereSqlForOrgUnitCoding + " order by temp.回收时间"
+						"and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " 
+						+ " union all select ri.id,ri.urgentAmount,rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit.operationTime '装配时间',sr.startDate '灭菌开始时间'  "
+					    + " ,sr.endDate '灭菌结束时间',i.sendTime '发货时间',tit.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b.barcode '器械包条码',null '标识牌条码' "
+					    + " from RecyclingRecord rr   "
+					    + " join RecyclingItem ri on ri.recyclingRecord_id=rr.id  "
+					    + " join TousseInstance tit on tit.recyclingRecordId=rr.id join TousseDefinition td on td.id=tit.tousseDefinition_id "
+					    + " join barcodeDevice b on tit.id=b.id "
+					    + "  left join SterilizationRecord sr on sr.id=tit.sterilizationRecord_id "
+					    + "  left join Sterilizer sz on sr.sterilizer_id=sz.id  "
+					    + "   left join invoice i on i.id=tit.invoice_id "
+					    + " left join TousseItem ti on ti.recyclingApplication_ID=rr.recyclingApplication_id and ti.tousseDefinitionId=ri.tousseDefinitionId  "
+					    + "  where ri.urgentAmount > 0 and (ti.isTerminated is null or ti.isTerminated<>1)  "
+					    + "  and td.tousseType='"+ TousseDefinition.PACKAGE_TYPE_SPLIT +"' "
+					    + ") temp where 1=1 " + betweenSql + tousseNameSql + whereSqlForOrgUnitCoding + " order by temp.回收时间,temp.id"
 					;
 			logger.debug("急用物品处理周期统计报表查询:" + sql);
 			ResultSet result = objectDao.executeSql(sql);