Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r37738 -r37801
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 37738)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 37801)
@@ -41,6 +41,7 @@
 import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
+import com.forgon.disinfectsystem.basedatamanager.sterilizer.service.SterilizerManager;
 import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
@@ -57,6 +58,7 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
+import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
 import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
@@ -115,6 +117,12 @@
 	
 	private OperationManager operationManager;
 	
+	private SterilizerManager sterilizerManager;
+	
+	public void setSterilizerManager(SterilizerManager sterilizerManager) {
+		this.sterilizerManager = sterilizerManager;
+	}
+
 	public void setOperationManager(OperationManager operationManager) {
 		this.operationManager = operationManager;
 	}
@@ -283,7 +291,13 @@
 		//灭菌炉名称
 		String sterilizerName = sqlWhereParamMap.get("sterilizerName");
 		if (StringUtils.isNotBlank(sterilizerName)) {
-			sqlBuilder.append(String.format(" AND po.sterilizerName = '%s' " ,sterilizerName));
+			//sqlBuilder.append(String.format(" AND po.sterilizerName = '%s' " ,sterilizerName));
+			Sterilizer sterilizer = sterilizerManager.getSterilizerByName(sterilizerName);
+			if(sterilizer != null){
+				sqlBuilder.append(String.format(" AND po.sterilizationRecord_id in (select sr.id from %s sr where sr.sterilizer.id = %s) ",
+						SterilizationRecord.class.getSimpleName(),
+						sterilizer.getId()));
+			}
 		}else{	
 		   	//灭菌炉分组
 			String sterilizerGroup = sqlWhereParamMap.get("sterilizerGroup");