Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManager.java
===================================================================
diff -u -r16585 -r17800
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManager.java	(.../TousseGroupManager.java)	(revision 16585)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManager.java	(.../TousseGroupManager.java)	(revision 17800)
@@ -23,4 +23,10 @@
 	 * @return
 	 */
 	List<Map<String, Object>> loadAllTousseGroupStore();
+	/**
+	 * 根据名称获取器械包分组
+	 * @param name	器械包分组的名称
+	 * @return
+	 */
+	public TousseGroup getTousseGroupByName(String name);
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManagerImpl.java
===================================================================
diff -u -r16587 -r17800
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManagerImpl.java	(.../TousseGroupManagerImpl.java)	(revision 16587)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManagerImpl.java	(.../TousseGroupManagerImpl.java)	(revision 17800)
@@ -75,4 +75,10 @@
 		return groupList;
 	}
 
+	@Override
+	public TousseGroup getTousseGroupByName(String name) {
+		String hql = String.format("where po.tousseGroupName='%s'", name);
+		return (TousseGroup) objectDao.getBySql(TousseGroup.class.getSimpleName(), hql);
+	}
+
 }
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r17720 -r17800
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 17720)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 17800)
@@ -610,14 +610,16 @@
 				String description = "灭菌完成废弃器械包,器械包名称 ：" + tousseInstance.getTousseName() + " 条码 ：" + tousseInstance.getBarcode();
 				appLogManager.saveLog(AcegiHelper.getLoginUser(), "灭菌管理", "修改", description);
 			}else{
-				tousseInstance.setStatus(TousseInstance.STATUS_STERILED);
-				//只有当所属聚合包实例的id属性为空(即聚合包实例及不属于任何聚合包实例内的普通器械包实例)时才计算库存,比如聚合包内普通器械包不计算到库存中
-				if(tousseInstance.getComboTousseInstanceId() == null){
-					// 添加库存
-//					GoodsStock goodsStock = TousseInstanceUtils.newGoodsStock(tousseInstance,defaultWareHouse);
-//					goodsStockList.add(goodsStock);
-					goodsStockManager.addToList(goodsStockList, tousseInstance, defaultWareHouse);
-					tousseInstanceManager.setToWarehouse(tousseInstance, defaultWareHouse);
+				if (!TousseInstance.STATUS_DISCARD.equals(tousseInstance.getStatus())) {  //注意：如果是已经被废弃的器械包，就不能再把他的状态修改成“已灭菌”了
+					tousseInstance.setStatus(TousseInstance.STATUS_STERILED);
+					//只有当所属聚合包实例的id属性为空(即聚合包实例及不属于任何聚合包实例内的普通器械包实例)时才计算库存,比如聚合包内普通器械包不计算到库存中
+					if(tousseInstance.getComboTousseInstanceId() == null){
+						// 添加库存
+//						GoodsStock goodsStock = TousseInstanceUtils.newGoodsStock(tousseInstance,defaultWareHouse);
+//						goodsStockList.add(goodsStock);
+						goodsStockManager.addToList(goodsStockList, tousseInstance, defaultWareHouse);
+						tousseInstanceManager.setToWarehouse(tousseInstance, defaultWareHouse);
+					}
 				}
 			}
 			tousseInstanceManager.saveOrUpdate(tousseInstance);