Index: ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jasper
===================================================================
diff -u -r19671 -r19681
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r19671 -r19681
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19671)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19681)
@@ -11068,7 +11068,7 @@
 	}
 
 	/**
-	 * 获取数据
+	 * 获取数据  清洗区工作量及不合格率月报
 	 */
 	@Override
 	public List<CrossTableBean> getwashWorkloadList(String month,String querySupplyRoom) {
@@ -18178,19 +18178,18 @@
 		String frequency = paramMap.get("frequency");
 		
 		String sql = " select ti.sterilizerName,ti.sterileFrequency,ti.tousseName,ti.locationForDisplay,"
-				+ " ti.sterileEndTime,ti.sterilizationUser,count(*) amount from tousseinstance ti ";
+				+ " ti.sterileStartTime,ti.sterilizationUser,count(*) amount from tousseinstance ti ";
 				
   		String endSql = " group by ti.sterilizerName,ti.sterileFrequency,ti.tousseName,"
-		  				+" ti.locationForDisplay,ti.sterileEndTime,ti.sterilizationUser,ti.status"
-		  				+" order by ti.sterileEndTime desc";
+		  				+" ti.locationForDisplay,ti.sterileStartTime,ti.sterilizationUser,ti.status"
+		  				+" order by ti.sterileStartTime desc";
 		if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) {
 			
 			sql += " where ti.sterileStartTime between '"
 					+ startDate+" 00:00:00'"
 					+ " and '" + endDate+" 23:59:59'"
 					+ " and ti.status <> '"+TousseInstance.STATUS_REVIEWED+"' "
 					;
-			
 			// 器械包的供应室
 			if(StringUtils.isNotBlank(querySupplyRoom)){
 				sql += " and ti.orgUnitCoding = '" + querySupplyRoom + "'";
@@ -18214,7 +18213,8 @@
 		startDate = dateQueryAdapter.dateAdapter(startDate + " 00:00:00");
 		endDate = dateQueryAdapter.dateAdapter(endDate + " 23:59:59");
 		sql = " where po.startDate  between " + startDate +  " and " + endDate 
-				+ " and po.amount = 0 ";
+				+ " and po.amount = 0 "
+				+ " and po.orgUnitCoding = '" + querySupplyRoom + "'";
 		List<SterilizationRecord> srRecords = (List<SterilizationRecord>)objectDao.findBySql(SterilizationRecord.class.getSimpleName(), sql);
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		if(CollectionUtils.isNotEmpty(srRecords)){
@@ -18227,6 +18227,7 @@
 				}
 				SterilizerQualiyBean_Child child = new SterilizerQualiyBean_Child();
 				child.setTousseAmount(0);
+				child.setSterilizationUser(sr.getSterilizationUser());
 				List<SterilizerQualiyBean_Child> clist = new ArrayList<SterilizerQualiyBean_Child>();
 				clist.add(child);
 				bean.setChildrens(clist);
@@ -18322,9 +18323,11 @@
 		List<SterilizerQualiyBean> list = new ArrayList<SterilizerQualiyBean>();
 		String startDate = paramMap.get("startDate");
 		String endDate = paramMap.get("endDate");
+		String querySupplyRoom = paramMap.get("querySupplyRoom");
 		startDate = dateQueryAdapter.dateAdapter(startDate + " 00:00:00");
 		endDate = dateQueryAdapter.dateAdapter(endDate + " 23:59:59");
-		String sql = " where po.startDate  between " + startDate +  " and " + endDate ;
+		String sql = " where po.startDate  between " + startDate +  " and " + endDate 
+					+ " and po.orgUnitCoding = '" + querySupplyRoom + "'";
 		List<SterilizationRecord> srRecords = (List<SterilizationRecord>)objectDao.findBySql(SterilizationRecord.class.getSimpleName(), sql);
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		if(CollectionUtils.isNotEmpty(srRecords)){
@@ -18423,6 +18426,7 @@
 				}finally {
 					DatabaseUtil.closeResultSetAndStatement(result);
 				}
+				msg += "\r\n";
 				index++;
 		}
 	}
Index: ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jrxml
===================================================================
diff -u -r19671 -r19681
--- ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jrxml	(.../SterilizerQualityReportTotal.jrxml)	(revision 19671)
+++ ssts-web/src/main/webapp/jasperRtp/SterilizerQualityReportTotal.jrxml	(.../SterilizerQualityReportTotal.jrxml)	(revision 19681)
@@ -212,7 +212,7 @@
 					<bottomPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+				<textElement textAlignment="Left" 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>