Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
===================================================================
diff -u -r32801 -r32852
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 32801)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 32852)
@@ -453,14 +453,13 @@
 		return result;
 	}
 	@SuppressWarnings("unchecked")
-	public String getTousseDefinition(String tousseDefinitionIds){
+	public String getTousseDefinition(String tousseDefinitionIds, Boolean printBOMwhenPrintLabel){
 		if(StringTools.isNotEmpty(tousseDefinitionIds)){
 			SupplyRoomConfig  supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
 			String unit =  supplyRoomConfig == null? "" :supplyRoomConfig.getUnitName();
 			JSONArray array = new JSONArray();
-			boolean printBOMwhenPrintLabel = CssdUtils.getSystemSetConfigByNameBool("printBOMwhenPrintLabel", false);
 			List<TousseDefinition> tds = null;
-			if(printBOMwhenPrintLabel){
+			if(printBOMwhenPrintLabel !=null && printBOMwhenPrintLabel){
 				tds = objectDao.findByHql("select po from " + TousseDefinition.class.getSimpleName() + " po where po.printBOMwhenPrintLabel='是 ' and "+ SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", StringTools.parseToLongs(tousseDefinitionIds, ";")));
 			}else{
 				tds = tousseDefinitionManager.getCollection(tousseDefinitionIds, ";");