Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r13061 -r13376
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 13061)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 13376)
@@ -1010,7 +1010,7 @@
 		if(returnGoodsItem != null){
 			List<GoodsStock> thisGoodsStockList = new ArrayList<GoodsStock>();
 			List<TousseInstance> tousseInstanceList = returnGoodsItem.getTousseInstanceList();
-			if(tousseInstanceList != null){
+			if(CollectionUtils.isNotEmpty(tousseInstanceList)){
 				//首先从数据库中查出所有的仓库
 				Set<String> warehouseIds = tousseInstanceList.stream().map((TousseInstance)->TousseInstance.getWareHouseId() + "").collect(Collectors.toSet());
 				//临床科室的仓库
@@ -1066,7 +1066,7 @@
 						}
 					}
 					try {
-						if(thisGoodsStockList != null){
+						if(CollectionUtils.isNotEmpty(thisGoodsStockList)){
 							goodsStockManager.saveOrUpdateGoodsStock(cssdGoodsStockList, GoodsStockManager.MODE_INSTOCK);
 						}
 					} catch (Exception e) {