Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r14653 -r14679
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14653)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14679)
@@ -5868,10 +5868,18 @@
 
 	public void getWorkLoad(String startDateTime, String endDateTime, List list,String supplyRoom) {
 		SupplyRoomConfig cfg = supplyRoomConfigManager.getFirstSupplyRoomConfig();
-		String sql = "select '回收记录',r.operator as operator,"
+		String sql = "select '回收记录',r.recyclingUser as recyclingUser,"
 				+ "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.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.orgUnitCoding = '"+supplyRoom+"'"
 				+ " group by r.operator"
@@ -5954,30 +5962,33 @@
 					if("回收记录".equals(record)){
 						bean.setColumnName("回收数量");
 						bean.setSequence(1);
+					}else if("清点记录".equals(record)){
+						bean.setColumnName("清点记录");
+						bean.setSequence(2);
 					}else if("清洗记录".equals(record)){
 						bean.setColumnName("清洗数量");
-						bean.setSequence(2);
+						bean.setSequence(3);
 					}else if("装配记录".equals(record)){
 						bean.setColumnName("配包数量");
-						bean.setSequence(3);
+						bean.setSequence(4);
 					}else if("审核记录".equals(record)){
 						bean.setColumnName("审核数量");
-						bean.setSequence(4);
+						bean.setSequence(5);
 					}else if("灭菌记录".equals(record)){
 						bean.setColumnName("灭菌数量");
-						bean.setSequence(5);
+						bean.setSequence(6);
 					}else if("发货记录".equals(record)){
 						bean.setColumnName("发货数量");
-						bean.setSequence(6);
+						bean.setSequence(7);
 					}else if("检查数量".equals(record)){
 						bean.setColumnName("检查数量");
-						bean.setSequence(7);
+						bean.setSequence(8);
 					}else if("包装数量".equals(record)){
 						bean.setColumnName("包装数量");
-						bean.setSequence(8);
+						bean.setSequence(9);
 					}else if("核对记录".equals(record)){
 						bean.setColumnName("核对数量");
-						bean.setSequence(9);
+						bean.setSequence(10);
 					}
 					list.add(bean);
 				}
Index: ssts-web/src/main/webapp/jasperRtp/yearWorkload.jasper
===================================================================
diff -u -r12640 -r14679
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/yearWorkload.jrxml
===================================================================
diff -u -r12640 -r14679
--- ssts-web/src/main/webapp/jasperRtp/yearWorkload.jrxml	(.../yearWorkload.jrxml)	(revision 12640)
+++ ssts-web/src/main/webapp/jasperRtp/yearWorkload.jrxml	(.../yearWorkload.jrxml)	(revision 14679)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="yearWorkload" language="groovy" pageWidth="740" pageHeight="1200" whenNoDataType="AllSectionsNoDetail" columnWidth="740" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a392ad7-968d-4c00-b979-7f467d709e77">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="yearWorkload" language="groovy" pageWidth="840" pageHeight="1200" whenNoDataType="AllSectionsNoDetail" columnWidth="740" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a392ad7-968d-4c00-b979-7f467d709e77">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -48,7 +48,7 @@
 	<title>
 		<band height="27" splitType="Stretch">
 			<textField>
-				<reportElement uuid="edf26680-ccdc-44f7-80d3-0377066e97bb" x="0" y="0" width="740" height="27"/>
+				<reportElement uuid="edf26680-ccdc-44f7-80d3-0377066e97bb" x="0" y="0" width="840" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
@@ -58,8 +58,8 @@
 	</title>
 	<summary>
 		<band height="42" splitType="Stretch">
-			<crosstab>
-				<reportElement uuid="a8823c9c-619a-4716-a06f-392d53e31cdc" x="0" y="0" width="740" height="42"/>
+			<crosstab columnBreakOffset="12">
+				<reportElement uuid="a8823c9c-619a-4716-a06f-392d53e31cdc" x="0" y="0" width="840" height="42"/>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringConfig.java
===================================================================
diff -u -r14164 -r14679
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringConfig.java	(.../QualityMonitoringConfig.java)	(revision 14164)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringConfig.java	(.../QualityMonitoringConfig.java)	(revision 14679)
@@ -120,7 +120,7 @@
 	public void setItems(List<QualityMonitoringItem> items) {
 		this.items = items;
 	}
-	@Column(length=4000)
+	@Column(length=8000)
 	public String getDepartCodes() {
 		return departCodes;
 	}