Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r16375 -r16383
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 16375)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 16383)
@@ -252,7 +252,7 @@
 		return isExist;
 	}
 
-	private void setWashRecordWorkLoadInfo(WashAndDisinfectRecord washRecord) {
+	public void setWashRecordWorkLoadInfo(WashAndDisinfectRecord washRecord) {
 		SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj();
 		// 统计清洗工作量
 		List<ClassifyBasket> classifyBaskets = washRecord.getClassifyBaskets();
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r16363 -r16383
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 16363)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 16383)
@@ -849,25 +849,10 @@
 	 */
 	private void resetWashRecordWorkLoad(Map<Long, WashAndDisinfectRecord> toReSetWorkloadMap){
 		if(toReSetWorkloadMap.size() > 0){
-			SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj();
-			boolean secondWashCountWorkload = true;
-			if (config != null) {
-				secondWashCountWorkload = config.getSecondWashCountWorkload();
-			}
 			for (Long key : toReSetWorkloadMap.keySet()) {
 				WashAndDisinfectRecord washRecord = toReSetWorkloadMap.get(key);
 				if (washRecord != null) {
-					JSONObject workloadJson = washAndDisinfectRecordManager
-							.countTotalWorkload(washRecord.getId(),
-									washRecord.getClassifyBaskets(),
-									secondWashCountWorkload);
-					washRecord.setWashMaterialAmount(workloadJson.optInt("washMaterialAmount"));
-					washRecord.setGeneralMaterialAmount(workloadJson.optInt("generalMaterialAmount"));
-					washRecord.setOperateMaterialAmount(workloadJson.optInt("operateMaterialAmount"));
-					washRecord.setForeignMaterialAmount(workloadJson.optInt("foreignMaterialAmount"));
-					washRecord.setDisinfectMaterialAmount(workloadJson.optInt("disinfectMaterialAmount"));
-					washRecord.setSecondWashForeignAmount(workloadJson.optInt("secondWashForeignMaterialAmount"));
-					washAndDisinfectRecordManager.saveOrUpdate(washRecord);
+					washAndDisinfectRecordManager.setWashRecordWorkLoadInfo(washRecord);
 				}
 			}
 		}
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
===================================================================
diff -u -r16375 -r16383
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java	(.../WashAndDisinfectRecordManager.java)	(revision 16375)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java	(.../WashAndDisinfectRecordManager.java)	(revision 16383)
@@ -81,4 +81,6 @@
 	public JSONObject classifyBasketToJson(ClassifyBasket classifyBasket);
 	
 	public String validateRinserIsWashEnd(WashAndDisinfectRecord washRecord);
+	
+	public void setWashRecordWorkLoadInfo(WashAndDisinfectRecord washRecord);
 }