Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r13689 -r13735
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 13689)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 13735)
@@ -410,7 +410,7 @@
 	// 是否手术室器械
 	private boolean isSurgicalInstruments(ClassifiedItem ci, GoodsOption option) {
 		if (ci != null && option != null) {
-			if (option.getValue().indexOf(ci.getOrgUnitName()) != -1) {
+			if (StringUtils.isNotBlank(option.getValue()) && option.getValue().indexOf(ci.getOrgUnitName()) != -1) {
 				return true;
 			}
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r13416 -r13735
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 13416)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 13735)
@@ -1115,6 +1115,7 @@
 		},
 		failure : function(form, action) {
 			showResult(action.failureType);
+			top.Ext.getCmp("saveBtn").enable();
 		}
 	});