Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r26651 -r26660
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 26651)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 26660)
@@ -6015,8 +6015,8 @@
 			sql = String.format("select rr.id,rr.recyclingTime,rr.recyclingUser,ip.operationRoom operationRoomName,ri.amount recyclingAmount from TousseItem ti inner join invoicePlan ip on ip.id=ti.recyclingApplication_ID "
 					+ " inner join ClassifiedItem ci on ci.invoicePlanID=ip.id inner join ClassifyBasket cb on ci.classifybasket_id=cb.id inner join RecyclingRecord rr on rr.recyclingApplication_id=ip.id "
 					+ " inner join RecyclingItem ri on rr.id=ri.recyclingRecord_id "
-					+ " where ri.tousseName='%s' and departCoding='%s' and isTerminated is null and cb.washStartTime is null %s", tousseName, departCode, recyDateSql);
-		}else if(TousseInstance.STATUS_DISINFECTED.equals(status)){										   
+					+ " where ri.tousseDefinitionId=ci.tousseDefinitionid and ri.tousseName='%s' and departCoding='%s' and isTerminated is null and cb.washStartTime is null %s", tousseName, departCode, recyDateSql);
+		}else if(TousseInstance.STATUS_DISINFECTED.equals(status)){
 			sql = String.format("select wr.id ,wr.startDate washStartTime,wr.endDate washEndTime,wr.disinfectIdentification,ci.amount washedAmount from ClassifiedItem ci "
 					+ " inner join TousseDefinition td on td.id=ci.tousseDefinitionID "
 					+ " inner join invoicePlan ip on ip.id=ci.invoicePlanID "
@@ -6195,7 +6195,7 @@
 				+ " inner join invoicePlan ip on ip.id=rr.recyclingApplication_id "
 				+ " inner join ClassifiedItem ci on ci.recyclingRecordId= rr.id "
 				+ " inner join ClassifyBasket cb on ci.classifybasket_id=cb.id "
-				+ " where tousseName='%s' and departCoding='%s' and cb.washStartTime is null %s ", TousseInstance.STATUS_RECYCLED, tousseName, departCode, recyDateSql);
+				+ " where ri.tousseDefinitionId=ci.tousseDefinitionid and tousseName='%s' and departCoding='%s' and cb.washStartTime is null %s ", TousseInstance.STATUS_RECYCLED, tousseName, departCode, recyDateSql);
 		//已消毒未装配的包数量(非包实例数量)
 		String disinfectedSql = String.format("select sum(ci.amount) amount,'%s' status from ClassifiedItem ci "
 				+ " inner join TousseDefinition td on td.id=ci.tousseDefinitionID inner join invoicePlan ip on ip.id=ci.invoicePlanID inner join ClassifyBasket cb on ci.classifybasket_id=cb.id "