Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java =================================================================== diff -u -r30279 -r30285 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java (.../QualityMonitoringDefinitionAction.java) (revision 30279) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java (.../QualityMonitoringDefinitionAction.java) (revision 30285) @@ -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; - showAll = false;//暂时不查全部了 + //boolean showAll = StringUtils.isNotBlank(showAllStr) && "true".equals(showAllStr)?true:false; + //showAll = false;//暂时不查全部了 JSONArray data = qualityMonitoringDefinitionManager.loadInspectItems(spell, formType, querySupplyRoom, - responsiblePerson, isNotLimitInspect,showAll); + responsiblePerson, isNotLimitInspect,true); JSONObject result = new JSONObject(); result.put("totalCount", data.size()); result.put("data", data);