Index: ssts-web/src/main/webapp/jasperRtp/workload.jasper
===================================================================
diff -u -r17011 -r18190
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
===================================================================
diff -u -r17512 -r18190
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 17512)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 18190)
@@ -123,6 +123,9 @@
   //自定义装配后清理配包人
   cleanOperatorAfterDirectPacking : true,
   //当有丢失、报损时允许不补充材料即可装配
-  allowPackingWhenUnSupplementMaterial : true
+  allowPackingWhenUnSupplementMaterial : true,
+  //是否是加强版的“消毒供应中心工作量统计报表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是
+  strengthenStatisticalWorkload : true
   
+  
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r18094 -r18190
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 18094)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 18190)
@@ -459,7 +459,7 @@
 	hidden:SSTS_WorkLoad_Menu,
 	children:[
 	    {hidden :SSTS_YearWorkload,text:"年度消毒中心指标工作量统计",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true},
-	    {hidden :SSTS_StatisticalWorkload,text:"消毒中心员工工作统计评分报表",href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心工作人员绩效评分表" : "消毒供应中心工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_USERECORD_TOTAL,text:"使用记录录入统计报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordTotalView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_USERECORD_Item,text:"使用记录录入明细报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordItemView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_USERECORD_OperatorTotal,text:"使用记录人员汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp',hrefTarget:linkTarget,leaf:true},
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r18189 -r18190
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18189)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18190)
@@ -200,7 +200,7 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WashWorkload_main;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkQualityCollection;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoad;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.StatisticalWorkload;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoadReportBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkloadBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.returnGoodsSummary;
@@ -7905,281 +7905,278 @@
 	 * @return
 	 */
 	@Override
