Index: ssts-web/src/main/webapp/jasperRtp/nurseWorkloadReport.jrxml
===================================================================
diff -u -r17554 -r27153
--- ssts-web/src/main/webapp/jasperRtp/nurseWorkloadReport.jrxml	(.../nurseWorkloadReport.jrxml)	(revision 17554)
+++ ssts-web/src/main/webapp/jasperRtp/nurseWorkloadReport.jrxml	(.../nurseWorkloadReport.jrxml)	(revision 27153)
@@ -1,7 +1,7 @@
 <?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="tousseWorkLoad" language="groovy" pageWidth="1980" pageHeight="842" columnWidth="1980" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5cc580bd-cd6f-4e34-8f78-a05ac8f31ce8">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="10"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
 		<box>
@@ -23,9 +23,6 @@
 	<field name="sterilizeRateStr" class="java.lang.String">
 		<fieldDescription><![CDATA[sterilizeRateStr]]></fieldDescription>
 	</field>
-	<field name="sterilizeCheckRateStr" class="java.lang.String">
-		<fieldDescription><![CDATA[sterilizeCheckRateStr]]></fieldDescription>
-	</field>
 	<field name="washQualifiedRateStr" class="java.lang.String">
 		<fieldDescription><![CDATA[washQualifiedRateStr]]></fieldDescription>
 	</field>
@@ -66,35 +63,28 @@
 				<text><![CDATA[无菌物品合格率%(分母为全院无菌物品总件数)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="460" y="0" width="280" height="50"/>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="459" y="0" width="280" height="50"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[无菌物品合格率%(分母为检查无菌物品总件数)]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="740" y="0" width="280" height="50"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12" isBold="true"/>
-				</textElement>
 				<text><![CDATA[器械清洗合格率(%)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="1020" y="0" width="280" height="50"/>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="739" y="0" width="280" height="50"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[包装不合格件数/月]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="1300" y="0" width="280" height="50"/>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="1019" y="0" width="280" height="50"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[包装合格率(%)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="1580" y="0" width="280" height="50"/>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="1299" y="0" width="280" height="50"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -119,42 +109,35 @@
 				<textFieldExpression><![CDATA[$F{sterilizeRateStr}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="460" y="0" width="280" height="55"/>
+				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="459" y="0" width="280" height="55"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{sterilizeCheckRateStr}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="740" y="0" width="280" height="55"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14"/>
-				</textElement>
 				<textFieldExpression><![CDATA[$F{washQualifiedRateStr}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="1020" y="0" width="280" height="55"/>
+				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="739" y="0" width="280" height="55"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{packingUnQualifiedAmountStr}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="1300" y="0" width="180" height="55"/>
+				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="1019" y="0" width="180" height="55"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sterilizeRateStr}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="1300" y="0" width="280" height="55"/>
+				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="1019" y="0" width="280" height="55"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{packingUnQualifiedRateStr}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="1580" y="0" width="280" height="55"/>
+				<reportElement uuid="b04f49c9-8ca9-4b0e-aa61-81feb75346f1" style="table_TD" x="1299" y="0" width="280" height="55"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
Index: ssts-web/src/main/webapp/jasperRtp/nurseWorkloadReport.jasper
===================================================================
diff -u -r17554 -r27153
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/NurseWorkloadBean.java
===================================================================
diff -u -r17493 -r27153
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/NurseWorkloadBean.java	(.../NurseWorkloadBean.java)	(revision 17493)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/NurseWorkloadBean.java	(.../NurseWorkloadBean.java)	(revision 27153)
@@ -29,8 +29,6 @@
 	
 	// 无菌物品合格率统计比例显示  分母为全院无菌物品总件数  按包算
 	private String sterilizeRateStr = "";
-	// 无菌物品合格率统计比例显示 分母为'检查无菌物品总件数'  按包算
-	private String sterilizeCheckRateStr = "";
 	// 清洗 合格率统计的比例显示
 	private String washQualifiedRateStr = "";
 	// 包装不合格件数显示 按包算 / 月
@@ -64,12 +62,6 @@
 	public void setSterilizeRateStr(String sterilizeRateStr) {
 		this.sterilizeRateStr = sterilizeRateStr;
 	}
-	public String getSterilizeCheckRateStr() {
-		return sterilizeCheckRateStr;
-	}
-	public void setSterilizeCheckRateStr(String sterilizeCheckRateStr) {
-		this.sterilizeCheckRateStr = sterilizeCheckRateStr;
-	}
 	public String getWashQualifiedRateStr() {
 		return washQualifiedRateStr;
 	}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27133 -r27153
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27133)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27153)
@@ -15130,7 +15130,6 @@
 				String packingQualifiedRateStr1 = "";
 				String wetPackRateStr1 = "";
 				String sterilizeRateStr = "";
-				String sterilizeCheckRateStr = "";
 				String washQualifiedRateStr = "";
 				String packingUnQualifiedAmountStr = "";
 				String packingUnQualifiedRateStr = "";
@@ -15222,7 +15221,6 @@
 				}
 				String rate = MathTools.divideStr(totalSterilzeAmount-totalSterilzeUQAmount,totalSterilzeAmount, 2);
 				sterilizeRateStr = sterilizeRate1 + "/" + "全院无菌物品总件数" + totalSterilzeAmount  + " = " + rate;
-				sterilizeCheckRateStr = sterilizeRate1 + "/" + "检查无菌物品总件数" + totalSterilzeAmount  + " = " + rate;
 				rate = MathTools.divideStr(totalWashAmount-totalWasnUQAmount,totalWashAmount, 2);
 				washQualifiedRateStr = washQualifiedRateStr1 + "/" + "器械清洗总件数" + totalWashAmount + " = " + rate;
 				packingUnQualifiedAmountStr = packingUnQualifiedAmountStr + " = " + totalPackingUQAmount;
@@ -15231,7 +15229,6 @@
 				rate = MathTools.divideStr(totalWetPackAmount,totalSterilzeAmount, 2);
 				wetPackRateStr = wetPackRateStr1 + "/" + "包总件数" + totalSterilzeAmount + " = " + rate; 
 				bean.setSterilizeRateStr(sterilizeRateStr);
-				bean.setSterilizeCheckRateStr(sterilizeCheckRateStr);
 				bean.setWashQualifiedRateStr(washQualifiedRateStr);
 				bean.setPackingUnQualifiedAmountStr(packingUnQualifiedAmountStr);
 				bean.setPackingUnQualifiedRateStr(packingUnQualifiedRateStr);
@@ -15251,7 +15248,7 @@
 		String monthlyStr = dateQueryAdapter.dateToVarchar2("endDate");
 		return String.format(" select %s monthstr, sum(tousseAmount) + sum(foreignTousseAmount) + sum(dressingTousseAmount)+sum(proxyTousseAmount) amount ,ou.name"
 				+ " from SterilizationRecord sr inner join OrgUnit ou on ou.orgUnitCoding=sr.orgUnitCoding "
-				+ " where  endDate %s and status='%s' group by %s ,ou.name ", monthlyStr,betweenSql,SterilizationRecord.STERILIZATION_STATUS_END,monthlyStr);
+				+ " where  endDate %s and sr.status='%s' group by %s ,ou.name ", monthlyStr,betweenSql,SterilizationRecord.STERILIZATION_STATUS_END,monthlyStr);
 	}
 	/**
 	 * 构建查询不合格总数的sql