Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r16283 -r16320
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 16283)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 16320)
@@ -2596,7 +2596,7 @@
 		return false;
 	}
 	var monitorChecker = top.Ext.getCmp('monitorChecker').getValue();
-	if (!monitorChecker) {
+	if (!monitorChecker && top.Ext.getCmp('biologyResult').getValue() != '无') {  //如果生物监测结果是无也可以让他保存
 		showResult('请扫描监测核对员条码');
 		return false;
 	}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r16312 -r16320
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16312)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16320)
@@ -4625,14 +4625,14 @@
 									basketBarcodes.replaceAll(";", "','"),
 									currentPackingTask.getSourceId());
 					ResultSet rs = objectDao.executeSql(sql);
-					Set<String> classifybasketIdSet = new HashSet<String>();  //用Set能实现去重的效果（cjr）
+					List<String> classifybasketIdList = new ArrayList<String>();
 					try {
 						while (rs.next()) {
 							String classifyBasketId = StringUtils.defaultString(rs.getString("classifybasketId"));
 							String personInCharge = StringUtils.defaultString(rs.getString("personInCharge"));
 							String personInChargeCode = StringUtils.defaultString(rs.getString("personInChargeCode"));
 							
-							classifybasketIdSet.add(classifyBasketId);
+							classifybasketIdList.add(classifyBasketId);
 							
 							tousseInstance.setWashOperator(StringUtils.isNotBlank(personInCharge)?personInCharge:tousseInstance.getWashOperator());
 							tousseInstance.setWashOperatorCode(StringUtils.isNotBlank(personInChargeCode)?personInChargeCode:tousseInstance.getWashOperator());
@@ -4642,8 +4642,8 @@
 					} finally {
 						DatabaseUtil.closeResultSetAndStatement(rs);
 					}
-					if (classifybasketIdSet.size() > 0) {  //清洗篮筐id
-						String[] classifybasketIdArray = classifybasketIdSet.toArray(new String[classifybasketIdSet.size()]);
+					if (classifybasketIdList.size() > 0) {  //清洗篮筐id
+						String[] classifybasketIdArray = classifybasketIdList.toArray(new String[classifybasketIdList.size()]);
 						tousseInstance.setClassifyBasketIds(StringUtils.join(classifybasketIdArray, ";"));
 					}