Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r37038 -r37100
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 37038)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 37100)
@@ -391,6 +391,9 @@
 	if(top.Ext4.getCmp('doctorAccountDepart')){
 		top.Ext4.getCmp('doctorAccountDepart').setValue(patientInfo.doctorAccountDepart || '');
 	}
+	if(top.Ext4.getCmp('patientId')){
+		top.Ext4.getCmp('patientId').setValue(patientInfo.patientId || '');
+	}
 }
 
 //确认归还：0，提前归还：1，批量确认归还：2，批量提前归还：3
@@ -3397,6 +3400,31 @@
 							labelWidth :70,
 							columnWidth :.33,
 							height:heightVal,
+							items : [{
+								xtype : 'textfield',
+								fieldLabel : 'ID',
+								maxLength : '50',
+								id : 'patientId',
+								name : 'patientId',
+								width : '33.3%',
+								allowBlank : true,
+								enableKeyEvents : true,
+								listeners : {
+									specialkey : function(field, ee) {
+										if (ee.getKey() == Ext4.EventObject.ENTER) {
+											var jsonStr = "{\"patientNum\":\"" + field.value
+														+ "\",\"numType\":\"patientId\",\"sourcePage\":\"0\"}";
+											loadPatientInfoByValAndType(jsonStr);
+										}
+									}
+								},
+								flex : 1
+							}]
+						},{
+							layout : 'form',
+							labelWidth :70,
+							columnWidth :.33,
+							height:heightVal,
 							hidden : sstsConfig.hiddenFieldsOnForeignTousseInfoPage && sstsConfig.hiddenFieldsOnForeignTousseInfoPage.indexOf('hospitalNumber') >= 0,
 							items : [{
 								xtype : 'textfield',
@@ -4355,6 +4383,8 @@
 				
 				//设置手术间
 				top.Ext4.getCmp("operationRoom").setValue(action.result.data.operationRoom);
+
+				top.Ext4.getCmp("patientId").setValue(action.result.data.patientId);
 				
 				//设置手术时间
 				var operationTime = action.result.data.operationTime;
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r36934 -r37100
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 36934)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 37100)
@@ -960,13 +960,6 @@
 		var ascriptionDepartment = patientInfo.ascriptionDepartment;
 		if (ascriptionDepartment) {
 			top.Ext.getCmp('departNameOfpatient').setValue('');
-			//store的find方法不是精确匹配,模糊匹配会有问题,改用后面的each循环判断了
-			/*var ascriptionDepartmentIndex = departJsonStore.find("name",ascriptionDepartment,0,false,true);
-			if(ascriptionDepartmentIndex != -1){
-				top.Ext.getCmp('departNameOfpatient').setValue(ascriptionDepartment);
-				//设置病人所在科室的编码
-				top.Ext.getCmp('departCodeOfpatient').setValue(departJsonStore.getAt(ascriptionDepartmentIndex).get("id"));
-			}*/
 			departJsonStore.each(function (record) {
 				var nameOfDepartJsonStore = record.get("name");
 				if (nameOfDepartJsonStore == ascriptionDepartment) {
@@ -1011,6 +1004,9 @@
 		if (patientInfo.operationScheduleId) {
 			top.Ext.getCmp('operationScheduleId').setValue(patientInfo.operationScheduleId);
 		}
+		if(patientInfo.patientId){
+			top.Ext.getCmp('patientId').setValue(patientInfo.patientId);
+		}
 		if (sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains(doctorAccountDepartName)) {
 			if (patientInfo.doctorAccountDepartCode && patientInfo.doctorAccountDepart) {
 				top.Ext.getCmp('doctorAccountDepartCode').setValue(patientInfo.doctorAccountDepartCode);
@@ -1684,7 +1680,7 @@
 function submitFormForSave(btObj, win, id, createNew, callback) {
 	top.Ext.getCmp('depart').enable();
 	setFormParams(formObj.form, ['id', 'washHandNurse', 'circuitNurse', 'operationRoom', 'treatmentNum',
-		'hospitalNum', 'patientName', 'patientAge', 'patientSex', 'roomNumber',
+		'hospitalNum', 'patientName', 'patientAge', 'patientSex', 'roomNumber', 'patientId',
 		'bedNumber', 'patientIDCard', 'doctorName', 'surgeon', 'operationName', 'specialInfection', 'operationTime', 'operationScheduleId', 'remark', 'departCodeOfpatient']);
 	// 设置表单上的item参数(因为struts2版本会对前台传过来日期的时分秒部分截掉,所以手术时间需要单独传)
 	if (top.Ext.getCmp('departNameOfpatient').getRawValue() == '') {
@@ -1815,7 +1811,7 @@
 		if (btn == 'yes') {
 			top.Ext.getCmp('depart').enable();
 			setFormParams(formObj.form, ['id', 'washHandNurse', 'circuitNurse', 'operationRoom', 'treatmentNum',
-				'hospitalNum', 'patientName', 'patientAge', 'patientSex', 'roomNumber',
+				'hospitalNum', 'patientName', 'patientAge', 'patientSex', 'roomNumber', 'patientId',
 				'bedNumber', 'patientIDCard', 'doctorName', 'operationName', 'specialInfection', 'operationTime', 'operationScheduleId', 'remark', 'departCodeOfpatient']);
 			// 设置表单上的item参数
 			setFormItems(useItemsStore);
@@ -2812,6 +2808,39 @@
 				xtype: 'hidden',
 				name: 'visitTypeCode',
 				id: 'visitTypeCode'
+			},{
+				layout : 'form',
+				columnWidth :.33,
+				hidden: fromDepartmentUseRecord,
+				items : [{
+					xtype : 'textfield',
+					fieldLabel : 'ID',
+					maxLength : '50',
+					id : 'patientId',
+					name : 'patientId',
+					allowBlank : true,
+					enableKeyEvents : true,
+					listeners : {
+						render: function (c) {
+							c.getEl().on('keypress', function (e, thiz) {
+								if (e.getKey() == 13) {
+									iskeypress = true;
+									var value = thiz.value.replace(/"/g, '\\"');
+									var jsonStr = "{\"patientNum\":\"" + value
+										+ "\",\"numType\":\"patientId\",\"sourcePage\":\""
+										+ sourcePage_useRecord + "\"}";
+									loadPatientInfoByValAndType(jsonStr);
+								}
+							});
+						},
+						blur: function () {
+							if (!iskeypress) {
+								validPatientInfo();
+							}
+						}
+					},
+					anchor: '96%'
+				}]
 			}, {
 				layout: 'form',
 				columnWidth: 0.33,
@@ -3824,7 +3853,7 @@
 
 				// 保存原始数据,只需要保存需要修改的属性
 				setOriginalFormParams(form, ['id', 'washHandNurse', 'circuitNurse', 'operationRoom', 'treatmentNum',
-					'hospitalNum', 'patientName', 'patientAge', 'patientSex', 'roomNumber',
+					'hospitalNum', 'patientName', 'patientAge', 'patientSex', 'roomNumber', 'patientId',
 					'bedNumber', 'patientIDCard', 'doctorName', 'surgeon', 'operationName', 'specialInfection', 'remark', 'departCodeOfpatient']);
 
 				if(action.result.data.specialInfectionJson){
Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r36810 -r37100
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 36810)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 37100)
@@ -61,6 +61,9 @@
 				{name: 'patientAge'},
 				{name: 'clinicNumber'},
 				{name: 'patientSex'},
+				{name: 'patientId'},
+				{name: 'patientIDCard'},
+				{name: 'operationScheduleId'},
 				{name: 'patientArea'},
 				{name: 'roomNumber'},
 				{name: 'bedNumber'},