Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r28019 -r28030
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 28019)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 28030)
@@ -13371,6 +13371,9 @@
 		String endDate = StrutsParamUtils.getPraramValue("endDate", "");
 		
 		String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", "");
+		if(querySupplyRoom.contains("全部")){
+			querySupplyRoom = "";
+		}
 		String formName = StrutsParamUtils.getPraramValue("formName", "");
 		String materialName = StrutsParamUtils.getPraramValue("materialName", "");
 		String tousseName = StrutsParamUtils.getPraramValue("tousseName", "");
@@ -13544,15 +13547,6 @@
 					questionName = list.get(0).getQuestionName();
 				}
 				if (totalAmount > 0 || list.size() > 0) {
-					MonitoringItemBean bean = new MonitoringItemBean();
-					bean.setGoodsName("");
-					bean.setDateTime("汇总");
-					bean.setOrderNumber(orderNumber);
-					bean.setOption(option);
-					bean.setQuestionName(questionName);
-					bean.setAmount(totalAmount);
-					bean.setPositionMsg("");
-					list.add(bean);
 					String amoutSql = String.format(" select fdi.name fdiName,fdio.value,fdi.orderNumber,count(*) amount "
 							+ "from %s qmi join FormInstance fi on qmi.id=fi.id "
 							+ "join %s fd on fi.formDefinition_id=fd.id "
@@ -13604,6 +13598,16 @@
 								entryBeam.setPositionMsg("");
 								list.add(entryBeam);
 							}
+						}else{
+							MonitoringItemBean bean = new MonitoringItemBean();
+							bean.setGoodsName("");
+							bean.setDateTime("汇总");
+							bean.setOrderNumber(orderNumber);
+							bean.setOption(option);
+							bean.setQuestionName(questionName);
+							bean.setAmount(totalAmount);
+							bean.setPositionMsg("");
+							list.add(bean);
 						}
 					} catch (SQLException e) {
 						e.printStackTrace();
@@ -15209,7 +15213,7 @@
 				+ dateQueryAdapter.dateAdapter(endDate+" 23:59:59")
 				+ " and qmi.type = '" + monitoringType
 				+ "' and qmi.name = '" + formName + "'"
-				+ " and fi.orgUnitCoding = '" + querySupplyRoom + "'";
+				+ SqlUtils.get_InSql_Extra("fi.orgUnitCoding", querySupplyRoom);
 		return sql;
 	}