Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r17423 -r17453
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 17423)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 17453)
@@ -1713,6 +1713,15 @@
 						.getTousseInstances(objectDao)) {
 					tousseInstance.setSterilizationBasket(basket.getContainer()
 							.getContainerName());
+					
+					//如果配置为仅对回收自本科室的器械包时,且(包类型不为器械包,或不是回收本科室的器械包时)增加过滤
+					if(StringUtils.equals(SupplyRoomConfig.SECONDSUPPLYROOM_AUTOINVOICE_FROMCURRENTORG, secondSupplyRoomAutoInvoice)
+							&& (!tousseInstance.getTousseDefinition().isInsideTousse() || !StringUtils.equals(currentOrgUnitCode,tousseInstance.getDepartCoding()))){
+						//虽然不加入到二级供应室自己发货列表集合了,但还是要灭菌篮筐的属性保存进去
+						objectDao.saveOrUpdate(tousseInstance);
+						continue;
+					}
+					
 					if (tousseInstance.getTousseDefinition().isForeignTousse()
 							|| tousseInstance.getTousseDefinition().isSplit()) {
 						foreignTousseInstances.add(tousseInstance);