Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r29228 -r29229
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 29228)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 29229)
@@ -1059,42 +1059,40 @@
 					
 				} 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 if(Constants.STR_NO.equals(td.getIsDisableIDCard())){
 						errorMessage = tousseInstance.getTousseName() + "未禁用标识牌,请扫描标识牌条码回收!";
+					}else if(td.isComboTousse()){
+						errorMessage = "不能回收聚合包！";
 					}else{
-						if(td.isComboTousse()){
-							errorMessage = "不能回收聚合包！";
-						}else{
-							// 北京大学肿瘤医院BJDXZLYY-5 回收时扫描包实例条码进行回收 状态为“已回收”的器械包不能回收
-							boolean defaultRecycleAmountOfComboFormIsZero = CssdUtils.getSystemSetConfigByNameBool("defaultRecycleAmountOfComboFormIsZero");
-							if (defaultRecycleAmountOfComboFormIsZero && 
-									StringUtils.equals(TousseInstance.STATUS_RECYCLED, tousseInstance.getStatus())) {
-								errorMessage = "器械包已回收！";
-							} else {
-								map.put("isDisableIDCard", td.getIsDisableIDCard());
-								try {
-									tousseDefinitionManager.validateCssdHandleTousses(
-											cssdOrgUnitCode, cssdOrgUnitName,
-											td.getTousseType(), td.getName());
-								} catch (Exception e) {
-									errorMessage = e.getMessage();
-								}
-								
-								if(StringUtils.isBlank(errorMessage)){
-									errorMessage = validateTousseType(formType,td);
-								}
-								
-								if(!tousseInstance.isRecycled()){
-									details = build(materialErrorDamageDetailManager.get(tousseInstance));
-								}
+						// 北京大学肿瘤医院BJDXZLYY-5 回收时扫描包实例条码进行回收 状态为“已回收”的器械包不能回收
+						boolean defaultRecycleAmountOfComboFormIsZero = CssdUtils.getSystemSetConfigByNameBool("defaultRecycleAmountOfComboFormIsZero");
+						if (defaultRecycleAmountOfComboFormIsZero && 
+								StringUtils.equals(TousseInstance.STATUS_RECYCLED, tousseInstance.getStatus())) {
+							errorMessage = "器械包已回收！";
+						} else {
+							//验证器械包是否属于当前科室处理
+							LoginUserData  loginUserData = AcegiHelper.getLoginUser();
+							String cssdOrgUnitCode = loginUserData.getOrgUnitCodingFromSupplyRoomConfig();
+							String cssdOrgUnitName =  loginUserData.getOrgUnitNameCodingFromSupplyRoomConfig();
+							map.put("isDisableIDCard", td.getIsDisableIDCard());
+							try {
+								tousseDefinitionManager.validateCssdHandleTousses(
+										cssdOrgUnitCode, cssdOrgUnitName,
+										td.getTousseType(), td.getName());
+							} catch (Exception e) {
+								errorMessage = e.getMessage();
 							}
+							
+							if(StringUtils.isBlank(errorMessage)){
+								errorMessage = validateTousseType(formType,td);
+							}
+							
+							if(!tousseInstance.isRecycled()){
+								details = build(materialErrorDamageDetailManager.get(tousseInstance));
+							}
 						}
 					}
 				} else if (barcodeDevice instanceof User) {