Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r13666 -r13698
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13666)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13698)
@@ -5359,7 +5359,7 @@
 				+ "sum(t.amount)as amount from RecyclingRecord r,TousseItem t "
 				+ "where r.id=t.recyclingRecord_id and r.recyclingTime between " 
 				+ startDateTime + " and " + endDateTime
-				+ " and r.operator is not null"
+				+ " and r.operator is not null and r.operator!=''"
 				+ " and r.orgUnitCoding = '"+supplyRoom+"'"
 				+ " group by r.operator"
 				+ " union all "
@@ -5368,7 +5368,7 @@
 				+ startDateTime
 				+ " and "
 				+ endDateTime
-				+ " and w.operator is not null"
+				+ " and w.operator is not null and w.operator!=''"
 				+ " and w.orgUnitCoding = '"+supplyRoom+"'"
 				+ " group by w.operator"
 				+ " union all "
@@ -5377,7 +5377,7 @@
 				+ startDateTime
 				+ " and "
 				+ endDateTime
-				+ " and p.packer is not null"
+				+ " and p.packer is not null and p.packer!=''"
 				+ " and p.orgUnitCoding = '"+supplyRoom+"'"
 				+ " group by p.packer"
 				+ " union all "
@@ -5386,7 +5386,7 @@
 				+ startDateTime
 				+ " and "
 				+ endDateTime
-				+ " and t.reviewer is not null"
+				+ " and t.reviewer is not null and t.reviewer!=''"
 				+ " and t.status!= '已装配' "
 				+ " and t.orgUnitCoding = '"+supplyRoom+"' "
 				+ "group by t.reviewer"
@@ -5396,20 +5396,20 @@
 				+ startDateTime
 				+ " and "
 				+ endDateTime
-				+ " and s.sterilizationUser is not null"
+				+ " and s.sterilizationUser is not null and s.sterilizationUser!=''"
 				+ " and s.orgUnitCoding = '"+supplyRoom+"' "
 				+ "group by s.sterilizationUser"
 				+ " union all "
 				+ "select '发货记录',i.sender as operator,sum(t.amount) as amount from Invoice i,"
 				+ "invoiceItem t where i.id =t.invoice_id and i.sendTime between "
 				+ startDateTime + " and " + endDateTime 
-				+ " and i.sender is not null"
+				+ " and i.sender is not null and i.sender!=''"
 				+ " and i.orgUnitCoding = '"+supplyRoom+"' group by i.sender "
 				+ " union all " 
 				+ "select '核对记录',i.assistantSender as operator,sum(t.amount) as amount from Invoice i,"
 				+ "invoiceItem t where i.id =t.invoice_id and i.sendTime between "
 				+ startDateTime + " and " + endDateTime 
-				+ " and i.assistantSender is not null"
+				+ " and i.assistantSender is not null and i.assistantSender!=''"
 				+ " and i.orgUnitCoding = '"+supplyRoom+"' group by i.assistantSender "; 
 		
 		
@@ -5419,12 +5419,12 @@
 					+ "select '检查数量', p.inspector,sum(p.amount) " 
 					+ "from PackingRecord p " 
 					+ "where p.packtime between "+startDateTime+" and "+ endDateTime 
-					+ " and p.inspector is not null and p.orgunitcoding = '"+cfg.getOrgUnitCoding()+"' group by p.inspector " 
+					+ " and p.inspector is not null and p.inspector!='' and p.orgunitcoding = '"+cfg.getOrgUnitCoding()+"' group by p.inspector " 
 					+ " union all " 
 					+ "select '包装数量',p.wrapper,sum(p.amount) " 
 					+ "from PackingRecord p " 
 					+ "where p.packtime between "+startDateTime+" and "+endDateTime
-			        + " and p.wrapper is not null and p.orgunitcoding = '"+cfg.getOrgUnitCoding()+"' group by p.wrapper";;
+			        + " and p.wrapper is not null and p.wrapper!='' and p.orgunitcoding = '"+cfg.getOrgUnitCoding()+"' group by p.wrapper";;
 		}
 				
 		ResultSet rs1 = objectDao.executeSql(sql);