Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
===================================================================
diff -u -r21219 -r21348
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java	(.../WashAndDisinfectRecord.java)	(revision 21219)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java	(.../WashAndDisinfectRecord.java)	(revision 21348)
@@ -98,7 +98,7 @@
 	private String washPersonInCharge;
 	
 	/**
-	 * 清洗记录责任人编号
+	 * 清洗记录责任人登录名
 	 */
 	private String washPersonInChargeCode;
 	
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r21219 -r21348
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 21219)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 21348)
@@ -6,6 +6,10 @@
 var pendingWashAndDisinfectColumnTree;
 var startDateTimerHandle = null;  //开始时间定时器的句柄
 var endDateTimerHandle = null;  //结束时间定时器的句柄
+var oldPerson = null; //修改时后台传过来的清洗责任人
+var oldPersonCode = null; //修改时后台传过来的清洗责任人登录名
+var pitchOn = true; //判断是否点击了责任人后扫描条码  true没修改， flase修改过
+var isAddorAlter = true ; //判断是否是修改还是添加 true是添加，flase是修改
 
 var materialDefinitionStore = new Ext.data.Store({
     pageSize: 100,
@@ -546,8 +550,10 @@
 //					top.Ext.getCmp('personInChargeCode').setValue(basket.attributes.personInChargeCode);
 //				}
 				if(basketJson.washPersonInCharge != null && basketJson.washPersonInCharge != ''){ //清洗记录责任人取清洗记录自己保存的责任人
+					oldPerson = basketJson.washPersonInCharge;
+					oldPersonCode = basketJson.washPersonInChargeCode;
 					top.Ext.getCmp('personInCharge').setValue(basketJson.washPersonInCharge);
-					top.Ext.getCmp('personInChargeCode').setValue(basketJson.washPersonInCharge); 
+					top.Ext.getCmp('personInChargeCode').setValue(basketJson.washPersonInChargeCode); 
 				}
 				if(basket.attributes.position != null && basket.attributes.position != ''){
 					top.Ext.getCmp('position').setValue(basket.attributes.position);
@@ -564,10 +570,13 @@
 				});
 				materialStore.add(material);
 				if(materialJson.washPersonInCharge != null && materialJson.washPersonInCharge != ''){ //清洗记录责任人取自己清洗记录保存的责任人
+					oldPerson = materialJson.washPersonInCharge;
+					oldPersonCode = materialJson.washPersonInChargeCode;
 					top.Ext.getCmp('personInCharge').setValue(materialJson.washPersonInCharge);
-					top.Ext.getCmp('personInChargeCode').setValue(materialJson.washPersonInCharge);
+					top.Ext.getCmp('personInChargeCode').setValue(materialJson.washPersonInChargeCode);
 				}
 			}
+			isAddorAlter = false ; //修改时为flase;
 			resetContainerCount();//编辑时计算已扫描篮筐数量
 		},
 		failure : function(response, options) {
@@ -790,7 +799,13 @@
 								readOnly : true,
 								id : "personInCharge",
 								anchor : '99%',
-								cls:'fieldReadOnlyNoRemove'
+								cls:'fieldReadOnlyNoRemove',
+								listeners : {
+									 focus: function(){
+								            //获取焦点
+										 pitchOn = false; //修改时点击责任人获取焦点才能修改清洗责任人
+								        }
+								}
 							}]
 						},{
 							xtype : 'hidden',
@@ -1612,9 +1627,21 @@
 	var conCurrent = top.Ext.getCmp("conCurrent").getValue();
 	var orgWashStartTime = top.Ext.getCmp('orgWashStartTime').getValue();
 	var orgWashEndTime = top.Ext.getCmp('orgWashEndTime').getValue();
-	var washPersonInCharge = top.Ext.getCmp('personInCharge').getValue(); //取界面最后显示的责任人为清洗责任人
-	var washPersonInChargeCode = top.Ext.getCmp('personInChargeCode').getValue();
+	if(isAddorAlter){ //新添加纪录取责任人框内数据
+		var washPersonInCharge = top.Ext.getCmp('personInCharge').getValue(); //取界面最后显示的责任人为清洗责任人
+		var washPersonInChargeCode = top.Ext.getCmp('personInChargeCode').getValue();
+	}else if(pitchOn){ //修改时是否点击责任人修改过 true没修改 false修改过
+		var washPersonInCharge = oldPerson; //取加载旧责任人为清洗责任人
+		var washPersonInChargeCode = oldPersonCode;
+		isAddorAlter = true;
+	}else{
+		var washPersonInCharge = top.Ext.getCmp('personInCharge').getValue(); //取界面最后显示的责任人为清洗责任人
+		var washPersonInChargeCode = top.Ext.getCmp('personInChargeCode').getValue();
+		pitchOn = true;
+		isAddorAlter = true;
+	}
 	
+	
 	Ext.getCmp('washSaveSubmitResult').setValue("0");
 	top.Ext.getCmp("disinfectProgram").setValue(top.Ext.getCmp("disinfectProgram").getRawValue());
 	formObj.form.submit({
@@ -1635,6 +1662,8 @@
 				Ext.getCmp('washSaveSubmitResult').setValue("-1");
 				top.Ext.getCmp("saveBtn").enable();
 			}
+			oldPerson = null; //成功保存清空旧的责任人
+			oldPersonCode = null;
 		},
 		failure : function(form, action) {
 			showResult(action.result.message);
@@ -1797,7 +1826,7 @@
             	root.eachChild(function(child) {
             		var personInCharge = child.attributes.personInCharge;
             		if( child.attributes.personInCharge == null || child.attributes.personInCharge == ''){
-            			child.attributes.personInCharge = result.fullName;
+//            			child.attributes.personInCharge = result.fullName;
                 		child.attributes.personInChargeCode = result.name;
                     	var newBasket = cloneBasket(child);
                     	var curIndex = root.indexOf(child);
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r21219 -r21348
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 21219)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 21348)
@@ -524,7 +524,7 @@
 		String orgWashStartTime = paramMap.get("orgWashStartTime");
 		String orgWashEndTime = paramMap.get("orgWashEndTime");
 		String washPersonInCharge = paramMap.get("washPersonInCharge"); //清洗记录责任人
-		String washPersonInChargeCode = paramMap.get("washPersonInChargeCode"); //清洗记录人编号
+		String washPersonInChargeCode = paramMap.get("washPersonInChargeCode"); //清洗记录人登陆名
 		String startDateStr = "";
 		String endDateStr = "";
 		try {