-	public List<YearWorkLoad> getWorkLoad(String startTime, String endTime,
-			String querySupplyRoom) {
-		
-		List<YearWorkLoad> list = new ArrayList<YearWorkLoad>();
+	public List<StatisticalWorkload> getStatisticalWorkloadData(String startTime, String endTime,
+			String querySupplyRoom, boolean isStrengthen) {
+		List<StatisticalWorkload> list = new ArrayList<StatisticalWorkload>();
 		if (StringUtils.isNotBlank(startTime)
 				&& StringUtils.isNotBlank(endTime)
 				&& StringUtils.isNotBlank(querySupplyRoom)) {
 			String startDateTime = startTime + " 00:00:00";
 			String endDateTime = endTime + " 23:59:59";
-			calculateWorkLoadByUser(startDateTime, endDateTime, list, querySupplyRoom);
-		}
-		return list;
-		
-	}
+			
+			
+			Map<String, Integer> sequenceMap = new HashMap<String, Integer>();
+			sequenceMap.put("回收数量", 1);
+			sequenceMap.put("清点数量", 2);
+			sequenceMap.put("清洗数量", 3);
+			sequenceMap.put("配包数量", 4);
+			sequenceMap.put("审核数量", 5);
+			sequenceMap.put("灭菌数量", 6);
+			sequenceMap.put("发货数量", 7);
+			sequenceMap.put("检查数量", 8);
+			sequenceMap.put("包装数量", 9);
+			sequenceMap.put("核对数量", 10);
 
-	/**
-	 * 计算消毒供应中心每个员工的工作量（私有方法仅供本类调用）
-	 * @param startDateTime	统计的开始时间
-	 * @param endDateTime	统计的结束时间
-	 * @param list	计算的结果集合
-	 * @param supplyRoom	被统计消毒供应中心的科室编码（包括一级或者二级供应中心）
-	 */
-	private void calculateWorkLoadByUser(String startDateTime, String endDateTime,
-			List<YearWorkLoad> list, String supplyRoom) {
-		
-		Map<String, Integer> sequenceMap = new HashMap<String, Integer>();
-		sequenceMap.put("回收数量", 1);
-		sequenceMap.put("清点数量", 2);
-		sequenceMap.put("清洗数量", 3);
-		sequenceMap.put("配包数量", 4);
-		sequenceMap.put("审核数量", 5);
-		sequenceMap.put("灭菌数量", 6);
-		sequenceMap.put("发货数量", 7);
-		sequenceMap.put("核对数量", 10);
-		sequenceMap.put("检查数量", 8);
-		sequenceMap.put("包装数量", 9);
+			//查询的时间段
+			String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startDateTime),dateQueryAdapter.dateAdapter(endDateTime));
+			
+			//数据库计算字符串长度的函数名
+			String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
+			
+			//回收记录 
+			String  tousseAmountSql  = String.format("select '回收数量' type,rr.recyclingUser userName,sum(ti.amount) amount from RecyclingRecord rr,RecyclingItem ti "
+						+ "where ti.recyclingRecord_id = rr.id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.recyclingUser) <> 0"
+						+ "group by rr.recyclingUser ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					
+			        tousseAmountSql += " union all ";
+					//清点记录
+			        tousseAmountSql +=  String.format("select '清点数量' type,rr.operator userName,sum(ti.amount) amount from RecyclingRecord rr,RecyclingItem ti "
+			       		+ "where ti.recyclingRecord_id = rr.id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.operator) <> 0 "
+							+ "group by rr.operator ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					
+				    tousseAmountSql += " union all ";
+					
+					tousseAmountSql += "select '清洗数量' type,t1.userName userName,sum(t1.materialCount) amount from (";
+					tousseAmountSql	+= String.format("select case when (min(cb.personInCharge) is null or min(cb.personInCharge) = '') then min(wr.operator) else min(cb.personInCharge) end userName,min(ci.tousseAmountForMaterial) materialCount "
+							+ "from WashAndDisinfectRecord wr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci "
+							+ "where cw.WashAndDisinfectRecord_ID = wr.id and cb.id = cw.ClassifyBasket_ID and ci.classifybasket_id = cb.id and ci.itemType = '材料' "
+							+ "and wr.orgUnitCoding = '%s' and wr.endDate %s and wr.washMaterialAmount <> 0  group by ci.tousseDefinitionID,ci.recyclingRecordId", querySupplyRoom,betweenSql);
+					tousseAmountSql += " union all ";
+					tousseAmountSql	+= String.format("select case when (cb.personInCharge is null or cb.personInCharge = '') then wr.operator else cb.personInCharge end userName,ci.amount materialCount "
+							+ "from WashAndDisinfectRecord wr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci "
+							+ "where cw.WashAndDisinfectRecord_ID = wr.id and cb.id = cw.ClassifyBasket_ID and ci.classifybasket_id = cb.id "
+							+ "and wr.orgUnitCoding = '%s' and ci.itemtype != '材料' and wr.endDate %s and wr.washMaterialAmount <> 0", querySupplyRoom,betweenSql);
+					tousseAmountSql += ") t1 group by t1.userName ";
+					
+					tousseAmountSql += " union all ";
 
-		//查询的时间段
-		String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startDateTime),dateQueryAdapter.dateAdapter(endDateTime));
-		
-		String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);//数据库计算字符串长度的函数名
-		
-		//回收记录 
-		String  tousseAmountSql  = String.format("select '回收数量' type,rr.recyclingUser userName,sum(ti.amount) amount from RecyclingRecord rr,RecyclingItem ti "
-					+ "where ti.recyclingRecord_id = rr.id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.recyclingUser) <> 0"
-					+ "group by rr.recyclingUser ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				
-		        tousseAmountSql += " union all ";
-				//清点记录
-		        tousseAmountSql +=  String.format("select '清点数量' type,rr.operator userName,sum(ti.amount) amount from RecyclingRecord rr,RecyclingItem ti "
-		       		+ "where ti.recyclingRecord_id = rr.id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.operator) <> 0 "
-						+ "group by rr.operator ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				
-			    tousseAmountSql += " union all ";
-				
-				tousseAmountSql += "select '清洗数量' type,t1.userName userName,sum(t1.materialCount) amount from (";
-				tousseAmountSql	+= String.format("select case when (min(cb.personInCharge) is null or min(cb.personInCharge) = '') then min(wr.operator) else min(cb.personInCharge) end userName,min(ci.tousseAmountForMaterial) materialCount "
-						+ "from WashAndDisinfectRecord wr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci "
-						+ "where cw.WashAndDisinfectRecord_ID = wr.id and cb.id = cw.ClassifyBasket_ID and ci.classifybasket_id = cb.id and ci.itemType = '材料' "
-						+ "and wr.orgUnitCoding = '%s' and wr.endDate %s and wr.washMaterialAmount <> 0  group by ci.tousseDefinitionID,ci.recyclingRecordId", supplyRoom,betweenSql);
-				tousseAmountSql += " union all ";
-				tousseAmountSql	+= String.format("select case when (cb.personInCharge is null or cb.personInCharge = '') then wr.operator else cb.personInCharge end userName,ci.amount materialCount "
-						+ "from WashAndDisinfectRecord wr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci "
-						+ "where cw.WashAndDisinfectRecord_ID = wr.id and cb.id = cw.ClassifyBasket_ID and ci.classifybasket_id = cb.id "
-						+ "and wr.orgUnitCoding = '%s' and ci.itemtype != '材料' and wr.endDate %s and wr.washMaterialAmount <> 0", supplyRoom,betweenSql);
-				tousseAmountSql += ") t1 group by t1.userName ";
-				
-				tousseAmountSql += " union all ";
-
-				//装配记录
-				tousseAmountSql += String.format("select '配包数量' type,pr.packer userName,sum(pr.amount) amount from PackingRecord pr "
-						+ "where pr.orgUnitCoding = '%s' and pr.packTime %s and pr.packer is not null and %s(pr.packer)<>0 "
-						+ "group by pr.packer ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				
-				tousseAmountSql += " union all ";
-				
-				//审核记录
-				tousseAmountSql	+= String.format("select '审核数量' type,ti.reviewer userName,count(*) amount from tousseInstance ti "
-						+ "where ti.orgUnitCoding = '%s' and ti.reviewTime %s and %s(ti.reviewer) <> 0 "
-						+ "group by ti.reviewer ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				
-				tousseAmountSql += " union all ";
-				
-				//灭菌记录
-				tousseAmountSql += "select '灭菌数量' type,temp.userName userName,sum(temp.amount) amount from(";
-					tousseAmountSql += String.format("select sr.sterilizationUser userName,count(*) amount from SterilizationRecord sr,sterilization_tousseInstance st,TousseInstance ti "
-							+ "where sr.id = st.sterilizationRecord_id and st.tousseInstance_id = ti.id "
-							+ "and sr.orgUnitCoding='%s' and sr.endDate %s and %s(sr.sterilizationUser)<>0 group by sr.sterilizationUser ",
-							supplyRoom, betweenSql, sqlLengthFunctionName);
+					//装配记录
+					tousseAmountSql += String.format("select '配包数量' type,pr.packer userName,sum(pr.amount) amount from PackingRecord pr "
+							+ "where pr.orgUnitCoding = '%s' and pr.packTime %s and pr.packer is not null and %s(pr.packer)<>0 "
+							+ "group by pr.packer ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					
 					tousseAmountSql += " union all ";
-					tousseAmountSql += String.format("select sr.sterilizationUser userName,count(*) amount from SterilizationRecord sr,sterilization_reviewed sre,ReviewedBasket rb,TousseInstance ti "
-							+ "where sr.id = sre.sterilizationRecord_id and sre.reviewedBasket_id = rb.id and rb.id = ti.reviewBasket_ID "
-							+ "and sr.orgUnitCoding='%s' and sr.endDate %s and %s(sr.sterilizationUser)<>0 group by sr.sterilizationUser ",
-							supplyRoom, betweenSql, sqlLengthFunctionName);
-				tousseAmountSql += ") temp group by temp.userName";
-						
+					
+					//审核记录
+					tousseAmountSql	+= String.format("select '审核数量' type,ti.reviewer userName,count(*) amount from tousseInstance ti "
+							+ "where ti.orgUnitCoding = '%s' and ti.reviewTime %s and %s(ti.reviewer) <> 0 "
+							+ "group by ti.reviewer ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					
+					tousseAmountSql += " union all ";
+					
+					//灭菌记录
+					tousseAmountSql += "select '灭菌数量' type,temp.userName userName,sum(temp.amount) amount from(";
+						tousseAmountSql += String.format("select sr.sterilizationUser userName,count(*) amount from SterilizationRecord sr,sterilization_tousseInstance st,TousseInstance ti "
+								+ "where sr.id = st.sterilizationRecord_id and st.tousseInstance_id = ti.id "
+								+ "and sr.orgUnitCoding='%s' and sr.endDate %s and %s(sr.sterilizationUser)<>0 group by sr.sterilizationUser ",
+								querySupplyRoom, betweenSql, sqlLengthFunctionName);
+						tousseAmountSql += " union all ";
+						tousseAmountSql += String.format("select sr.sterilizationUser userName,count(*) amount from SterilizationRecord sr,sterilization_reviewed sre,ReviewedBasket rb,TousseInstance ti "
+								+ "where sr.id = sre.sterilizationRecord_id and sre.reviewedBasket_id = rb.id and rb.id = ti.reviewBasket_ID "
+								+ "and sr.orgUnitCoding='%s' and sr.endDate %s and %s(sr.sterilizationUser)<>0 group by sr.sterilizationUser ",
+								querySupplyRoom, betweenSql, sqlLengthFunctionName);
+					tousseAmountSql += ") temp group by temp.userName";
+							
+					tousseAmountSql += " union all ";
+					
+					//发货记录
+					tousseAmountSql += String.format("select '发货数量' type,i.sender userName,sum(ii.amount) amount from Invoice i,InvoiceItem ii "
+							+ "where ii.invoice_id = i.id and i.orgUnitCoding = '%s' and i.sendTime %s and %s(i.sender)<>0 "
+						+ "group by i.sender ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					tousseAmountSql	+= " union all ";
+					
+					//核对记录
+					tousseAmountSql += String.format("select '核对数量' type,i.assistantSender userName,sum(ii.amount) amount from Invoice i, InvoiceItem ii "
+							+ "where ii.invoice_id = i.id and i.orgUnitCoding= '%s' and i.sendTime %s and %s(i.assistantSender) <> 0 "
+							+ "group by i.assistantSender ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+			
+			if(CssdUtils.isProject("zsly")){  //中山六院的项目（4.0的代码）
+				SupplyRoomConfig cfg = supplyRoomConfigManager.getFirstSupplyRoomConfig();
+				String supplyRoom_zsly = "'"+cfg.getOrgUnitCoding()+"' ";
 				tousseAmountSql += " union all ";
-				
-				//发货记录
-				tousseAmountSql += String.format("select '发货数量' type,i.sender userName,sum(ii.amount) amount from Invoice i,InvoiceItem ii "
-						+ "where ii.invoice_id = i.id and i.orgUnitCoding = '%s' and i.sendTime %s and %s(i.sender)<>0 "
-					+ "group by i.sender ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				tousseAmountSql	+= " union all ";
-				
-				//核对记录
-				tousseAmountSql += String.format("select '核对数量' type,i.assistantSender userName,sum(ii.amount) amount from Invoice i, InvoiceItem ii "
-						+ "where ii.invoice_id = i.id and i.orgUnitCoding= '%s' and i.sendTime %s and %s(i.assistantSender) <> 0 "
-						+ "group by i.assistantSender ", supplyRoom,betweenSql,sqlLengthFunctionName);
-		
-		if(CssdUtils.isProject("zsly")){  //中山六院的项目（4.0的代码）
-			SupplyRoomConfig cfg = supplyRoomConfigManager.getFirstSupplyRoomConfig();
-			String supplyRoom_zsly = "'"+cfg.getOrgUnitCoding()+"' ";
-			tousseAmountSql += " union all ";
-			//检查数量
-			tousseAmountSql += String.format("select '检查数量' type,p.inspector userName,sum(pr.amount) amount from PackingRecord pr "
-					+ "where pr.orgUnitCoding= '%s' and pr.packTime %s and %s(pr.inspector)<>0 "
-					+ "group by pr.inspector ", supplyRoom_zsly,supplyRoom_zsly,sqlLengthFunctionName);
-			//包装数量
-			tousseAmountSql	+= " union all "; 
-			tousseAmountSql	+= String.format("select '包装数量' type,pr.wrapper userName,sum(pr.amount) amount from PackingRecord pr " 
-					+ "where pr.orgUnitCoding = '%s' and pr.packTime %s and %s(pr.wrapper)<>0 "
-			        + "group by pr.wrapper ", supplyRoom_zsly,betweenSql,sqlLengthFunctionName);
-		}
-				
-		ResultSet rs = objectDao.executeSql(tousseAmountSql);
-		if (rs != null) {
-			try {
-				while (rs.next()) {
-					String type = rs.getString("type");
-					String userName = rs.getString("userName");
-					int amount = rs.getInt("amount");
-					YearWorkLoad workLoadBean = new YearWorkLoad();
-					workLoadBean.setOperator(userName);
-					workLoadBean.setAmount(amount);
-					workLoadBean.setColumnName(type);
-					workLoadBean.setSequence(sequenceMap.get(type));
-					list.add(workLoadBean);
+				//检查数量
+				tousseAmountSql += String.format("select '检查数量' type,p.inspector userName,sum(pr.amount) amount from PackingRecord pr "
+						+ "where pr.orgUnitCoding= '%s' and pr.packTime %s and %s(pr.inspector)<>0 "
+						+ "group by pr.inspector ", supplyRoom_zsly,supplyRoom_zsly,sqlLengthFunctionName);
+				//包装数量
+				tousseAmountSql	+= " union all "; 
+				tousseAmountSql	+= String.format("select '包装数量' type,pr.wrapper userName,sum(pr.amount) amount from PackingRecord pr " 
+						+ "where pr.orgUnitCoding = '%s' and pr.packTime %s and %s(pr.wrapper)<>0 "
+				        + "group by pr.wrapper ", supplyRoom_zsly,betweenSql,sqlLengthFunctionName);
+			}
+					
+			ResultSet rs = objectDao.executeSql(tousseAmountSql);
+			if (rs != null) {
+				try {
+					while (rs.next()) {
+						String type = rs.getString("type");
+						String userName = rs.getString("userName");
+						int amount = rs.getInt("amount");
+						StatisticalWorkload workLoadBean = new StatisticalWorkload();
+						workLoadBean.setOperator(userName);
+						workLoadBean.setAmount(amount);
+						workLoadBean.setColumnName(type);
+						workLoadBean.setSequence(sequenceMap.get(type));
+						list.add(workLoadBean);
+					}
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}finally {
+					DatabaseUtil.closeResultSetAndStatement(rs);
 				}
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}finally {
-				DatabaseUtil.closeResultSetAndStatement(rs);
 			}
-		}
-		
-		List<WorkScoreConfig> scoreConfigs = objectDao.findBySql(WorkScoreConfig.class.getSimpleName(), "where po.orgUnitCoding = '" + supplyRoom + "'");
-		Map<String, Integer> scoreConfigMap = new HashMap<String, Integer>();
-		if(scoreConfigs != null){
-			for (WorkScoreConfig workScoreConfig : scoreConfigs) {
-				scoreConfigMap.put(workScoreConfig.getName(), workScoreConfig.getValue());
+			
+			Map<String, Integer> scoreConfigMap = new HashMap<String, Integer>();
+			if (isStrengthen) {
+				List<WorkScoreConfig> scoreConfigs = objectDao.findBySql(WorkScoreConfig.class.getSimpleName(), "where po.orgUnitCoding = '" + querySupplyRoom + "'");
+				scoreConfigMap = new HashMap<String, Integer>();
+				if(scoreConfigs != null){
+					for (WorkScoreConfig workScoreConfig : scoreConfigs) {
+						scoreConfigMap.put(workScoreConfig.getName(), workScoreConfig.getValue());
+					}
+				}
 			}
-		}
-		
-		//回收记录 
-		String  materialAmountSql  = String.format("select '回收数量' type,rr.recyclingUser userName,sum(ti.amount * ms.count) amount from RecyclingRecord rr,RecyclingItem ti,tousseDefinition td,materialInstance ms "
-					+ "where ti.recyclingRecord_id = rr.id and ti.tousseDefinitionId = td.id and td.id = ms.tousse_id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.recyclingUser) <> 0"
-					+ "group by rr.recyclingUser ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				
-		        materialAmountSql += " union all ";
-				//清点记录
-		        materialAmountSql +=  String.format("select '清点数量' type,rr.operator userName,sum(ti.amount * ms.count) amount from RecyclingRecord rr,RecyclingItem ti,tousseDefinition td,materialInstance ms "
-		       		+ "where ti.recyclingRecord_id = rr.id and ti.tousseDefinitionId = td.id and td.id = ms.tousse_id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.operator) <> 0 "
-						+ "group by rr.operator ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				
-			    materialAmountSql += " union all ";
-				
-			    //清洗记录
-			    materialAmountSql += "select '清洗数量' type,t1.userName userName,sum(t1.materialCount) amount from (";
-			    materialAmountSql	+= String.format("select case when (cb.personInCharge is null or cb.personInCharge = '') then wr.operator else cb.personInCharge end userName,ci.amount materialCount "
-						+ "from WashAndDisinfectRecord wr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci "
-						+ "where cw.WashAndDisinfectRecord_ID = wr.id and cb.id = cw.ClassifyBasket_ID and ci.classifybasket_id = cb.id and ci.itemType = '材料' "
-						+ "and wr.orgUnitCoding = '%s' and wr.endDate %s and wr.washMaterialAmount <> 0", supplyRoom,betweenSql);
-			    materialAmountSql += " union all ";
-			    materialAmountSql	+= String.format("select case when (cb.personInCharge is null or cb.personInCharge = '') then wr.operator else cb.personInCharge end userName,(ci.amount*mi.count) materialCount "
-						+ "from WashAndDisinfectRecord wr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci,TousseDefinition td,MaterialInstance mi "
-						+ "where cw.WashAndDisinfectRecord_ID = wr.id and cb.id = cw.ClassifyBasket_ID and ci.classifybasket_id = cb.id and td.id = ci.toussedefinition_id and mi.tousse_id = td.id "
-						+ "and ci.itemType <> '材料' and wr.orgUnitCoding = '%s' and wr.endDate %s and wr.washMaterialAmount <> 0", supplyRoom,betweenSql);
-			    materialAmountSql += " union all ";
-				materialAmountSql += String.format("select wr.operator userName,wrm.amount materialCount "
-						+ "from WashAndDisinfectRecord wr, WashRecord_WashMaterial wm,WashAndDisinfectRecordMaterial wrm "
-						+ "where wm.WashAndDisinfectRecord_ID = wr.id and wrm.id = wm.WashAndDisinfectMaterial_ID "
-						+ "and wr.orgUnitCoding = '%s' and wr.endDate %s", supplyRoom , betweenSql);
-				materialAmountSql += ") t1 group by t1.userName ";
-				
-				materialAmountSql += "union all ";
+			
+			
+			//回收记录 
+			String  materialAmountSql  = String.format("select '回收数量' type,rr.recyclingUser userName,sum(ti.amount * ms.count) amount from RecyclingRecord rr,RecyclingItem ti,tousseDefinition td,materialInstance ms "
+						+ "where ti.recyclingRecord_id = rr.id and ti.tousseDefinitionId = td.id and td.id = ms.tousse_id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.recyclingUser) <> 0"
+						+ "group by rr.recyclingUser ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					
+			        materialAmountSql += " union all ";
+					//清点记录
+			        materialAmountSql +=  String.format("select '清点数量' type,rr.operator userName,sum(ti.amount * ms.count) amount from RecyclingRecord rr,RecyclingItem ti,tousseDefinition td,materialInstance ms "
+			       		+ "where ti.recyclingRecord_id = rr.id and ti.tousseDefinitionId = td.id and td.id = ms.tousse_id and rr.orgUnitCoding = '%s' and rr.recyclingTime %s and %s(rr.operator) <> 0 "
+							+ "group by rr.operator ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					
+				    materialAmountSql += " union all ";
+					
+				    //清洗记录
+				    materialAmountSql += "select '清洗数量' type,t1.userName userName,sum(t1.materialCount) amount from (";
+				    materialAmountSql	+= String.format("select case when (cb.personInCharge is null or cb.personInCharge = '') then wr.operator else cb.personInCharge end userName,ci.amount materialCount "
+							+ "from WashAndDisinfectRecord wr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci "
+							+ "where cw.WashAndDisinfectRecord_ID = wr.id and cb.id = cw.ClassifyBasket_ID and ci.classifybasket_id = cb.id and ci.itemType = '材料' "
+							+ "and wr.orgUnitCoding = '%s' and wr.endDate %s and wr.washMaterialAmount <> 0", querySupplyRoom,betweenSql);
+				    materialAmountSql += " union all ";
+				    materialAmountSql	+= String.format("select case when (cb.personInCharge is null or cb.personInCharge = '') then wr.operator else cb.personInCharge end userName,(ci.amount*mi.count) materialCount "
+							+ "from WashAndDisinfectRecord wr,ClassifyBasket_WashRecord cw,ClassifyBasket cb,ClassifiedItem ci,TousseDefinition td,MaterialInstance mi "
+							+ "where cw.WashAndDisinfectRecord_ID = wr.id and cb.id = cw.ClassifyBasket_ID and ci.classifybasket_id = cb.id and td.id = ci.toussedefinition_id and mi.tousse_id = td.id "
+							+ "and ci.itemType <> '材料' and wr.orgUnitCoding = '%s' and wr.endDate %s and wr.washMaterialAmount <> 0", querySupplyRoom,betweenSql);
+				    materialAmountSql += " union all ";
+					materialAmountSql += String.format("select wr.operator userName,wrm.amount materialCount "
+							+ "from WashAndDisinfectRecord wr, WashRecord_WashMaterial wm,WashAndDisinfectRecordMaterial wrm "
+							+ "where wm.WashAndDisinfectRecord_ID = wr.id and wrm.id = wm.WashAndDisinfectMaterial_ID "
+							+ "and wr.orgUnitCoding = '%s' and wr.endDate %s", querySupplyRoom , betweenSql);
+					materialAmountSql += ") t1 group by t1.userName ";
+					
+					materialAmountSql += "union all ";
 
-				//装配记录
-				materialAmountSql += String.format("select '配包数量' type,pr.packer userName,sum(pr.amount * ms.count) amount from PackingRecord pr,tousseDefinition td,materialInstance ms "
-						+ "where pr.tousseDefinitionId = td.id and td.id = ms.tousse_id and pr.orgUnitCoding = '%s' and pr.packTime %s and pr.packer is not null and %s(pr.packer)<>0 "
-						+ "group by pr.packer ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				
-				materialAmountSql += "union all ";
-				
-				//审核记录
-				materialAmountSql += String.format("select '审核数量' type,ti.reviewer userName,sum(ms.count) amount from tousseInstance ti,tousseDefinition td,materialInstance ms "
-						+ "where ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and ti.orgUnitCoding = '%s' and ti.reviewTime %s and ti.reviewer is not null and %s(ti.reviewer) <> 0 "
-						+ "group by ti.reviewer ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				
+					//装配记录
+					materialAmountSql += String.format("select '配包数量' type,pr.packer userName,sum(pr.amount * ms.count) amount from PackingRecord pr,tousseDefinition td,materialInstance ms "
+							+ "where pr.tousseDefinitionId = td.id and td.id = ms.tousse_id and pr.orgUnitCoding = '%s' and pr.packTime %s and pr.packer is not null and %s(pr.packer)<>0 "
+							+ "group by pr.packer ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					
+					materialAmountSql += "union all ";
+					
+					//审核记录
+					materialAmountSql += String.format("select '审核数量' type,ti.reviewer userName,sum(ms.count) amount from tousseInstance ti,tousseDefinition td,materialInstance ms "
+							+ "where ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and ti.orgUnitCoding = '%s' and ti.reviewTime %s and ti.reviewer is not null and %s(ti.reviewer) <> 0 "
+							+ "group by ti.reviewer ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					
+					materialAmountSql += " union all ";
+					
+					materialAmountSql += "select '灭菌数量' type,tmp.userName,sum(tmp.amount) from (";
+					materialAmountSql += String.format("select sr.sterilizationUser userName,sum(ms.count) amount from SterilizationRecord sr,sterilization_tousseInstance st,TousseInstance ti,tousseDefinition td,materialInstance ms "
+							+" where sr.id = st.sterilizationRecord_id and st.tousseInstance_id = ti.id and ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and sr.orgUnitCoding = '%s' and sr.endDate %s "
+							+ "and %s(sr.sterilizationUser) <> 0 group by sr.sterilizationUser ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					materialAmountSql	+= " union all ";
+					materialAmountSql += String.format("select sr.sterilizationUser userName,sum(ms.count) amount from SterilizationRecord sr,sterilization_reviewed sre,ReviewedBasket rb,TousseInstance ti,tousseDefinition td,materialInstance ms "
+							+" where sr.id = sre.sterilizationRecord_id and sre.reviewedBasket_id = rb.id and rb.id = ti.reviewBasket_ID and ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and sr.orgUnitCoding = '%s' "
+							+ "and sr.endDate %s and %s(sr.sterilizationUser) <> 0 group by sr.sterilizationUser ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					
+					materialAmountSql += ")tmp group by tmp.userName";
+					materialAmountSql += " union all ";
+					
+					materialAmountSql += "select '发货数量' type,tmp.userName,sum(tmp.amount) from (";
+					materialAmountSql += String.format("select i.sender userName,sum(ms.count) amount from Invoice i,tousseInstance ti,tousseDefinition td,materialInstance ms "
+							+ "where ti.invoice_id = i.id and ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and i.orgUnitCoding = '%s' and i.sendTime %s and %s(i.sender) <> 0 "
+						+ "group by i.sender ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					materialAmountSql += " union all ";
+					materialAmountSql += String.format("select i.sender userName,sum(ii.amount) amount from Invoice i,invoiceItem ii "
+							+ "where ii.invoice_id = i.id and i.orgUnitCoding = '%s' and ii.tousseType = '一次性物品' and i.sendTime %s and %s(i.sender) <> 0 "
+						+ "group by i.sender ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					materialAmountSql += ")tmp group by tmp.userName";
+					materialAmountSql += " union all ";
+					
+					materialAmountSql += "select '核对数量' type,tmp.userName,sum(tmp.amount) from (";
+					materialAmountSql += String.format("select i.assistantSender userName,sum(ms.count) amount from Invoice i,tousseInstance ti,tousseDefinition td,materialInstance ms "
+							+ "where ti.invoice_id = i.id and ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and i.orgUnitCoding = '%s' and i.sendTime %s and %s(i.assistantSender) <> 0 "
+						+ "group by i.assistantSender ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					materialAmountSql += " union all ";
+					materialAmountSql += String.format("select i.assistantSender userName,sum(ii.amount) amount from Invoice i,invoiceItem ii "
+							+ "where ii.invoice_id = i.id and i.orgUnitCoding = '%s' and ii.tousseType = '一次性物品' and i.sendTime %s and %s(i.assistantSender) <> 0 "
+						+ "group by i.assistantSender ", querySupplyRoom,betweenSql,sqlLengthFunctionName);
+					materialAmountSql += ")tmp group by tmp.userName";
+			
+			if(CssdUtils.isProject("zsly")){  //中山六院的项目（4.0的代码）
+				SupplyRoomConfig cfg = supplyRoomConfigManager.getFirstSupplyRoomConfig();
+				String supplyRoom_zsly = "'"+cfg.getOrgUnitCoding()+"' ";
 				materialAmountSql += " union all ";
-				
-				materialAmountSql += "select '灭菌数量' type,tmp.userName,sum(tmp.amount) from (";
-				materialAmountSql += String.format("select sr.sterilizationUser userName,sum(ms.count) amount from SterilizationRecord sr,sterilization_tousseInstance st,TousseInstance ti,tousseDefinition td,materialInstance ms "
-						+" where sr.id = st.sterilizationRecord_id and st.tousseInstance_id = ti.id and ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and sr.orgUnitCoding = '%s' and sr.endDate %s "
-						+ "and %s(sr.sterilizationUser) <> 0 group by sr.sterilizationUser ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				materialAmountSql	+= " union all ";
-				materialAmountSql += String.format("select sr.sterilizationUser userName,sum(ms.count) amount from SterilizationRecord sr,sterilization_reviewed sre,ReviewedBasket rb,TousseInstance ti,tousseDefinition td,materialInstance ms "
-						+" where sr.id = sre.sterilizationRecord_id and sre.reviewedBasket_id = rb.id and rb.id = ti.reviewBasket_ID and ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and sr.orgUnitCoding = '%s' "
-						+ "and sr.endDate %s and %s(sr.sterilizationUser) <> 0 group by sr.sterilizationUser ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				
-				materialAmountSql += ")tmp group by tmp.userName";
-				materialAmountSql += " union all ";
-				
-				materialAmountSql += "select '发货数量' type,tmp.userName,sum(tmp.amount) from (";
-				materialAmountSql += String.format("select i.sender userName,sum(ms.count) amount from Invoice i,tousseInstance ti,tousseDefinition td,materialInstance ms "
-						+ "where ti.invoice_id = i.id and ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and i.orgUnitCoding = '%s' and i.sendTime %s and %s(i.sender) <> 0 "
-					+ "group by i.sender ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				materialAmountSql += " union all ";
-				materialAmountSql += String.format("select i.sender userName,sum(ii.amount) amount from Invoice i,invoiceItem ii "
-						+ "where ii.invoice_id = i.id and i.orgUnitCoding = '%s' and ii.tousseType = '一次性物品' and i.sendTime %s and %s(i.sender) <> 0 "
-					+ "group by i.sender ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				materialAmountSql += ")tmp group by tmp.userName";
-				materialAmountSql += " union all ";
-				
-				materialAmountSql += "select '核对数量' type,tmp.userName,sum(tmp.amount) from (";
-				materialAmountSql += String.format("select i.assistantSender userName,sum(ms.count) amount from Invoice i,tousseInstance ti,tousseDefinition td,materialInstance ms "
-						+ "where ti.invoice_id = i.id and ti.tousseDefinition_id = td.id and td.id = ms.tousse_id and i.orgUnitCoding = '%s' and i.sendTime %s and %s(i.assistantSender) <> 0 "
-					+ "group by i.assistantSender ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				materialAmountSql += " union all ";
-				materialAmountSql += String.format("select i.assistantSender userName,sum(ii.amount) amount from Invoice i,invoiceItem ii "
-						+ "where ii.invoice_id = i.id and i.orgUnitCoding = '%s' and ii.tousseType = '一次性物品' and i.sendTime %s and %s(i.assistantSender) <> 0 "
-					+ "group by i.assistantSender ", supplyRoom,betweenSql,sqlLengthFunctionName);
-				materialAmountSql += ")tmp group by tmp.userName";
-		
-		if(CssdUtils.isProject("zsly")){  //中山六院的项目（4.0的代码）
-			SupplyRoomConfig cfg = supplyRoomConfigManager.getFirstSupplyRoomConfig();
-			String supplyRoom_zsly = "'"+cfg.getOrgUnitCoding()+"' ";
-			materialAmountSql += " union all ";
-			//检查数量
-			materialAmountSql += String.format("select '检查数量' type,p.inspector userName,sum(pr.amount * ms.count) amount from PackingRecord pr,tousseDefinition td,materialInstance ms "
-					+ "where pr.tousseDefinitionId = td.id and td.id = ms.tousse_id and pr.orgUnitCoding= '%s' and pr.packTime %s and pr.inspector is not null and %s(pr.inspector)<>0 "
-					+ "group by pr.inspector ", supplyRoom_zsly,supplyRoom_zsly,sqlLengthFunctionName);
-			//包装数量
-			materialAmountSql	+= "union all "; 
-			materialAmountSql	+= String.format("select '包装数量' type,pr.wrapper userName,sum(pr.amount * ms.count) amount from PackingRecord pr,tousseDefinition td,materialInstance ms " 
-					+ "where pr.tousseDefinitionId = td.id and td.id = ms.tousse_id and pr.orgUnitCoding = '%s' and pr.packTime %s and pr.wrapper is not null and %s(pr.wrapper)<>0 "
-			        + "group by pr.wrapper ", supplyRoom_zsly,betweenSql,sqlLengthFunctionName);
-		}
-				
-		ResultSet rs2 = objectDao.executeSql(materialAmountSql);
-		if (rs2 != null) {
-			try {
-				while (rs2.next()) {
-					String type = rs2.getString("type");
-					String userName = rs2.getString("userName");
-					int amount = rs2.getInt("amount");
-					YearWorkLoad workLoadBean = new YearWorkLoad();
-					workLoadBean.setOperator(userName);
-					workLoadBean.setMaterialAmount(amount);
-					workLoadBean.setColumnName(type);
-					workLoadBean.setSequence(sequenceMap.get(type));
-					Integer scoreConfig  = scoreConfigMap.get(type);
-					if(scoreConfig != null && scoreConfig > 0){
-						//评分数小数点后面舍去（3 / 2 = 1分）
-						workLoadBean.setScore(amount/scoreConfig);
+				//检查数量
+				materialAmountSql += String.format("select '检查数量' type,p.inspector userName,sum(pr.amount * ms.count) amount from PackingRecord pr,tousseDefinition td,materialInstance ms "
+						+ "where pr.tousseDefinitionId = td.id and td.id = ms.tousse_id and pr.orgUnitCoding= '%s' and pr.packTime %s and pr.inspector is not null and %s(pr.inspector)<>0 "
+						+ "group by pr.inspector ", supplyRoom_zsly,supplyRoom_zsly,sqlLengthFunctionName);
+				//包装数量
+				materialAmountSql	+= "union all "; 
+				materialAmountSql	+= String.format("select '包装数量' type,pr.wrapper userName,sum(pr.amount * ms.count) amount from PackingRecord pr,tousseDefinition td,materialInstance ms " 
+						+ "where pr.tousseDefinitionId = td.id and td.id = ms.tousse_id and pr.orgUnitCoding = '%s' and pr.packTime %s and pr.wrapper is not null and %s(pr.wrapper)<>0 "
+				        + "group by pr.wrapper ", supplyRoom_zsly,betweenSql,sqlLengthFunctionName);
+			}
+					
+			ResultSet rs2 = objectDao.executeSql(materialAmountSql);
+			if (rs2 != null) {
+				try {
+					while (rs2.next()) {
+						String type = rs2.getString("type");
+						String userName = rs2.getString("userName");
+						int amount = rs2.getInt("amount");
+						StatisticalWorkload workLoadBean = new StatisticalWorkload();
+						workLoadBean.setOperator(userName);
+						workLoadBean.setMaterialAmount(amount);
+						workLoadBean.setColumnName(type);
+						workLoadBean.setSequence(sequenceMap.get(type));
+						if (scoreConfigMap.size() > 0) {
+							Integer scoreConfig  = scoreConfigMap.get(type);
+							if(scoreConfig != null && scoreConfig > 0){
+								//评分数小数点后面舍去（3 / 2 = 1分）
+								workLoadBean.setScore(amount/scoreConfig);
+							}
+						}
+						list.add(workLoadBean);
 					}
-					list.add(workLoadBean);
+				} catch (SQLException e) {
+					e.printStackTrace();
+				}finally {
+					DatabaseUtil.closeResultSetAndStatement(rs2);
 				}
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}finally {
-				DatabaseUtil.closeResultSetAndStatement(rs2);
 			}
+			
+			
+			
 		}
+		return list;
 	}
-	
+
 	/**
 	 * 器械包运作统计报表
 	 */
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.jsp
===================================================================
diff -u -r17011 -r18190
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.jsp	(.../statisticalWorkloadView.jsp)	(revision 17011)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.jsp	(.../statisticalWorkloadView.jsp)	(revision 18190)
@@ -1,60 +1,25 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%@ include file="/common/taglibs.jsp"%>
+<%@page contentType="text/html; charset=UTF-8"%>
+<%@include file="/common/taglibs.jsp"%>
+<%@include file="/common/includeExtJsAndCss.jsp"%>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%@ include file="/common/includeExtJsAndCss.jsp"%>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
+<!-- 支持时分秒的日期时间控件引入 -->
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/ext_datefield/datetime.css"></link>
+<script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js"></script>
+<!-- 引入dwr相关的 -->
 <script type="text/javascript" src="${ctx}/js/json3.min.js" /></script>
-<script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js"></script>
-<script type="text/javascript" src="${ctx }/dwr/interface/ReportFormsCenterTableManager.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/JasperreportsTableManager.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthPickerPlugin.js"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/statisticalWorkloadView.js"></script>
+<!-- 引入自身的js文件 -->
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/setWorkScoreConfig.js"></script>
-
-<!-- 日期控件引入 -->
-<link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
-<script type="text/javascript" src="${ctx }/ext/ext_datefield/Datetime.js"></script>
-
-<script type="text/javascript">
-
-var SSTS_WashRecord_Create = true;
-<operation:authorize ifAnyGranted="SSTS_WashRecord_Create">
-SSTS_WashRecord_Create = false;
-</operation:authorize>
-var SSTS_WashRecord_Update = true;
-<operation:authorize ifAnyGranted="SSTS_WashRecord_Update">
-SSTS_WashRecord_Update = false;
-</operation:authorize>
-var SSTS_WashRecord_Delete = true;
-<operation:authorize ifAnyGranted="SSTS_WashRecord_Delete">
-SSTS_WashRecord_Delete = false;
-</operation:authorize>
-var SSTS_QualityRecord_Create = true;
-<operation:authorize ifAnyGranted="SSTS_QualityRecord_Create">
-SSTS_QualityRecord_Create = false;
-</operation:authorize>
-
-var enableEditBtn = false;
-var enableSaveBtn = false;
-var enableSaveAndNewBtn = false;
-<c:if test="${empty param.editMode}">
-enableEditBtn = true;
-</c:if>
-<c:if test="${not empty param.editMode}">
-enableSaveBtn = true;
-</c:if>
-</script>
-
-
-
-<title>消毒中心员工工作统计评分报表</title>
+<script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/statisticalWorkloadView.js"></script>
+<title>消毒供应中心工作量统计报表</title>
 </head>
-<body>
 
+<body>
 <table height="100%;" width="100%" border="0" align="center"
 	cellpadding="0" cellspacing="0">
 	<tr height="100%;">
@@ -63,11 +28,5 @@
 		</td>
 	</tr>
 </table>
-
-</strong>
-<form name="parametersFrm">
-    <input type="hidden" id="parm_s_monthSearch" name="parm_s_monthSearch" value="">
-    <input type="hidden" id="parm_s_departSearch" name="parm_s_departSearch" value="">
-</form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r18179 -r18190
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 18179)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 18190)
@@ -37,6 +37,7 @@
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
@@ -573,11 +574,16 @@
 			}else{
 				return jasperReportManager.getYearWorkloadReport(year,departCoding);
 			}
-		} else if (reportName.equals("workload")) {
+		} else if (reportName.equals("statisticalWorkload")) {
 			String startTime = StrutsParamUtils.getPraramValue("startTime", "");
 			String endTime = StrutsParamUtils.getPraramValue("endTime", "");
 			String departCoding = StrutsParamUtils.getPraramValue("departCoding", "");
-			return jasperReportManager.getWorkLoad(startTime, endTime,departCoding);
+			String isStrengthen = StrutsParamUtils.getPraramValue("isStrengthen", "");
+
+			if (StringTools.isNotBlank(startTime)
+					&& StringTools.isNotBlank(endTime)) {
+				return jasperReportManager.getStatisticalWorkloadData(startTime, endTime, departCoding, BooleanUtils.toBoolean(isStrengthen));
+			}
 		} else if (reportName.equals("tousseOperate")) {
 			String startDate = StrutsParamUtils.getPraramValue("startDate", "");
 			String endDate = StrutsParamUtils.getPraramValue("endDate", "");
@@ -1311,12 +1317,17 @@
 				year = new SimpleDateFormat("yyyy").format(new Date());
 			}
 			map.put("title", year + "年度消毒供应中心员工工作量统计报表");
-		} else if (reportName.equals("workload")) {
+		} else if (reportName.equals("statisticalWorkload")) {
 			String startTime = StrutsParamUtils.getPraramValue("startTime", "");
 			String endTime = StrutsParamUtils.getPraramValue("endTime", "");
-			map.put("title", "消毒供应中心工作量统计报表");
-			map.put("date1", startTime);
-			map.put("date2", endTime);
+			String isStrengthen = StrutsParamUtils.getPraramValue("isStrengthen", "");
+			String title = "";
+			if (BooleanUtils.toBoolean(isStrengthen)) {
+				title += String.format("消毒供应中心工作人员绩效评分表(%s~%s)", startTime, endTime);
+			} else {
+				title += String.format("消毒供应中心工作量统计报表(%s~%s)", startTime, endTime);
+			}
+			map.put("title", title);
 		} else if (reportName.equals("useRecordTotalView")) {// 使用记录录入统计报表
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
 			String endDay = StrutsParamUtils.getPraramValue("endDay", "");
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/YearWorkLoad.java
===================================================================
diff -u -r17011 -r18190
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/YearWorkLoad.java	(.../YearWorkLoad.java)	(revision 17011)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/YearWorkLoad.java	(.../StatisticalWorkload.java)	(revision 18190)
@@ -4,7 +4,7 @@
  * @author 工作量统计报表
  *
  */
-public class YearWorkLoad {
+public class StatisticalWorkload {
 	
 	public Integer sequence;
 	
@@ -77,5 +77,5 @@
 	public void setScore(Integer score) {
 		this.score = score;
 	}
-	
+
 }
Fisheye: Tag 18190 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/jasperRtp/workload.jrxml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js
===================================================================
diff -u -r17582 -r18190
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js	(.../statisticalWorkloadView.js)	(revision 17582)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js	(.../statisticalWorkloadView.js)	(revision 18190)
@@ -1,4 +1,5 @@
-var entityName = "消毒中心员工工作统计评分报表";
+var isStrengthen = sstsConfig.strengthenStatisticalWorkload;
+var entityName = isStrengthen ? "消毒供应中心工作人员绩效评分表" : "消毒供应中心工作量统计报表";
 var form;
 
 /**
@@ -7,7 +8,6 @@
  */
 var myMask;
 function reloadReport(){
-	
 	if (!form.getForm().isValid()) {
 		showResult('请正确填写表单各值');
 		return false;
@@ -16,19 +16,21 @@
 	var startTime= $Id('startTime').value;
 	var endTime = $Id('endTime').value;
 	var departCoding = Ext.getCmp('querySupplyRoom').getValue();
+	var jasperreportName = isStrengthen ? 'strengthenStatisticalWorkload.jasper' : 'statisticalWorkload.jasper';
 	
 	myMask = new Ext.LoadMask(Ext.getBody(), {
 		msg: '正在加载，请稍候！',
 		removeMask: true
 	});
 	myMask.show();
 	window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?" +
-			"jasperreportName=workload.jasper&reportName=workload" +
+			"jasperreportName=" + jasperreportName +
+			"&reportName=statisticalWorkload" +
+			"&isStrengthen=" + isStrengthen +
 			"&departCoding=" + departCoding +
 			"&startTime=" + startTime +
 			"&endTime=" + endTime,
 			'thisIframe', '_self');
-	
 }
 
 
@@ -197,6 +199,7 @@
 		},{
 			xtype : 'button',
 			text : '设置评分标准',
+			hidden : !isStrengthen,
 			minWidth : 70,
 			iconCls : 'icon_set',
 			handler : function() {
Index: ssts-web/src/main/webapp/jasperRtp/workload.jasper
===================================================================
diff -u -r17011 -r18190
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r18094 -r18190
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 18094)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 18190)
@@ -284,7 +284,7 @@
     
     <modelName modleName="��Ӧ�ҹ�����ͳ�Ʊ���">
       <operation operationId="SSTS_YearWorkload" operationName="�����������ָ�깤����ͳ��"></operation>
-      <operation operationId="SSTS_StatisticalWorkload" operationName="��������Ա������ͳ�����ֱ���"></operation>
+      <operation operationId="SSTS_StatisticalWorkload" operationName="������Ӧ���Ĺ�����ͳ�Ʊ���"></operation>
       <operation operationId="SSTS_USERECORD_TOTAL" operationName="ʹ�ü�¼¼��ͳ�Ʊ���"></operation>
       <operation operationId="SSTS_USERECORD_Item" operationName="ʹ�ü�¼¼����ϸ����"></operation>
       <operation operationId="SSTS_USERECORD_OperatorTotal" operationName="ʹ�ü�¼��Ա���ܱ���"></operation>
Index: ssts-web/src/main/webapp/jasperRtp/workload.jrxml
===================================================================
diff -u -r17011 -r18190
--- ssts-web/src/main/webapp/jasperRtp/workload.jrxml	(.../workload.jrxml)	(revision 17011)
+++ ssts-web/src/main/webapp/jasperRtp/workload.jrxml	(.../strengthenStatisticalWorkload.jrxml)	(revision 18190)
@@ -1,6 +1,6 @@
 <?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="workload" language="groovy" pageWidth="950" pageHeight="1200" whenNoDataType="AllSectionsNoDetail" columnWidth="950" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="b6209d28-6c93-40a9-beb3-71a741da002e">
-	<property name="ireport.zoom" value="1.0"/>
+<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="workload" language="groovy" pageWidth="1600" pageHeight="1200" whenNoDataType="AllSectionsNoDetail" columnWidth="1600" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="b6209d28-6c93-40a9-beb3-71a741da002e">
+	<property name="ireport.zoom" value="0.6830134553650713"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="Crosstab Data Text" hAlign="Center"/>
@@ -55,38 +55,31 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="49" splitType="Stretch">
+		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a" x="0" y="1" width="950" height="30"/>
+				<reportElement uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a" x="0" y="0" width="1600" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="05573ce3-9678-494d-8b09-30a6eff1794a" x="259" y="31" width="180" height="18"/>
-				<textElement verticalAlignment="Middle">
-					<font size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA["开始日期："+$P{date1}]]></textFieldExpression>
-			</textField>
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="06fd61a6-af28-4194-9331-afd15f839498" x="499" y="31" width="180" height="18"/>
-				<textElement verticalAlignment="Middle">
-					<font size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA["结束日期："+$P{date2}]]></textFieldExpression>
-			</textField>
 		</band>
 	</title>
 	<summary>
-		<band height="81" splitType="Stretch">
+		<band height="30" splitType="Stretch">
 			<crosstab>
-				<reportElement uuid="648fe906-6aed-4eff-8977-38ddace66c2c" x="0" y="0" width="950" height="81"/>
+				<reportElement uuid="648fe906-6aed-4eff-8977-38ddace66c2c" x="0" y="0" width="1600" height="30"/>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8" style="table_TH" x="0" y="0" width="76" height="30"/>
+							<reportElement uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8" style="table_TH" x="0" y="0" width="76" height="40" backcolor="#FFFFFF"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
 							</textElement>
@@ -106,7 +99,7 @@
 							<textField>
 								<reportElement uuid="1b98ec54-1096-461c-85a0-dd2f24dbfd6d" style="table_TD" mode="Opaque" x="0" y="0" width="76" height="25"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12"/>
+									<font size="14"/>
 								</textElement>
 								<textFieldExpression><![CDATA[$V{operator}]]></textFieldExpression>
 							</textField>
@@ -120,7 +113,7 @@
 							<staticText>
 								<reportElement uuid="518aa8fe-9fd3-4237-9852-10c18bc8e31a" x="0" y="0" width="76" height="25"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12"/>
+									<font size="14" isBold="true"/>
 								</textElement>
 								<text><![CDATA[合计]]></text>
 							</staticText>
@@ -144,7 +137,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" style="table_CH" x="0" y="0" width="59" height="30" forecolor="#000000"/>
+								<reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" style="table_CH" x="0" y="0" width="59" height="40" forecolor="#000000"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="14" isBold="true"/>
 								</textElement>
@@ -153,22 +146,71 @@
 						</cellContents>
 					</crosstabTotalColumnHeader>
 				</columnGroup>
-				<columnGroup name="columnName" height="30" totalPosition="End">
+				<columnGroup name="columnName" height="40" totalPosition="End">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
 					</bucket>
 					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
+						<cellContents backcolor="#FFFFFF" mode="Opaque">
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e" style="Crosstab Data Text" x="0" y="0" width="100" height="30"/>
+								<reportElement uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e" style="Crosstab Data Text" x="0" y="0" width="180" height="20"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
 								<textElement verticalAlignment="Middle">
 									<font size="14" isBold="true"/>
 								</textElement>
 								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
 							</textField>
+							<staticText>
+								<reportElement uuid="a33a36e9-3ed0-4a12-b2ba-5cae843bb127" style="Crosstab Data Text" x="0" y="20" width="70" height="20"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement verticalAlignment="Middle">
+									<font size="14" isBold="true"/>
+								</textElement>
+								<text><![CDATA[器械包数]]></text>
+							</staticText>
+							<staticText>
+								<reportElement uuid="db370b31-880c-44a3-a8e1-ba9570c3262f" style="Crosstab Data Text" x="70" y="20" width="70" height="20"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement verticalAlignment="Middle">
+									<font size="14" isBold="true"/>
+								</textElement>
+								<text><![CDATA[器械件数]]></text>
+							</staticText>
+							<staticText>
+								<reportElement uuid="fb8589c5-0e02-42dd-a7a4-59b371a85877" style="Crosstab Data Text" mode="Opaque" x="140" y="20" width="40" height="20" backcolor="#CCFFCC"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement verticalAlignment="Middle">
+									<font size="14" isBold="true"/>
+								</textElement>
+								<text><![CDATA[评分]]></text>
+							</staticText>
 						</cellContents>
 					</crosstabColumnHeader>
 					<crosstabTotalColumnHeader>
@@ -188,46 +230,83 @@
 				<measure name="scoreMeasure" class="java.lang.Integer" calculation="Sum">
 					<measureExpression><![CDATA[$F{score}]]></measureExpression>
 				</measure>
-				<crosstabCell width="100" height="25">
+				<crosstabCell width="180" height="25">
 					<cellContents>
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
-						<textField>
-							<reportElement uuid="1de502ee-792a-4517-ae65-33bb35ce3412" style="table_TD" x="0" y="0" width="50" height="25" backcolor="#EAEAEA"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12"/>
+						<textField pattern="" isBlankWhenNull="false">
+							<reportElement uuid="1de502ee-792a-4517-ae65-33bb35ce3412" style="table_TD" mode="Opaque" x="0" y="0" width="70" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
+							<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+								<font fontName="SansSerif" size="14" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+								<paragraph lineSpacing="Single"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a" style="table_TD" x="50" y="0" width="50" height="25"/>
+							<reportElement uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a" style="table_TD" x="70" y="0" width="70" height="25"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12"/>
+								<font size="14"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
+						<textField>
+							<reportElement uuid="c0b0fff6-222c-40bc-aa1c-b4ce2e96b542" style="Crosstab Data Text" mode="Opaque" x="140" y="0" width="40" height="25" backcolor="#CCFFCC"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
+							<textElement verticalAlignment="Middle">
+								<font size="14"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
+						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="100" height="25" rowTotalGroup="operator">
+				<crosstabCell width="180" height="25" rowTotalGroup="operator">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="e277e6b2-eb9d-409f-b558-226f59b070e9" style="table_CH" x="0" y="0" width="50" height="25"/>
+							<reportElement uuid="e277e6b2-eb9d-409f-b558-226f59b070e9" style="table_CH" x="0" y="0" width="70" height="25"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12"/>
+								<font size="14" isBold="true"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="4d5762e5-7d05-4067-a81e-93e4012380dd" style="table_CH" x="50" y="0" width="50" height="25"/>
+							<reportElement uuid="4d5762e5-7d05-4067-a81e-93e4012380dd" style="table_CH" x="70" y="0" width="70" height="25"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12"/>
+								<font size="14" isBold="true"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
+						<textField pattern="" isBlankWhenNull="false">
+							<reportElement uuid="a564467a-ca21-4baa-a759-8dbe37e3ba9f" style="table_CH" mode="Opaque" x="140" y="0" width="40" height="25" forecolor="#000000" backcolor="#BFE1FF"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+								<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+								<paragraph lineSpacing="Single"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
+						</textField>
 					</cellContents>
 				</crosstabCell>
 				<crosstabCell width="59" height="25" columnTotalGroup="sequence">
@@ -238,13 +317,13 @@
 						<textField>
 							<reportElement uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f" style="table_CH" x="0" y="0" width="59" height="25"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font size="12"/>
+								<font size="14"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="59" rowTotalGroup="operator" columnTotalGroup="sequence">
+				<crosstabCell width="59" height="25" rowTotalGroup="operator" columnTotalGroup="sequence">
 					<cellContents backcolor="#005FB3" mode="Transparent" style="table_TH">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -263,7 +342,7 @@
 						</box>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="0" rowTotalGroup="operator" columnTotalGroup="columnName">
+				<crosstabCell width="0" height="25" rowTotalGroup="operator" columnTotalGroup="columnName">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
Fisheye: Tag 18190 refers to a dead (removed) revision in file `ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/YearWorkLoad.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml	(revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml	(revision 18190)
@@ -0,0 +1,280 @@
+<?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="statisticalWorkload" language="groovy" pageWidth="1250" pageHeight="1200" columnWidth="1250" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cbf22cc0-e3ae-4485-a118-b438d682d7e3">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="Crosstab Data Text" hAlign="Center"/>
+	<parameter name="title" class="java.lang.String">
+		<defaultValueExpression><![CDATA[title]]></defaultValueExpression>
+	</parameter>
+	<field name="sequence" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sequence]]></fieldDescription>
+	</field>
+	<field name="columnName" class="java.lang.String">
+		<fieldDescription><![CDATA[columnName]]></fieldDescription>
+	</field>
+	<field name="amount" class="java.lang.Integer"/>
+	<field name="materialAmount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[materialAmount]]></fieldDescription>
+	</field>
+	<field name="score" class="java.lang.Integer">
+		<fieldDescription><![CDATA[score]]></fieldDescription>
+	</field>
+	<field name="operator" class="java.lang.String">
+		<fieldDescription><![CDATA[operator]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="30" splitType="Stretch">
+			<textField>
+				<reportElement uuid="8a494fab-981d-4237-9e12-32835b7fa569" x="0" y="0" width="1250" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+		</band>
+	</title>
+	<summary>
+		<band height="30" splitType="Stretch">
+			<crosstab>
+				<reportElement uuid="bbefa993-f197-47ce-bf52-186e824d3ebc" x="0" y="0" width="1250" height="30"/>
+				<crosstabHeaderCell>
+					<cellContents>
+						<staticText>
+							<reportElement uuid="9aa33780-d8b1-4388-aa2d-ca55c29979f1" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="70" height="55" forecolor="#000000" backcolor="#FFFFFF"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
+							<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+								<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+								<paragraph lineSpacing="Single"/>
+							</textElement>
+							<text><![CDATA[姓名]]></text>
+						</staticText>
+					</cellContents>
+				</crosstabHeaderCell>
+				<rowGroup name="operator" width="70" totalPosition="End">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{operator}]]></bucketExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Opaque">
+							<textField pattern="" isBlankWhenNull="false">
+								<reportElement uuid="18aa4f8a-a19b-4555-8dfe-88e045561c72" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="70" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+									<font fontName="SansSerif" size="14" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+									<paragraph lineSpacing="Single"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{operator}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents backcolor="#FFFFFF" mode="Opaque">
+							<staticText>
+								<reportElement uuid="c3247cff-8f4a-40e4-bbd2-01972f0018bd" x="0" y="0" width="70" height="30"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="14" isBold="true"/>
+								</textElement>
+								<text><![CDATA[合计]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<columnGroup name="sequence" height="0">
+					<bucket class="java.lang.Integer">
+						<bucketExpression><![CDATA[$F{sequence}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#F0F8FF" mode="Opaque"/>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<columnGroup name="columnName" height="55">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
+					</bucket>
+					<crosstabColumnHeader>
+						<cellContents backcolor="#FFFFFF" mode="Opaque">
+							<textField pattern="" isBlankWhenNull="false">
+								<reportElement uuid="d01d2df8-4930-4455-b890-b9960056d2a5" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="140" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+									<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+									<paragraph lineSpacing="Single"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
+							</textField>
+							<staticText>
+								<reportElement uuid="953e5c2e-da0c-4657-9059-0673ebe92e42" style="Crosstab Data Text" x="0" y="30" width="70" height="25"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement verticalAlignment="Middle">
+									<font size="14" isBold="true"/>
+								</textElement>
+								<text><![CDATA[器械包数]]></text>
+							</staticText>
+							<staticText>
+								<reportElement uuid="8c0a00c9-b16f-41d1-bf23-255c4d4028f5" style="Crosstab Data Text" mode="Opaque" x="70" y="30" width="70" height="25" backcolor="#CCFFCC"/>
+								<box>
+									<pen lineWidth="1.0"/>
+									<topPen lineWidth="1.0"/>
+									<leftPen lineWidth="1.0"/>
+									<bottomPen lineWidth="1.0"/>
+									<rightPen lineWidth="1.0"/>
+								</box>
+								<textElement verticalAlignment="Middle">
+									<font size="14" isBold="true"/>
+								</textElement>
+								<text><![CDATA[器械件数]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabColumnHeader>
+					<crosstabTotalColumnHeader>
+						<cellContents/>
+					</crosstabTotalColumnHeader>
+				</columnGroup>
+				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
+				</measure>
+				<measure name="materialAmountMeasure" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{materialAmount}]]></measureExpression>
+				</measure>
+				<crosstabCell width="140" height="30">
+					<cellContents>
+						<textField>
+							<reportElement uuid="04ec2f5b-0dfc-4109-8616-6c09675dfa8c" style="Crosstab Data Text" x="0" y="0" width="70" height="30"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
+							<textElement verticalAlignment="Middle">
+								<font size="14"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
+						</textField>
+						<textField>
+							<reportElement uuid="08f99324-322c-4918-a578-b6dcc1a91123" style="Crosstab Data Text" mode="Opaque" x="70" y="0" width="70" height="30" backcolor="#CCFFCC"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
+							<textElement verticalAlignment="Middle">
+								<font size="14"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="140" height="31" rowTotalGroup="operator">
+					<cellContents backcolor="#FFFFFF" mode="Opaque">
+						<textField>
+							<reportElement uuid="2721048b-46bc-4214-929a-12b1bfc4255d" style="Crosstab Data Text" x="0" y="0" width="70" height="30"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
+							<textElement verticalAlignment="Middle">
+								<font size="14" isBold="true"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
+						</textField>
+						<textField>
+							<reportElement uuid="08f99324-322c-4918-a578-b6dcc1a91123" style="Crosstab Data Text" mode="Opaque" x="70" y="0" width="70" height="30" backcolor="#CCFFCC"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
+							<textElement verticalAlignment="Middle">
+								<font size="14" isBold="true"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="50" columnTotalGroup="sequence">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<textField>
+							<reportElement uuid="b1fe81ff-ce6e-40c9-a39e-50465ad08fbd" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="operator" columnTotalGroup="sequence">
+					<cellContents backcolor="#005FB3" mode="Opaque">
+						<textField>
+							<reportElement uuid="7dda8e68-a3e7-41d7-b367-ae8fc9e80b7f" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="50" columnTotalGroup="columnName">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<textField>
+							<reportElement uuid="0454d3f6-00e9-4788-ae4a-09c4ac05e96a" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="operator" columnTotalGroup="columnName">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<textField>
+							<reportElement uuid="62e397c1-5e67-4374-9d76-da3db87b2ceb" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
+							<textElement/>
+							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+			</crosstab>
+		</band>
+	</summary>
+</jasperReport>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r18179 -r18190
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 18179)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 18190)
@@ -65,7 +65,7 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WashWorkload_main;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkQualityCollection;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoad;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.StatisticalWorkload;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoadReportBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.FormInstanceVo;
 import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking;
@@ -81,12 +81,14 @@
 
 	/**
 	 * 获取“消毒供应中心工作量统计报表”的数据
-	 * @param startTime	统计的开始时间（精确到天如：2017-01-01）
-	 * @param endTime	统计的结束时间（精确到天如：2017-01-01）
+	 * @param startTime			统计的开始时间（精确到天如：2017-01-01）
+	 * @param endTime			统计的结束时间（精确到天如：2017-01-01）
 	 * @param querySupplyRoom	被统计消毒供应中心的科室编码（包括一级或者二级供应中心）
+	 * @param isStrengthen		是否是加强版的“消毒供应中心工作量统计报表”（即：增加了评分功能）
 	 * @return
 	 */
-	public List<YearWorkLoad> getWorkLoad(String startTime, String endTime, String querySupplyRoom);
+	public List<StatisticalWorkload> getStatisticalWorkloadData(String startTime, String endTime,
+			String querySupplyRoom, boolean isStrengthen);
 
 	public List getYearWorkloadReport(String year, String querySupplyRoom);
 	/**