Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r15604 -r15701
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 15604)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 15701)
@@ -1574,14 +1574,19 @@
 					TousseInstance.STATUS_RETURNED, TousseInstance.STATUS_STERILED);
 		}
 
-
-		if (warningType
-				.equals(SystemWarningItemVO.WARNING_TYPE_DISABLED_TOUSSE)) {
-			sqlCondition += " and validUntil < " + dateQueryAdapter.dateAdapter(date);
-		} else {//即将过期
-			sqlCondition += " and validUntil > " + dateQueryAdapter.dateAdapter(date)
-					+ " and warningUntil < "
-					+ dateQueryAdapter.dateAdapter(date);
+		String dateSqlCondition = dateQueryAdapter.dateAdapter(date);
+		//已过期的器械包
+		if (SystemWarningItemVO.WARNING_TYPE_DISABLED_TOUSSE
+				.equals(warningType)) {
+			sqlCondition += " and validUntil < " + dateSqlCondition;
+		} else if (SystemWarningItemVO.WARNING_TYPE_TOUSSE
+				.equals(warningType)){//即将过期的器械包
+			sqlCondition += " and validUntil > " + dateSqlCondition + " and warningUntil < " + dateSqlCondition;
+		}else{
+			//为全部时:含已过期的器械包与即将过期的器械包
+			sqlCondition += " and (validUntil < " + dateSqlCondition;
+			sqlCondition += " or (validUntil > " + dateSqlCondition + " and warningUntil < " + dateSqlCondition + ")"
+					+ ")";
 		}
 
 		try {