Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
===================================================================
diff -u -r15025 -r15045
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 15025)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 15045)
@@ -103,8 +103,7 @@
 
 		//查看是否设置了统计的器械包名
 		GoodsOption goodsOption = goodsOptionManager.getGoodsOption(GoodsOption.MODEL_TOUSSEGOODSSTOCK, AcegiHelper.getCurrentOrgUnitCode());
-		String values = goodsOption.getValue();
-		if (StringUtils.isNotBlank(values)){
+		if (goodsOption != null && StringUtils.isNotBlank(goodsOption.getValue())){
 			String[] goods = goodsOption.getValue().split(";");
 			String names = SqlBuilder.build_IN_Statement(" name ", SqlBuilder.IN, goods);
 			sqlBuilder.append(" and ").append(names);