Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r18593 -r18594
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18593)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18594)
@@ -16224,7 +16224,7 @@
 		String sql = String.format("select * from("
 					+ "select ti.tousseName tousseName,1 amount,t.destDepart destDepart,t.destLocation destLocation,"
 					+ "case when (ti.status='%s') or (ti.lastTousseInstanceId is not null and ti.status<>'%s' and ti.status<>'%s' and ti.status<>'%s') then '%s' else '' end recyclingStatus,"
-					+ "case when ti.status='%s' then '未签收' when (ti.status='%s' or ti.status='%s') and ti.status2 is not null then ti.status2 else ti.status end status,"
+					+ "case when (ti.status='%s' or ti.status='%s') and ti.status2 is not null then ti.status2 when ti.status='%s' then '未签收' else ti.status end status,"
 					+ "case when ti.status='%s' or ti.status='%s' or ti.status='%s' then t.destLocationType else '消毒供应中心' end destLocationType,"
 					+ "case when ti.status='%s' then '去污区' when ti.status='%s' or ti.status='%s' then '包装区' when ti.status='%s' or ti.status='%s' then '灭菌区' when ti.status='%s' or ti.status='%s' then '发货区' else '' end supplyRoomPosition,"
 					+ "ti.idCardInstanceBarcode idCardInstanceBarcode,bd.barcode barcode,1 idCardSequence "
@@ -16236,16 +16236,16 @@
 					+ "'' supplyRoomPosition,'' idCardInstanceBarcode,"
 					+ "case when count(*)=1 then min(t1.barcode) else '' end barcode,2 idCardSequence from("
 					+ "select ti.tousseName tousseName,t.destDepart destDepart,t.destLocation destLocation,t.destLocationType destLocationType,"
-					+ "case when ti.status='%s' then '未签收' when (ti.status='%s' or ti.status='%s') and ti.status2 is not null then ti.status2 else ti.status end status,bd.barcode barcode "
+					+ "case when (ti.status='%s' or ti.status='%s') and ti.status2 is not null then ti.status2 when ti.status='%s' then '未签收' else ti.status end status,bd.barcode barcode "
 					+ "from TousseInstance ti join barcodeDevice bd on bd.id=ti.id  left join TousseOperation t on t.id=ti.tousseOperationId "
 					+ "where ti.tousseFixedBarcode<>1 and ti.idCardInstanceID is null %s %s "
 					+ ") t1 group by t1.destDepart,t1.destLocation,t1.tousseName,t1.status,t1.destLocationType"
 				+ ") t2 order by t2.idCardSequence",
 				TousseInstance.STATUS_RECYCLED,TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SIGNED,TousseInstance.STATUS_USED,TousseInstance.STATUS_RECYCLED,
-				TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SIGNED,
+				TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SIGNED,TousseInstance.STATUS_SHIPPED,
 				TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SIGNED,TousseInstance.STATUS_USED,
 				TousseInstance.STATUS_RECYCLED,TousseInstance.STATUS_PACKED,TousseInstance.STATUS_REVIEWED,TousseInstance.STATUS_STERILING,TousseInstance.STATUS_DELAY_CONFIRM,TousseInstance.STATUS_STERILED,TousseInstance.STATUS_DISINFECTED,
-				filterSql,idCardBarcodeSql,TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SIGNED,filterSql,tousseBarcodeSql);
+				filterSql,idCardBarcodeSql,TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SIGNED,TousseInstance.STATUS_SHIPPED,filterSql,tousseBarcodeSql);
 		
 		ResultSet result = objectDao.executeSql(sql);
 		try {