Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r24089 -r25289
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 24089)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 25289)
@@ -254,11 +254,15 @@
 		Map<Long,ClassifyBasket> toDeleteBasketMap = getOldClassifyBasketMap(washRecord);
 		
 		Rinser rinser = rinserManager.getRinserByName(washRecord.getDisinfectIdentification());
+		if(rinser == null){
+			throw new SystemException("名称为"+ washRecord.getDisinfectIdentification() +"的清洗机不存在,可能已被删除,请重新选择！");
+		}
 
 		boolean isNewRecord = !DatabaseUtil.isPoIdValid(washRecord.getId());
 		if (isNewRecord) {
 			setNewRecordProperty(washRecord, rinser);
 		}
+		washRecord.setRinserId(rinser.getId());
 		
 		isWashOrderRight(washRecord.getId(),washRecord.getDisinfectIdentification(), classifyBasketInfoMap.keySet());
 		
@@ -354,7 +358,6 @@
 				washRecord.setEndDate(null);
 				washRecord.setEndDateStr("");
 			}
-			washRecord.setRinserId(rinser.getId());
 		}
 	}
 
@@ -1180,7 +1183,7 @@
 				+ " between wadr.startDate and wadr.endDate )"
 				+ " or wadr.washStatus = '" + WashAndDisinfectRecord.STATUS_WASHING 
 				+ "' )";
-		
+		logger.debug("validateWashIsEnd sql=" + sql);
 //		String sql = "select count(*) from WashAndDisinfectRecord wadr "
 //				+ " where wadr.disinfectIdentification = '"
 //				+ CleaningMachineName + "'" + " and "