Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r32882 -r32884
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 32882)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 32884)
@@ -9637,11 +9637,20 @@
 		if(useRecord == null){
 			JSONUtil.addMessage(result, "未找到id为"+ useRecordId +"的使用记录,或者可能已被删除。");
 		}else{
-			String sql = String.format("select ip.handleDepart,ip.recyclingTime,ip.serialNumber,ti.tousseName,ti.amount,ti.tallyAmount,ti.recyclingAmount from %s urtra " 
+			String sql = String.format("select * from (select ip.handleDepart,ip.recyclingTime,ip.serialNumber,ti.tousseName,ti.amount,ti.tallyAmount,ti.recyclingAmount from %s urtra " 
 				+ " join %s ip on ip.id=urtra.invoicePlanId "
 				+ " join %s ti on ti.recyclingApplication_ID=ip.id"
-				+ " where urtra.useRecordId=%s order by ip.recyclingTime", UseRecordToRecycleApplication.class.getSimpleName(),
-				InvoicePlan.class.getSimpleName(),TousseItem.class.getSimpleName(),useRecordId);
+				+ " left join %s fta on fta.id=ip.id "
+				+ " where urtra.useRecordId=%s and fta.userecord_id is null "
+				+ " union all select ip.handleDepart,ip.recyclingTime,ip.serialNumber,ti.tousseName,ti.amount,ti.tallyAmount,ti.recyclingAmount "
+				+ " from %s ip "
+				+ " join %s fta on fta.id=ip.id "
+				+ " join %s ti on ti.recyclingApplication_ID=ip.id "
+				+ " where fta.userecord_id=%s "
+				+ ") tempc order by tempc.recyclingTime", UseRecordToRecycleApplication.class.getSimpleName(),
+				InvoicePlan.class.getSimpleName(),TousseItem.class.getSimpleName(),ForeignTousseApplication.class.getSimpleName(),useRecordId,
+				InvoicePlan.class.getSimpleName(),ForeignTousseApplication.class.getSimpleName(),TousseItem.class.getSimpleName(),
+				useRecordId);
 			ResultSet rs = null;
 			try{
 				//供应室集合(用list定供应室顺序)