Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r34202 -r34213
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34202)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34213)
@@ -15934,7 +15934,7 @@
 				totalUnqualifiedAmount += washUnqualifiedAmount;
 				data.setWashUnqualifiedAmount(washUnqualifiedAmount);
 				if (amount != 0){
-					data.setWashUnqualifiedPercentage(MathTools.divide(washUnqualifiedAmount, amount, 4));
+					data.setWashUnqualifiedPercentage(MathTools.divide(washUnqualifiedAmount * 100, amount, 4));
 				}
 				else{
 					data.setWashUnqualifiedPercentage(0d);
@@ -26272,7 +26272,11 @@
 					materialTypeVo = materialTypeMap.get(item.getMaterialType());
 					materialTypeVo.setAmount(MathTools.add(item.getAmount(), materialTypeVo.getAmount()).intValue());
 					materialTypeVo.setWashUnqualifiedAmount(MathTools.add(item.getWashUnqualifiedAmount(), materialTypeVo.getWashUnqualifiedAmount()).intValue());
-					materialTypeVo.setWashUnqualifiedPercentage(MathTools.add(item.getWashUnqualifiedPercentage(), materialTypeVo.getWashUnqualifiedPercentage()).doubleValue());
+					if (materialTypeVo.getAmount() != 0){
+						materialTypeVo.setWashUnqualifiedPercentage(MathTools.divide(materialTypeVo.getWashUnqualifiedAmount() * 100, materialTypeVo.getAmount(), 4));
+					}else{
+						materialTypeVo.setWashUnqualifiedPercentage(0d);
+					}
 				}else{
 					materialTypeVo = new MaterialTypeWorkloadReport();
 					materialTypeVo.setAmount(item.getAmount());
@@ -26284,7 +26288,11 @@
 					sumVo = sumMap.get(dayOfMonth);
 					sumVo.setAmount(MathTools.add(item.getAmount(), sumVo.getAmount()).intValue());
 					sumVo.setWashUnqualifiedAmount(MathTools.add(item.getWashUnqualifiedAmount(), sumVo.getWashUnqualifiedAmount()).intValue());
-					sumVo.setWashUnqualifiedPercentage(MathTools.add(item.getWashUnqualifiedPercentage(), sumVo.getWashUnqualifiedPercentage()).doubleValue());
+					if (sumVo.getAmount() != 0){
+						sumVo.setWashUnqualifiedPercentage(MathTools.divide(sumVo.getWashUnqualifiedAmount() * 100, sumVo.getAmount(), 4));
+					}else{
+						sumVo.setWashUnqualifiedPercentage(0d);
+					}
 				}else{
 					sumVo = new MaterialTypeWorkloadReport();
 					sumVo.setAmount(item.getAmount());
@@ -26294,8 +26302,10 @@
 				}
 				totalSumVo.setAmount(MathTools.add(item.getAmount(), totalSumVo.getAmount()).intValue());
 				totalSumVo.setWashUnqualifiedAmount(MathTools.add(item.getWashUnqualifiedAmount(), totalSumVo.getWashUnqualifiedAmount()).intValue());
-				totalSumVo.setWashUnqualifiedPercentage(MathTools.add(item.getWashUnqualifiedPercentage(), totalSumVo.getWashUnqualifiedPercentage()).doubleValue());
 			}
+			if (totalSumVo.getAmount() != null && totalSumVo.getAmount() != 0){
+				totalSumVo.setWashUnqualifiedPercentage(MathTools.divide(totalSumVo.getWashUnqualifiedAmount() * 100, totalSumVo.getAmount(), 4));
+			}
 			JSONObject data = new JSONObject();
 			sumMap.put("合计", totalSumVo);
 			data.put("dataList", list);