Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r27123 -r27124
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 27123)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 27124)
@@ -2410,9 +2410,6 @@
 					if (reviewedBasket.getContainer() != null) {
 						tousseInstance.setSterilizationBasket(reviewedBasket.getContainer().getContainerName());
 					}
-				} else {
-				//不传入灭菌篮筐表示需要将该包实例的审核篮筐实例的id设置为空,但本处由于可能在装配时已关联为虚拟篮筐的篮筐实例id,所以不能下一行代码调用.since20151029SYF
-				//removeFromBasket(tousseInstance.getBarcode());
 				}
 				tousseInstanceManager.save(tousseInstance);
 				
@@ -2510,23 +2507,6 @@
 				foreignTousseApp_id = tousseInstance.getForeignTousseApp_id().longValue();
 				supplierName = td.getSupplierName();
 			}
-			
-			//根据器械包的申请单编号或回收单编号查询出所属申请部门
-			String department = null;
-			if(tousseInstance.getInvoicePlanID() != null){
-				InvoicePlan invoicePlan = 
-					(InvoicePlan)objectDao.getByProperty(InvoicePlan.class.getSimpleName(), "id", tousseInstance.getInvoicePlanID());
-				if(invoicePlan != null){
-					department = invoicePlan.getDepart();
-				}
-			}else if(tousseInstance.getRecyclingRecordId() != null){
-				RecyclingRecord recylingRecord = 
-						(RecyclingRecord)objectDao.getByProperty(RecyclingRecord.class.getSimpleName(), "id", tousseInstance.getRecyclingRecordId());
-				if(recylingRecord != null){
-					department = recylingRecord.getDepart();
-				}
-			}
-			
 			JSONObject tdJson = new JSONObject();
 			//如果配置为需要打印材料时
 			if(TousseDefinition.STR_YES.equals(td.getIsPrint()) && TousseDefinition.STR_YES.equals(td.getIsPrintMaterialForPacking())){
@@ -2709,29 +2689,6 @@
 				}
 			}
 		}
-		
-		try {
-			//由于该方法的执行需要时间,所以改用独立线程去运行
-			/*new Thread(new Runnable() {
-				@Override
-				public void run() {
-					try{
-						reviewedBasketManager.deleteEmptyBasket();
-					}catch(Exception e){
-						e.printStackTrace();
-						logger.error("审核时移除空篮筐实例失败.");
-					}
-				}
-			}).start();*/
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		try{
-			//reviewedBasketManager.deleteEmptyBasket();
-		}catch(Exception e){
-			e.printStackTrace();
-			logger.error("审核时移除空篮筐实例失败.");
-		}
 		JSONObject logjson = new JSONObject();
 		JSONUtil.addLogProperty(logjson, "inputReviewBasketBarcode", sterileBasketBarcode);
 		JSONUtil.addLogProperty(logjson, "tousseInstances", logTousseArray);