Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
===================================================================
diff -u -r35334 -r35421
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 35334)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 35421)
@@ -888,7 +888,7 @@
 		{ header: operatorColumnHeader, width: 60, dataIndex: 'operator', hidden: existsObjInArray(operatorColumnHeader, hiddenColumnsOfUseRecordListView) },
 		{ header: departColumnHeader, width: 80, dataIndex: 'depart', hidden: existsObjInArray(departColumnHeader, hiddenColumnsOfUseRecordListView) },
 		{ header: departNameOfpatientColumnHeader, width: 150, dataIndex: 'departNameOfpatient', sortable: false },
-		{ header: '特殊感染类型', width: 120, dataIndex: 'specialInfectionJson', sortable: false,renderer:function(v, p, rec){
+		{ header: '特殊感染类型', width: 120, dataIndex: 'specialInfection', sortable: false,renderer:function(v, p, rec){
 			if(rec.data.specialInfectionJson){
 				return "<div style='width: 100%;height: 20px;line-height: 20px;padding-left: 5px;background: " + rec.data.specialInfectionJson.colorCode + ";'>"+rec.data.specialInfectionJson.name+"</div>";
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r35335 -r35421
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 35335)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 35421)
@@ -2228,6 +2228,8 @@
 		)
 	});
 
+	var specialInfectionStoreArr = [];
+
 	//特殊感染类型
 	var specialInfectionStore = new Ext.data.Store({
 		proxy: new Ext.data.HttpProxy({
@@ -2240,22 +2242,40 @@
 		}, [
 			{ name: 'id' },
 			{ name: 'name' },
+			{ name: 'barcode' },
 			{ name: 'displayName' },
 			{ name: 'colorCode' }
 		]),
 		listeners: {
 			load: function (thiz, records, options) {
 				specialInfectionStore.removeAll();
+				if(options.params.spell !== ''){
+					var name = '';
+					if (records && records.length > 0) {
+						for (var i = records.length-1; i >=0; i--) {
+							if(options.params.spell == records[i].data.name){
+								name = records[i].data.name;
+								break;
+							}
+						}
+					}
+					if(name == ''){
+						specialInfectionStoreArr = records;
+						return;
+					}
+				}
 				if (records && records.length > 0) {
 					var specialInfectionRecord = Ext.data.Record.create([
 						{ name: 'id' },
 						{ name: 'name' },
+						{ name: 'barcode' },
 						{ name: 'displayName' },
 						{ name: 'colorCode' }
 					]);
 					specialInfectionStore.add(new specialInfectionRecord({ 
 						'id': '', 
 						'name': '', 
+						'barcode': '', 
 						'colorCode':'',
 						'displayName': "　"
 					}));
@@ -2264,6 +2284,7 @@
 						specialInfectionStore.add(new specialInfectionRecord({ 
 							'id': recordItem.id, 
 							'name': recordItem.name, 
+							'barcode': recordItem.barcode, 
 							'colorCode':recordItem.colorCode,
 							'displayName': "<div style='width:40px;float:left;background:"+recordItem.colorCode+";height:20px;line-height:20px;text-align:center;margin-right:5px'></div><div style='float:left;height:20px;line-height:20px;'>"+recordItem.name+"</div>"
 						}));
@@ -3149,6 +3170,7 @@
 				},{
 					xtype: 'combo',
 					fieldLabel: specialInfectionName,
+					queryParam: 'spell',
 					minChars: 0,
 					valueField: 'name',
 					displayField: 'displayName',
@@ -3159,11 +3181,38 @@
 					hideTrigger: false,
 					typeAhead: false,
 					allowBlank: specialInfectionAllowBlank,
-					editable: false,
+					editable: true,
 					id: 'specialInfection',
 					name: 'specialInfection',
 					anchor: '98%',
 					listeners: {
+						render: function (p) {
+							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;
+										}
+									}
+									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';
+									}
+								}
+							});
+						},
 						'select': function (combo, records, eOpts) {
 							var colorCode = records.data.colorCode;
 							var name = records.data.name;
@@ -3173,7 +3222,22 @@
 							combo.el.dom.style.background = colorCode;
 						},
 						'blur': function (combo) {
-							return false;
+							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 == name){
+									records = specialInfectionStoreArr[i];
+									break;
+								}
+							}
+							if(records){
+								return false
+							}else {
+								top.Ext.getCmp('specialInfection').setRawValue('');
+								top.Ext.getCmp('specialInfection').el.dom.style.background = '#fff';
+							}
 						}
 					}
 				}]