Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35879 -r35880
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35879)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35880)
@@ -4177,71 +4177,6 @@
 		}
 	}
 
-
-
-
-	
-	
-
-
-	
-	
-	
-	private String buildQuerySQL(String startDate, String endDate,
-			String querySupplyRoom, String formName, String materialName,
-			String tousseName, String monitoringType) {
-		String sql = " where po.dateTime between "
-				+ dateQueryAdapter.dateAdapter(startDate+" 00:00:00")
-				+ " and " + ""
-				+ dateQueryAdapter.dateAdapter(endDate+" 23:59:59")
-				+ " and po.formDefinition.formType = '" + monitoringType
-				+ "' and po.formDefinition.formName = '" + formName + "'"
-				+ " and po.orgUnitCoding = '" + querySupplyRoom + "'";
-		String materialSql = "";
-		String tousseSql = "";
-		if( StringUtils.isNotBlank(materialName)){
-			// 如果字符串中有"[",进行转译
-			if(materialName.contains("[")){
-				int index = materialName.indexOf("[");
-				materialName = materialName.substring(0, index) + "\\" + materialName.substring(index, materialName.length());
-				materialSql = " po.material like '%" + materialName + "%'" + " escape '\\' ";
-			}else{
-				materialSql = " po.material like '%" + materialName + "%'";
-			}
-		}
-		if( StringUtils.isNotBlank(tousseName)){
-			// 如果字符串中有"[",进行转译
-			if(tousseName.contains("[")){
-				int index = tousseName.indexOf("[");
-				tousseName = tousseName.substring(0, index) + "\\" + tousseName.substring(index, tousseName.length());
-				tousseSql = " po.tousseName like '%" + tousseName + "%'" + " escape '\\' ";
-			}else{
-				tousseSql = " po.tousseName like '%" + tousseName + "%'";
-			}
-		}
-		// 如果都有材料和器械包的名字，用or条件
-		String tsql = "";
-		if(StringUtils.isNotBlank(materialSql) && StringUtils.isNotBlank(tousseSql)){
-			tsql = " and ( " + materialSql + " or " + tousseSql + "  ) ";
-		}else if(StringUtils.isNotBlank(materialSql)){
-			tsql = " and " + materialSql;
-		}else if(StringUtils.isNotBlank(tousseSql)){
-			tsql = " and " + tousseSql;
-		}
-		sql += tsql;
-		// 根据材料名称排序
-		sql += " order by " + dateQueryAdapter.dateConverAdapter("po.dateTime","yyyy-MM-dd")+",po.tousseName,po.material";
-		return sql;
-	}
-
-
-	
-
-	
-	
-	
-	
-
 	/**
 	 * 获取回收器械材料明细
 	 */