Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r31638 -r31646
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 31638)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 31646)
@@ -880,13 +880,21 @@
 			boolean secondWashCountWorkload) {
 		JSONObject total = new JSONObject();
 		GoodsOption option = goodsOptionManager.getGoodsOption(GoodsOption.MODEL_SURGICALINSTRUMENTS_DEPT, null);
+		WashAndDisinfectRecord washAndDisinfectRecord = null;
+		if(DatabaseUtil.isPoIdValid(washAndDisinfectRecordId)){
+			washAndDisinfectRecord = (WashAndDisinfectRecord) objectDao.getById(WashAndDisinfectRecord.class.getSimpleName(), washAndDisinfectRecordId);
+		}
 		for (ClassifyBasket cb : classifyBaskets) {
 			// 首次清洗判断依据：ClassifyBasket没有关联过清洗记录 或关联的最早一条清洗记录是给定的id
 			boolean isFistWash;
 			if (CollectionUtils.isEmpty(cb.getWashAndDisinfectRecords())) {
 				isFistWash = true;
 			} else {
-				Collections.sort(cb.getWashAndDisinfectRecords(),
+				List<WashAndDisinfectRecord> washRecordList = cb.getWashAndDisinfectRecords();
+				if(washAndDisinfectRecord != null){
+					washRecordList.add(washAndDisinfectRecord);
+				}
+				Collections.sort(washRecordList,
 						new Comparator<WashAndDisinfectRecord>() {
 							@Override
 							public int compare(WashAndDisinfectRecord o1,
@@ -895,7 +903,7 @@
 										o2.getRecordCreateDate());
 							}
 						});
-				isFistWash = cb.getWashAndDisinfectRecords().get(0).getId() == washAndDisinfectRecordId;
+				isFistWash = washRecordList.get(0).getId() == washAndDisinfectRecordId;
 			}
 
 			if (isFistWash || secondWashCountWorkload) {