Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35395 -r35403
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35395)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35403)
@@ -6556,7 +6556,15 @@
 		String returnGoodsTousseDefinitionId = " CASE rr.type WHEN '器械包' THEN ri.tousseDefinition_id ELSE 0 END ";
 		//器械包
 		String tousseSql = null;
+		String urgentSql = "";
 		if(queryUrgent){//加急要过滤到包实例
+			if(urgentLevel.equals("无")){//单选无 只查询不加急数据
+				urgentSql = " and ti.urgentLevel_id is null ";
+			}else if(urgentLevel.contains("无")){//查询无和其他的加急
+				urgentSql = " and (ti.urgentLevel_id is null or "+ SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.urgentLevel_id", SqlUtils.splitStringToSet(urgentLevel, ",")) +" )";
+			}else{
+				urgentSql = " and " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.urgentLevel_id", SqlUtils.splitStringToSet(urgentLevel, ","));
+			}
 			String showTimeOfT = "";
 			if(showTime){
 				showTimeOfT = ",showTime ";
@@ -6604,7 +6612,7 @@
 					+ departFilterSql
 					+ tdTypeSql
 					+ tdNameFilterSql
-					+ " and " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.urgentLevel_id", SqlUtils.splitStringToSet(urgentLevel, ","))
+					+ urgentSql
 					+ " and i.settleaccountsdepart is not null "
 					+ groupBySql;
 			tousseSql += " union all "
@@ -6628,7 +6636,7 @@
 					+ departFilterSql
 					+ tdTypeSql
 					+ tdNameFilterSql
-					+ " and " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.urgentLevel_id", SqlUtils.splitStringToSet(urgentLevel, ","))
+					+ urgentSql
 					+ " and i.settleaccountsdepart is not null "
 					+ groupBySql
 					+ ") t "
@@ -6864,6 +6872,7 @@
 					+ " td on td.id=ti.tousseDefinition_id"
 					+ " where " + getHandleDeptCodeSql("rr.handleDepartCode")+" "
 					+ returnGoodsFilterSql
+					+ urgentSql
 					+ rrSettleAccountsDepartCodingSql
 					+" and "+returnGoodsItemPredicate
 					+ " group by rr.depart";