Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17841 -r17844
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17841)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17844)
@@ -7612,6 +7612,7 @@
 					DatabaseUtil.closeResultSetAndStatement(rs);
 				}
 			}
+			
 			String columnName1 = "处理器械总件数";
 			YearWorkloadBean bean = new YearWorkloadBean(i,month, 1, columnName1, amount);
 			list.add(bean);
@@ -7620,6 +7621,34 @@
 			YearWorkloadBean bean2 = new YearWorkloadBean(i,month, 2, columnName2, amount2);
 			list.add(bean2);
 			
+			String sterilizaSql = " select sum(sr.amount),sum(sr.foreignTousseAmount) "  
+					+ " from SterilizationRecord sr where sr.status = '"+ SterilizationRecord.STERILIZATION_STATUS_END +"' " 
+					+ " and sr.orgUnitCoding = '"+querySupplyRoom+"'"
+					+ " and sr.endDate between " + startDay +" and "+endDay;
+			ResultSet rs1 = objectDao.executeSql(sterilizaSql);
+			Integer sterilizaAmount = 0;
+			Integer sterilizaForeignAmount = 0;
+			if (rs1 != null) {
+				try {
+					while (rs1.next()) {
+						sterilizaAmount = rs1.getInt(1);
+						sterilizaForeignAmount = rs1.getInt(2);
+					}
+				} catch (SQLException e) {
+					e.printStackTrace();
+				} finally {
+					DatabaseUtil.closeResultSetAndStatement(rs1);
+				}
+			}
+			
+			String columnName3 = "灭菌无菌包数";
+			YearWorkloadBean bean3 = new YearWorkloadBean(i,month, 3, columnName3, sterilizaAmount);
+			list.add(bean3);
+			
+			String columnName4 = "灭菌外来手术器械包数";
+			YearWorkloadBean bean4 = new YearWorkloadBean(i,month, 4, columnName4, sterilizaForeignAmount);
+			list.add(bean4);
+			
 			if(groupList.size() > 0){
 				for (String ownGroup : groupList) {
 					String sql3 = "select count(*) from SterilizationRecord sr,Sterilizer s where "
@@ -7628,21 +7657,21 @@
 							+ " and sr.orgUnitCoding = '"+querySupplyRoom+"'"
 							+ " and s.ownGroup = '" + ownGroup + "'";
 					ResultSet rs3 = objectDao.executeSql(sql3);
-					String columnName3 = "灭菌器使用炉次 (" + ownGroup + ")";
-					Integer amount3 = 0;
+					String columnName5 = "灭菌器使用炉次 (" + ownGroup + ")";
+					Integer amount5 = 0;
 					if (rs3 != null) {
 						try {
 							while (rs3.next()) {
-								amount3 = rs3.getInt(1);
+								amount5 = rs3.getInt(1);
 							}
 						} catch (SQLException e) {
 							e.printStackTrace();
 						}finally {
 							DatabaseUtil.closeResultSetAndStatement(rs3);
 						}
 					}
-					YearWorkloadBean bean3 = new YearWorkloadBean(i,month, 3, columnName3, amount3);
-					list.add(bean3);
+					YearWorkloadBean bean5 = new YearWorkloadBean(i,month, 5, columnName5, amount5);
+					list.add(bean5);
 				}
 			}
 			
@@ -7651,11 +7680,11 @@
 					+ " and t.invoice_id = i.id" + " and i.orgUnitCoding = '"+querySupplyRoom+"'";
 			
 			ResultSet rs4 = objectDao.executeSql(sql4);
-			Integer amount4 = 0;
+			Integer amount6 = 0;
 			if (rs4 != null) {
 				try {
 					while (rs4.next()) {
-						amount4 = rs4.getInt(1);
+						amount6 = rs4.getInt(1);
 					}
 				} catch (SQLException e) {
 					e.printStackTrace();
@@ -7664,9 +7693,9 @@
 				}
 			}
 			
-			String columnName4 = "器械包发放数量";
-			YearWorkloadBean bean4 = new YearWorkloadBean(i,month, 4, columnName4, amount4);
-			list.add(bean4);
+			String columnName6 = "器械包发放数量";
+			YearWorkloadBean bean6 = new YearWorkloadBean(i,month, 6, columnName6, amount6);
+			list.add(bean6);
 		}
 		return list;
 	}