Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
===================================================================
diff -u -r19623 -r20477
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java	(.../WashAndDisinfectRecordTableManager.java)	(revision 19623)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java	(.../WashAndDisinfectRecordTableManager.java)	(revision 20477)
@@ -126,7 +126,7 @@
 	}
 	public String getWashRecordMsg(String washAndDisinfectRecordId){
 		if(StringUtils.isNotBlank(washAndDisinfectRecordId)){
-			WashAndDisinfectRecord wr = washAndDisinfectRecordManager.getWashAndDisinfectRecordById(washAndDisinfectRecordId);
+			WashAndDisinfectRecord wr = washAndDisinfectRecordManager.get(washAndDisinfectRecordId);
 			if(wr != null){
 				return washAndDisinfectRecordManager.getWRRecordMsg(wr).toString();
 			}
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r20407 -r20477
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 20407)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 20477)
@@ -794,17 +794,10 @@
 			 + " group by c.wrID ) wrG where wrG.wrID=WashAndDisinfectRecord.id)";
 		return sql;
 	}
-	
-	@Override
-	public WashAndDisinfectRecord getWashAndDisinfectRecordById(String id) {
-		return (WashAndDisinfectRecord) objectDao.getByProperty(
-				WashAndDisinfectRecord.class.getSimpleName(), "id",
-				Long.valueOf(id));
-	}
 
 	@Override
 	public void deleteWashAndDisinfectRecordById(String id) {
-		WashAndDisinfectRecord washRecord = getWashAndDisinfectRecordById(id);
+		WashAndDisinfectRecord washRecord = get(id);
 		
 		if(washRecord == null){
 			throw new RuntimeException("ID=" + id + "的清洗记录已不存在！");
@@ -1173,7 +1166,7 @@
 		@Override
 		public List<WashData> getWashAndDisinfectRecordsById(Long id)
 		{
-			WashAndDisinfectRecord sr = getWashAndDisinfectRecordById(id.toString());
+			WashAndDisinfectRecord sr = get(id);
 			// 通过清洗机名字获取设备接口
 		//	String rinserName = sr.getDisinfectIdentification();
 			Session session = objectDao.getHibernateSession();
@@ -1468,7 +1461,7 @@
 			String basketStatus) {
 		if (StringUtils.isNotBlank(recordId)) {
 			SimpleDateFormat sdf = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS;
-			WashAndDisinfectRecord record = getWashAndDisinfectRecordById(recordId);
+			WashAndDisinfectRecord record = get(recordId);
 			if (record != null) {
 				List<ClassifyBasket> baskets = record.getClassifyBaskets();
 				String startTime = record.getStartDateStr();
@@ -1608,7 +1601,7 @@
 			String[] idArray = ids.split(";");
 			SimpleDateFormat sdf = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS;
 			for (String washId : idArray) {
-				WashAndDisinfectRecord record = getWashAndDisinfectRecordById(washId);
+				WashAndDisinfectRecord record = get(washId);
 
 				if (record != null) {
 					if (WashAndDisinfectRecord.STATUS_WASHED.equals(record
@@ -1931,7 +1924,7 @@
 		JSONArray basktArray = new JSONArray();
 		JSONArray materialArray = new JSONArray();
 		if (StringUtils.isNotBlank(id)) {
-			WashAndDisinfectRecord washAndDisinfectRecord = getWashAndDisinfectRecordById(id);
+			WashAndDisinfectRecord washAndDisinfectRecord = get(id);
 			List<ClassifyBasket> list = washAndDisinfectRecord.getClassifyBaskets();
 			if(list != null){
 				for (ClassifyBasket classifyBasket : list) {
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
===================================================================
diff -u -r20399 -r20477
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java	(.../WashAndDisinfectRecordManager.java)	(revision 20399)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java	(.../WashAndDisinfectRecordManager.java)	(revision 20477)
@@ -34,8 +34,6 @@
 	
 	public void washConfirm(String ids,String confirmType);
 	
-	public WashAndDisinfectRecord getWashAndDisinfectRecordById(String id);
-	
 	public List<WashData> getWashAndDisinfectRecordsById(Long id);
 	
 	public List<WashAndDisinfectRecord> getWashAndDisinfectRecordByBasket(long basketId);
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r20463 -r20477
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 20463)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 20477)
@@ -1640,7 +1640,7 @@
 	public String getWashRecordByID(JSONObject params) {
 		long id = params.optLong("id");
 		WashAndDisinfectRecord washAndDisinfectRecord = washAndDisinfectRecordManager
-				.getWashAndDisinfectRecordById(String.valueOf(id));
+				.get(id);
 		JSONArray washRecordJsonObject = JSONArray.fromObject(
 				washAndDisinfectRecord, buildJsonConfigForWashRecord());
 		JSONBuilder builder = new JSONStringer().object().key("success")
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r20468 -r20477
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 20468)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 20477)
@@ -4814,7 +4814,7 @@
 			tousseInstance.setRecyclingUser(washJson.optString("recyclingUser"));
 		}
 		if(washRecordId != null){
-			WashAndDisinfectRecord lastWashRecord = washAndDisinfectRecordManager.getWashAndDisinfectRecordById("" + washRecordId);
+			WashAndDisinfectRecord lastWashRecord = washAndDisinfectRecordManager.get(washRecordId);
 			washAndDisinfectRecordManager.setWashInfo(tousseInstance,lastWashRecord);
 		}
 		//质量监测重新装配，设置清洗的篮筐ids,回收人
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java
===================================================================
diff -u -r13416 -r20477
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java	(.../WashDataLineChartAction.java)	(revision 13416)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java	(.../WashDataLineChartAction.java)	(revision 20477)
@@ -27,7 +27,7 @@
 			String washAndDisinfectRecordId = StrutsParamUtils.getPraramValue(
 					"washAndDisinfectRecordId", null);
 			WashAndDisinfectRecord washAndDisinfectRecord = washAndDisinfectRecordManager.
-					getWashAndDisinfectRecordById(washAndDisinfectRecordId);
+					get(washAndDisinfectRecordId);
 			List<WashData> washDatas = washAndDisinfectRecordManager.getWashAndDisinfectRecordsById(washAndDisinfectRecord.getId());
 //			System.out.println("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee");
 			if (washAndDisinfectRecord != null
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
===================================================================
diff -u -r19792 -r20477
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java	(.../WebServiceManagerImpl.java)	(revision 19792)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java	(.../WebServiceManagerImpl.java)	(revision 20477)
@@ -1762,7 +1762,7 @@
 			WashAndDisinfectRecord record = null;
 			//修改清洗记录
 			if(StringUtils.isNotBlank(id)){
-				record = washAndDisinfectRecordManager.getWashAndDisinfectRecordById(id);
+				record = washAndDisinfectRecordManager.get(id);
 				record.setClassifyBaskets(basketList);
 			}else{//新添加的清洗记录
 				record = new WashAndDisinfectRecord();
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
===================================================================
diff -u -r20404 -r20477
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 20404)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 20477)
@@ -530,7 +530,7 @@
 		String id = StrutsParamUtils.getPraramValue("id", "");
 		if (StringUtils.isNotBlank(id) && !id.equals("0")) {
 			washAndDisinfectRecord = washAndDisinfectRecordManager
-					.getWashAndDisinfectRecordById(id);
+					.get(id);
 		} else {
 			washAndDisinfectRecord = new WashAndDisinfectRecord();
 			LoginUserData user = AcegiHelper.getLoginUser();