Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r40491 -r40948
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 40491)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 40948)
@@ -754,7 +754,7 @@
 			String formName = StrutsParamUtils.getPraramValue("formName", "");
 			String departCoding = StrutsParamUtils.getPraramValue("departCoding", "");
 			return jasperReportManager.getFormInstanceData(startDate,endDate,departCoding,formName,requestParameters);
-		}else if(reportName.equals("SterilizationRecord")){	// 灭菌记录信息
+		}else if(reportName.equals("SterilizationRecord")){	// 灭菌记录信息 灭菌情况报表
 			return getSterilizationRecordDataSource();
 		}else if(reportName.equals("WashAndDisinfectRecord")){	// 清洗情况报表
 			String startDate = StrutsParamUtils.getPraramValue("startDate", "");
@@ -2839,7 +2839,7 @@
 			}else{
 				map.put("title", "物资收发存明细表（" + startDate + " & " + endDate + "）");
 			}
-		}else if(reportName.equals("SterilizationRecord")){	// 灭菌记录信息
+		}else if(reportName.equals("SterilizationRecord")){	// 灭菌记录信息 灭菌情况报表
 			String startTime = StrutsParamUtils.getPraramValue("startDate", "");
 			String endTime = StrutsParamUtils.getPraramValue("endDate", "");
 			map.put("title", "灭菌记录信息");
@@ -3433,14 +3433,7 @@
 			if(StringUtils.isNotBlank(sterilizerNames)
 					&& sterilizerNames.indexOf(Constants.STR_ALL) == -1){
 				Set<String> sterilizerNamesset = SqlUtils.splitStringToSet(sterilizerNames, ",");
-				if(CssdUtils.isProject("gdsy")){//广东省医有聚力康的包 没有灭菌记录
-					sql += " and ((exists (select 1 from SterilizationRecord sr join sterilizer s on s.id=sr.sterilizer_id "
-							+ " where sr.id=ti.sterilizationRecord_id "+ SqlUtils.getInStringListSql("s.name", sterilizerNamesset) +") ) or 1=1 " 
-					+ SqlUtils.get_InSql("ti.sterilizerName", sterilizerNames.split(",")) + ") ";
-				}else{
-					sql += " and (exists (select 1 from SterilizationRecord sr join sterilizer s on s.id=sr.sterilizer_id "
-							+ "and sr.id=ti.sterilizationRecord_id "+ SqlUtils.getInStringListSql("s.name", sterilizerNamesset) +") ) ";
-				}
+				sql += SqlUtils.getInStringListSql("ti.sterilizerName", sterilizerNamesset);
 			}
 			if(StringUtils.isNotBlank(frequency)){
 				sql += " and ti.sterileFrequency = '" + frequency + "'";