Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/useripandorgunitmapping/UserIPAndOrgUnitMapping.java
===================================================================
diff -u -r14952 -r15086
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/useripandorgunitmapping/UserIPAndOrgUnitMapping.java	(.../UserIPAndOrgUnitMapping.java)	(revision 14952)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/useripandorgunitmapping/UserIPAndOrgUnitMapping.java	(.../UserIPAndOrgUnitMapping.java)	(revision 15086)
@@ -24,6 +24,8 @@
 	
 	private String userName;  //用户登录名
 	
+	private String fullName;  //用户姓名
+	
 	private String defaultOrgUnitCode;  //用户当前科室编码
 	
 	private String defaultOrgUnitName;  //用户当前科室名称
@@ -76,6 +78,14 @@
 	public void setId(Long id) {
 		this.id = id;
 	}
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
 	
 	
 	
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingForm.js
===================================================================
diff -u -r14964 -r15086
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingForm.js	(.../userIPAndOrgUnitMappingForm.js)	(revision 14964)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingForm.js	(.../userIPAndOrgUnitMappingForm.js)	(revision 15086)
@@ -16,7 +16,7 @@
 				currentOrgUnitJsonStore.baseParams.userName = top.Ext.getCmp('userName').getValue();  //加载之前先把用户名传给后台
 			},
 			load : function(store, records) {
-				if (records.length > 0 && !id) {  //如果是修改的按钮不会走这里
+				if (records.length > 0) {
 					top.Ext.getCmp('currentOrgUnit').setValue(records[0].data.currentOrgUnitValue);
 					top.Ext.getCmp('currentOrgUnit').setRawValue(records[0].data.currentOrgUnitDisplay);
 				} 
@@ -70,10 +70,23 @@
 			anchor : '95%',
 			listeners : {
 				select : function(thisCombo, record, index) {
+					var fullName = top.Ext.getCmp('userName').getRawValue();
+					fullName = fullName.substring((fullName.indexOf('(') + 1) ,fullName.lastIndexOf(')'));
+					top.Ext.getCmp('fullName').setValue(fullName);
+					
 					currentOrgUnitJsonStore.load();
 				}
 			}
 		}, {
+			xtype : 'textfield',
+			fieldLabel : '用户姓名',
+			id : 'fullName',
+			name : 'fullName',
+			allowBlank : false,
+			blankText : '此文本框不能为空',
+			readOnly : true,
+			anchor : '95%'
+		}, {
 			xtype : 'combo',
 			fieldLabel : '默认科室',
 			valueField : 'currentOrgUnitValue',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingView.js
===================================================================
diff -u -r14952 -r15086
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingView.js	(.../userIPAndOrgUnitMappingView.js)	(revision 14952)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingView.js	(.../userIPAndOrgUnitMappingView.js)	(revision 15086)
@@ -78,13 +78,15 @@
 
 	var columns = [
 	    {header : "用户名", width : 120,dataIndex : 'userName', renderer : modifyRecord},
+	    {header : "用户姓名", width : 120,dataIndex : 'fullName'},
 	    {header : "默认科室", width : 120,dataIndex : 'defaultOrgUnitName'},
 	    {header : "IP地址范围", width : 120,dataIndex : 'ipAddress', id : 'cleaningMethod'}
 	];
 	
 	var readerDetail = [
 	    {name : 'id'},
 	    {name : 'userName'},
+	    {name : 'fullName'},
 	    {name : 'defaultOrgUnitName'},
 	    {name : 'ipAddress'}
 	];