Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r14679 -r14687
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14679)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14687)
@@ -5872,15 +5872,17 @@
 				+ "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.recyclingUser is not null and r.recyclingUser!=''"
+				+ " and r.recyclingUser is not null"
+				+ (dbConnection.isOracle() ? "" : " and r.recyclingUser!=''")  //（陈家儒改）
 				+ " and r.orgUnitCoding = '"+supplyRoom+"'"
 				+ " group by r.recyclingUser"
 				+ " union all "
 				+ "select '清点记录',r.operator as operator,"
 				+ "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!=''"
+				+ " and r.operator is not null"
+				+ (dbConnection.isOracle() ? "" : " and r.operator!=''")  //（陈家儒改）
 				+ " and r.orgUnitCoding = '"+supplyRoom+"'"
 				+ " group by r.operator"
 				+ " union all "
@@ -5889,7 +5891,8 @@
 				+ startDateTime
 				+ " and "
 				+ endDateTime
-				+ " and w.operator is not null and w.operator!=''"
+				+ " and w.operator is not null"
+				+ (dbConnection.isOracle() ? "" : " and w.operator!=''")  //（陈家儒改）
 				+ " and w.orgUnitCoding = '"+supplyRoom+"'"
 				+ " group by w.operator"
 				+ " union all "
@@ -5898,7 +5901,8 @@
 				+ startDateTime
 				+ " and "
 				+ endDateTime
-				+ " and p.packer is not null and p.packer!=''"
+				+ " and p.packer is not null"
+				+ (dbConnection.isOracle() ? "" : " and p.packer!=''")  //（陈家儒改）
 				+ " and p.orgUnitCoding = '"+supplyRoom+"'"
 				+ " group by p.packer"
 				+ " union all "
@@ -5907,7 +5911,8 @@
 				+ startDateTime
 				+ " and "
 				+ endDateTime
-				+ " and t.reviewer is not null and t.reviewer!=''"
+				+ " and t.reviewer is not null"
+				+ (dbConnection.isOracle() ? "" : " and t.reviewer!=''")  //（陈家儒改）
 				+ " and t.status!= '已装配' "
 				+ " and t.orgUnitCoding = '"+supplyRoom+"' "
 				+ "group by t.reviewer"
@@ -5917,20 +5922,23 @@
 				+ startDateTime
 				+ " and "
 				+ endDateTime
-				+ " and s.sterilizationUser is not null and s.sterilizationUser!=''"
+				+ " and s.sterilizationUser is not null"
+				+ (dbConnection.isOracle() ? "" : " 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!=''"
+				+ " and i.sender is not null"
+				+ (dbConnection.isOracle() ? "" : " 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!=''"
+				+ " and i.assistantSender is not null"
+				+ (dbConnection.isOracle() ? "" : " and i.assistantSender!=''")  //（陈家儒改）
 				+ " and i.orgUnitCoding = '"+supplyRoom+"' group by i.assistantSender ";