Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r15529 -r15580
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 15529)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 15580)
@@ -40,6 +40,7 @@
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.service.OrgUnitManager;
+import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
 import com.forgon.disinfectsystem.basedata.becleanitem.service.BeCleanItemManager;
 import com.forgon.disinfectsystem.basedatamanager.departmentgroup.service.DepartmentGroupManager;
@@ -788,6 +789,22 @@
 					}
 				} else if (barcodeDevice instanceof TousseInstance) {
 					tousseInstance = (TousseInstance) barcodeDevice;
+					//验证器械包是否属于当前科室处理
+					LoginUserData  loginUserData = AcegiHelper.getLoginUser();
+					String cssdOrgUnitCode = loginUserData.getOrgUnitCodingFromSupplyRoomConfig();
+					String cssdOrgUnitName =  loginUserData.getOrgUnitNameCodingFromSupplyRoomConfig();
+					TousseDefinition td = tousseInstance.getTousseDefinition();
+					if(td == null){
+						errorMessage = tousseInstance.getTousseName()+",包定义已不存在!";
+					}else{
+						try {
+							tousseDefinitionManager.validateCssdHandleTousses(
+									cssdOrgUnitCode, cssdOrgUnitName,
+									td.getTousseType(), td.getName());
+						} catch (Exception e) {
+							errorMessage = e.getMessage();
+						}
+					}
 				} else if (barcodeDevice instanceof User) {
 					user = (User) barcodeDevice;
 				} else if (barcodeDevice instanceof IDCardInstance) {
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r15577 -r15580
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 15577)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 15580)
@@ -2160,7 +2160,7 @@
 			if(appliedTousse == false && 
 					(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseItemVo.getTousseType())
 							|| TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseItemVo.getTousseType())
-									|| TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseItemVo.getTousseType()))){
+									|| TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseItemVo.getTousseType()))){
 				appliedTousse = true;
 			}
 			if(appliedDiposableGoods == false && 
@@ -2199,7 +2199,7 @@
 			String tousseType,String tousseName) {
 		if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseType)
 						|| TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)
-								|| TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseType)){
+								|| TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)){
 			
 			String sql = " where orgUnitCode = '" + cssdOrgUnitCode
 					+ "' and tousseName = '" + tousseName + "' ";