Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java
===================================================================
diff -u -r30285 -r30298
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java	(.../QualityMonitoringDefinitionAction.java)	(revision 30285)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java	(.../QualityMonitoringDefinitionAction.java)	(revision 30298)
@@ -107,12 +107,12 @@
 		String responsiblePerson = StrutsParamUtils.getPraramValue("responsiblePerson", "");
 		String isNotLimitInspect = StrutsParamUtils.getPraramValue("isNotLimitInspect", "");
 		//是否显示所有科室的监测项,默认为false 不显示所有(报表可能需要true)
-		//String showAllStr = StrutsParamUtils.getPraramValue("showAll", "");
+		String showAllStr = StrutsParamUtils.getPraramValue("showAll", "");
 		//是否显示所有科室的监测项
-		//boolean showAll = StringUtils.isNotBlank(showAllStr) && "true".equals(showAllStr)?true:false;
+		boolean showAll = StringUtils.isNotBlank(showAllStr) && "true".equals(showAllStr)?true:false;
 		//showAll = false;//暂时不查全部了
 		JSONArray data = qualityMonitoringDefinitionManager.loadInspectItems(spell, formType, querySupplyRoom,
-				responsiblePerson, isNotLimitInspect,true);
+				responsiblePerson, isNotLimitInspect,showAll);
 		JSONObject result = new JSONObject();
 		result.put("totalCount", data.size());
 		result.put("data", data);