Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r33872 -r33879
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 33872)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 33879)
@@ -8385,7 +8385,7 @@
 							isFixedBarcode = true;
 						}
 						scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState = CssdUtils.getSystemSetConfigByNameBool("scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState", false);
-						if(!isFixedBarcode && scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState){
+						if(tousseInstance != null && !isFixedBarcode && scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState){
 							errorMessage = getScanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedStateErrorMessage(tousseInstance, "包外标签条码");
 							if(StringUtils.isNotBlank(errorMessage)){
 								break out;
@@ -8488,13 +8488,6 @@
 							errorMessage = String.format("标识牌%s不可使用,原因(%s) !", barcode,e.getMessage());
 							break out;
 						}
-						scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState = CssdUtils.getSystemSetConfigByNameBool("scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState", false);
-						if(scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState){
-							errorMessage = getScanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedStateErrorMessage(tousseInstance, "标识牌条码");
-							if(StringUtils.isNotBlank(errorMessage)){
-								break out;
-							}
-						}
 						Long idCardDefinitionId = idCardInstance.getIdCardDefinitionID();
 						IDCardDefinition idCardDefinition = idCardDefinitionManager.get(idCardDefinitionId);
 						//判断标识牌对应的器械包定义id是否存在,如果不存在则提示
@@ -8554,6 +8547,13 @@
 								//tousseInstance.setLocationForDisplay("新器械包标识牌");
 							}
 						} else {
+							scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState = CssdUtils.getSystemSetConfigByNameBool("scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState", false);
+							if(scanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedState){
+								errorMessage = getScanBarcodeToRecycleTousseDeliveredToDepartmentMustBeInUsedStateErrorMessage(tousseInstance, "标识牌条码");
+								if(StringUtils.isNotBlank(errorMessage)){
+									break out;
+								}
+							}
 							String recyclingErrorMsg = getRecyclingErrorMsg(idCardInstance, tousseInstance, invoicePlanId, recyclingRecordId);
 							if(StringUtils.isNotBlank(recyclingErrorMsg)){
 								errorMessage = recyclingErrorMsg;