Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r29445 -r29446
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 29445)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 29446)
@@ -7923,7 +7923,7 @@
 								+ ") tl group by tl.userName ");
 						
 					}
-			Set<String> userNameSet = new HashSet<String>();		
+			Set<String> readedNames = new HashSet<String>();		
 			ResultSet rs = objectDao.executeSql(tousseAmountSql);
 			if (rs != null) {
 				try {
@@ -7935,9 +7935,9 @@
 						workLoadBean.setOperator(userName);
 						workLoadBean.setAmount(amount);
 						workLoadBean.setColumnName(type);
-						if(disposableGoodsMap.containsKey(userName)){
+						if(disposableGoodsMap.containsKey(userName) && !readedNames.contains(userName)){
+							readedNames.add(userName);
 							workLoadBean.setDisposableGoodAmount(disposableGoodsMap.get(userName));
-							disposableGoodsMap.remove(userName);
 						}
 						workLoadBean.setSequence(sequenceMap.get(type));
 						list.add(workLoadBean);
@@ -7948,7 +7948,19 @@
 					DatabaseUtil.closeResultSetAndStatement(rs);
 				}
 			}
-			
+			if(MapUtils.isNotEmpty(disposableGoodsMap)){
+				for (String userName : disposableGoodsMap.keySet()) {
+					if(readedNames.contains(userName)){
+						continue;
+					}
+					StatisticalWorkload workLoadBean = new StatisticalWorkload();
+					workLoadBean.setOperator(userName);
+					workLoadBean.setColumnName("发货数量");
+					workLoadBean.setSequence(sequenceMap.get("发货数量"));
+					workLoadBean.setDisposableGoodAmount(disposableGoodsMap.get(userName));
+					list.add(workLoadBean);
+				}
+			}
 			Map<String, Integer> scoreConfigMap = new HashMap<String, Integer>();
 			if (isStrengthen) {
 				List<WorkScoreConfig> scoreConfigs = objectDao.findBySql(WorkScoreConfig.class.getSimpleName(), "where po.orgUnitCoding = '" + querySupplyRoom + "'");
@@ -8065,10 +8077,6 @@
 						workLoadBean.setMaterialAmount(amount);
 						workLoadBean.setColumnName(type);
 						workLoadBean.setSequence(sequenceMap.get(type));
-						if(disposableGoodsMap.containsKey(userName)){
-							workLoadBean.setDisposableGoodAmount(disposableGoodsMap.get(userName));
-							disposableGoodsMap.remove(userName);
-						}
 						if (scoreConfigMap.size() > 0) {
 							Integer scoreConfig  = scoreConfigMap.get(type);
 							if(scoreConfig != null && scoreConfig > 0){
@@ -8083,20 +8091,7 @@
 				}finally {
 					DatabaseUtil.closeResultSetAndStatement(rs2);
 				}
-			}
-			if(MapUtils.isNotEmpty(disposableGoodsMap)){
-				StatisticalWorkload workLoadBean = new StatisticalWorkload();
-				Set<String> readed = new HashSet<String>();
-				for (String userName : disposableGoodsMap.keySet()) {
-					if(readed.contains(userName)){
-						continue;
-					}
-					readed.add(userName);
-					workLoadBean.setOperator(userName);
-					workLoadBean.setDisposableGoodAmount(disposableGoodsMap.get(userName));
-					list.add(workLoadBean);
-				}
-			}
+			}			
 		}
 		return list;