Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r35421 -r35424
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 35421)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 35424)
@@ -2228,8 +2228,6 @@
 		)
 	});
 
-	var specialInfectionStoreArr = [];
-
 	//特殊感染类型
 	var specialInfectionStore = new Ext.data.Store({
 		proxy: new Ext.data.HttpProxy({
@@ -2260,7 +2258,6 @@
 						}
 					}
 					if(name == ''){
-						specialInfectionStoreArr = records;
 						return;
 					}
 				}
@@ -3190,26 +3187,25 @@
 							p.getEl().on('keypress', function (e) {
 								if (e.getKey() == 13) {//回车键
 									var value = top.Ext.getCmp('specialInfection').getRawValue();
-									var records;
-									for(var i=0;i<specialInfectionStoreArr.length;i++){
-										var barcode = specialInfectionStoreArr[i].data.barcode;
-										var name = specialInfectionStoreArr[i].data.name;
-										if(value == barcode || value == name){
-											records = specialInfectionStoreArr[i];
-											break;
+									Ext.Ajax.request({
+										url: WWWROOT + '/disinfectSystem/baseData/specialInfectionAction!loadScanedSpecialInfection.do',
+										params:{
+											barcode:value
+										},
+										success: function (response, options) {
+											var result = Ext.decode(response.responseText);
+											if (result.success) {
+												var colorCode = result.data.colorCode;
+												var name = result.data.name;
+												var id = result.data.id;
+												top.Ext.getCmp('specialInfectionID').setValue(id);
+												top.Ext.getCmp('specialInfection').setRawValue(name);
+												top.Ext.getCmp('specialInfection').el.dom.style.background = colorCode;
+											} else {
+												showResult(result.message);
+											}
 										}
-									}
-									if(records){
-										var colorCode = specialInfectionStoreArr[i].data.colorCode;
-										var name = specialInfectionStoreArr[i].data.name;
-										var id = specialInfectionStoreArr[i].data.id;
-										top.Ext.getCmp('specialInfectionID').setValue(id);
-										top.Ext.getCmp('specialInfection').setRawValue(name);
-										top.Ext.getCmp('specialInfection').el.dom.style.background = colorCode;
-									}else {
-										top.Ext.getCmp('specialInfection').setRawValue('');
-										top.Ext.getCmp('specialInfection').el.dom.style.background = '#fff';
-									}
+									})
 								}
 							});
 						},
@@ -3224,11 +3220,10 @@
 						'blur': function (combo) {
 							var value = top.Ext.getCmp('specialInfection').getRawValue();
 							var records;
-							for(var i=0;i<specialInfectionStoreArr.length;i++){
-								var barcode = specialInfectionStoreArr[i].data.barcode;
-								var name = specialInfectionStoreArr[i].data.name;
+							for(var i=0;i<specialInfectionStore.getCount();i++){
+								var name = specialInfectionStore.getAt(i).data.name;
 								if(value == name){
-									records = specialInfectionStoreArr[i];
+									records = specialInfectionStore.getAt(i);
 									break;
 								}
 							}