Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.92_20200611_v4_1_6p_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
===================================================================
diff -u -r28126 -r28152
--- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 28126)
+++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 28152)
@@ -1,6 +1,6 @@
 {
 	"success":"true",
 	"version":"4.6.92",
-	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.6.92_20200609_v4_1_release.apk",
-	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.6.92_20200609_v4_1_6p_release.apk",
+	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.6.92_20200611_v4_1_release.apk",
+	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.6.92_20200611_v4_1_6p_release.apk",
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.92_20200609_v4_1_release.apk
===================================================================
diff -u -r28126 -r28152
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.92_20200611_v4_1_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.92_20200609_v4_1_6p_release.apk
===================================================================
diff -u -r28126 -r28152
Binary files differ
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r28086 -r28152
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 28086)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 28152)
@@ -779,6 +779,9 @@
 			WashAndDisinfectRecord washRecord,
 			Map<Long, ClassifyBasket> classifyBasketInfoMap,
 			List<WashAndDisinfectRecordMaterial> materials) {
+		if(DatabaseUtil.isPoIdValid(washRecord.getId())){
+			setRecycleCountIfNeed(washRecord);
+		}
 		saveOrUpdateWashAndDisinfectRecordAndMaterials_internal(washRecord,
 				classifyBasketInfoMap, materials);
 		// 美雅洁接口处理
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r28122 -r28152
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 28122)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 28152)
@@ -1906,21 +1906,35 @@
 
 		Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss")
 				.create();
-		WashAndDisinfectRecord washRecord = gson.fromJson(
+		WashAndDisinfectRecord washRecordParam = gson.fromJson(
 				washRecordJsonObj.toString(), WashAndDisinfectRecord.class);
-		if (washRecord == null) {
+		if (washRecordParam == null) {
 			return JSONUtil.buildErrorMsgJsonResult("参数washRecord无法转换为Bean");
 		}
-		washAndDisinfectRecordManager.setRecycleCountIfNeed(washRecord);
 		Set<Long> classifyBasketIds = gson.fromJson(
 				containerStatusIdJsonArray.toString(),
 				new TypeToken<Set<Long>>() {
 				}.getType());
 		Map<Long, ClassifyBasket> classifyBasketInfoMap = WashAndDisinfectRecordAction.getClassifyBasketInfoMap(classifyBasketInfo);
-		String msg = washAndDisinfectRecordManager.validateRinserIsWashEnd(washRecord);
+		String msg = washAndDisinfectRecordManager.validateRinserIsWashEnd(washRecordParam);
 		if(StringUtils.isNotBlank(msg)){
 			return msg;
 		}
+		WashAndDisinfectRecord washRecord = null;
+		if(DatabaseUtil.isPoIdValid(washRecordParam.getId())){
+			washRecord = washAndDisinfectRecordManager.get(washRecordParam.getId());
+		}else{
+			washRecord = new WashAndDisinfectRecord();
+		}
+		washRecord.setCycleCounter(washRecordParam.getCycleCounter());
+		washRecord.setDisinfectIdentification(washRecordParam.getDisinfectIdentification());
+		washRecord.setDisinfectProgram(washRecordParam.getDisinfectProgram());
+		washRecord.setEndDate(washRecordParam.getEndDate());
+		washRecord.setOperator(washRecordParam.getOperator());
+		washRecord.setOperatorCode(washRecordParam.getOperatorCode());
+		washRecord.setStartDate(washRecordParam.getStartDate());
+		washRecord.setWashPersonInCharge(washRecordParam.getWashPersonInCharge());
+		washRecord.setWashPersonInChargeCode(washRecordParam.getWashPersonInChargeCode());
 		if(classifyBasketInfoMap.isEmpty()){
 			washAndDisinfectRecordManager
 			.saveOrUpdateWashAndDisinfectRecordAndMaterials(washRecord,