Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCount.jrxml
===================================================================
diff -u -r33805 -r33832
--- ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCount.jrxml	(.../sterilizingStoveUseCount.jrxml)	(revision 33805)
+++ ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCount.jrxml	(.../sterilizingStoveUseCount.jrxml)	(revision 33832)
@@ -29,6 +29,7 @@
 		<defaultValueExpression><![CDATA["C:\\workspace\\sterile\\WebContent\\jasperRtp\\"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="unqualifiedColumnName" class="java.lang.String"/>
+	<parameter name="qualifiedColumnName" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -54,20 +55,6 @@
 	<columnHeader>
 		<band height="38" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249" style="table_TH" mode="Opaque" x="305" y="0" width="125" height="38"/>
-				<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>
-			<staticText>
 				<reportElement uuid="dc8e2752-f0fc-41a1-a7d0-a2e197e69249" style="table_TH" mode="Opaque" x="133" y="0" width="172" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
@@ -123,6 +110,20 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$P{unqualifiedColumnName}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="3250dd3b-9a6d-45bf-8c16-a2cddfd13ff2" mode="Opaque" x="305" y="0" width="125" height="38" backcolor="#F0F8FF"/>
+				<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>
+				<textFieldExpression><![CDATA[$P{qualifiedColumnName}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r33805 -r33832
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 33805)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 33832)
@@ -1570,8 +1570,10 @@
 			String sterilisation = StrutsParamUtils.getPraramValue("sterilisation", "");
 			boolean enableTheSterilizationResultJudgmentFunction = CssdUtils.getSystemSetConfigByNameBool("enableTheSterilizationResultJudgmentFunction", false);
 			if(enableTheSterilizationResultJudgmentFunction){
+				parametMap.put("qualifiedColumnName", "灭菌合格次数");
 				parametMap.put("unqualifiedColumnName", "灭菌不合格次数");
 			}else{
+				parametMap.put("qualifiedColumnName", "灭菌完成次数");
 				parametMap.put("unqualifiedColumnName", "灭菌失败次数");
 			}
 			if(StringUtils.isNotBlank(querySupplyRoom) && StringUtils.isNotBlank(startTime)){
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33820 -r33832
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33820)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33832)
@@ -12796,13 +12796,19 @@
 	private Map<String, SterilizingStove_child> getSuccessData(String depart , String departCoding,String sterilizationPurpose,
 			String startTime, String endTime, String type, String sterilizerNameGroup, String sterilizerName, String sterilisation) {
 			String statusSql = " and sr.status = '"+type+"'";
+			boolean enableTheSterilizationResultJudgmentFunction = CssdUtils.getSystemSetConfigByNameBool("enableTheSterilizationResultJudgmentFunction", false);
 			if(SterilizationRecord.STERILIZATION_STATUS_FAILURE.equals(type)){
-				boolean enableTheSterilizationResultJudgmentFunction = CssdUtils.getSystemSetConfigByNameBool("enableTheSterilizationResultJudgmentFunction", false);
 				if(enableTheSterilizationResultJudgmentFunction){
 					statusSql = " and sr.status = '"+SterilizationRecord.STERILIZATION_STATUS_END
 							+ "' and sr.sterilizationResult='"
 							+ SterilizationRecord.STERILIZATIONRESULT_UNQUALIFIED +"' ";
 				}
+			}else if(SterilizationRecord.STERILIZATION_STATUS_END.equals(type)){
+				if(enableTheSterilizationResultJudgmentFunction){
+					statusSql = " and sr.status = '"+SterilizationRecord.STERILIZATION_STATUS_END
+							+ "' and sr.sterilizationResult='"
+							+ SterilizationRecord.STERILIZATIONRESULT_QUALIFIED +"' ";
+				}
 			}
 			String sql = "select min(s.name) name,count(*) amount,min(s.sequence) sequence from SterilizationRecord sr,Sterilizer s "
 					+" where sr.sterilizer_id = s.id "
Index: ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCount.jasper
===================================================================
diff -u -r33805 -r33832
Binary files differ