Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.js
===================================================================
diff -u -r17454 -r17460
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.js	(.../washTransitionRecordView.js)	(revision 17454)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.js	(.../washTransitionRecordView.js)	(revision 17460)
@@ -57,6 +57,7 @@
 		columns : columns,
 		sorters : { property : 'transitionTime', direction: 'DESC'},
 		extraParams : {},  //如果你要自定义参数，这里一定要先给一个空的对象，要不然会报空异常
+		showRightClick : false,
 		tbar : [{
 			xtype : 'label',
 			text : '标识牌条码：'
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17456 -r17460
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17456)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17460)
@@ -14109,7 +14109,7 @@
 						if (bean11 != null) {  //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理
 							bean11.setAmount(bean11.getAmount() + 1);
 						}
-					} else {
+					} else if (StringTools.equals(chemistryResult, SterilizationRecord.MONITOR_RESULT_QUALIFIED)) {
 						bean1 = tempMap.get(name + chemistryResultTag + SterilizationRecord.MONITOR_RESULT_QUALIFIED);
 						if (bean1 != null) {  //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理
 							bean1.setAmount(bean1.getAmount() + 1);
@@ -14132,7 +14132,7 @@
 						if (bean22 != null) {  //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理
 							bean22.setAmount(bean22.getAmount() + 1);
 						}
-					} else {
+					} else if (StringTools.equals(physicsResult, SterilizationRecord.MONITOR_RESULT_QUALIFIED)) {
 						bean2 = tempMap.get(name + physicsResultTag + SterilizationRecord.MONITOR_RESULT_QUALIFIED);
 						if (bean2 != null) {  //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理
 							bean2.setAmount(bean2.getAmount() + 1);
@@ -14155,7 +14155,7 @@
 						if (bean33 != null) {  //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理
 							bean33.setAmount(bean33.getAmount() + 1);
 						}
-					} else {
+					} else if (StringTools.equals(biologyResult, SterilizationRecord.MONITOR_RESULT_QUALIFIED)) {
 						bean3 = tempMap.get(name + biologyResultTag + SterilizationRecord.MONITOR_RESULT_QUALIFIED);
 						if (bean3 != null) {  //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理
 							bean3.setAmount(bean3.getAmount() + 1);
@@ -14180,7 +14180,9 @@
 						if (bean44 != null) {  //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理
 							bean44.setAmount(bean44.getAmount() + 1);
 						}
-					} else {
+					} else if (StringTools.equals(chemistryResult, SterilizationRecord.MONITOR_RESULT_QUALIFIED)
+							|| StringTools.equals(physicsResult, SterilizationRecord.MONITOR_RESULT_QUALIFIED)
+							|| StringTools.equals(biologyResult, SterilizationRecord.MONITOR_RESULT_QUALIFIED)) {
 						bean4 = tempMap.get(name + sterilizationType2 + SterilizationRecord.MONITOR_RESULT_QUALIFIED);
 						if (bean4 != null) {  //正常情况下不会出现null的，为了保险还是处理一下空指针，为空不处理
 							bean4.setAmount(bean4.getAmount() + 1);
@@ -14275,10 +14277,12 @@
 					qualifiedProportion = new BigDecimal(qualifiedTotal)
 					.divide(new BigDecimal(temp),13,RoundingMode.HALF_UP)
 					.multiply(new BigDecimal(100)).intValue();
+					proportionBean1.setAmount(qualifiedProportion);
+					proportionBean2.setAmount(100 - qualifiedProportion);
+				} else {
+					proportionBean1.setAmount(0);
+					proportionBean2.setAmount(0);
 				}
-				
-				proportionBean1.setAmount(qualifiedProportion);
-				proportionBean2.setAmount(100 - qualifiedProportion);
 			}
 			
 			for (Entry<String, TousseSterilizationInspectSituationBean> entry : tempMap.entrySet()) {