Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js
===================================================================
diff -u -r16094 -r17202
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js	(.../interfereSterilizationView1.js)	(revision 16094)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js	(.../interfereSterilizationView1.js)	(revision 17202)
@@ -60,8 +60,9 @@
 	var sterilizerName = record.data.sterilizerName;
 	var frequency = record.data.frequency;
 	var sterilizationMethod = record.data.sterilizationType;
+	var sterilizationUser = record.data.sterilizationUser;
 	var str = "";
-	str = "<input type=\"button\" value=\"修改灭菌参数\" onclick=\"showSterilizationRecordParams('"+record.data.id+"','"+status+"','"+startDate+"','"+endDate+"','"+sterilizationPurpose+"','"+sterilizerName+"','"+frequency+"','"+sterilizationMethod+"')\">";
+	str = "<input type=\"button\" value=\"修改灭菌参数\" onclick=\"showSterilizationRecordParams('"+record.data.id+"','"+status+"','"+startDate+"','"+endDate+"','"+sterilizationPurpose+"','"+sterilizerName+"','"+frequency+"','"+sterilizationMethod+"','"+sterilizationUser+"')\">";
 	return str;
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
===================================================================
diff -u -r16479 -r17202
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js	(.../interfereSterilizationTab1.js)	(revision 16479)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js	(.../interfereSterilizationTab1.js)	(revision 17202)
@@ -1,4 +1,4 @@
-function showSterilizationRecordParams(id,curStatus,startDate,endDate,sterilizationPurpose,sterilizerName,frequency,sterilizationMethod){
+function showSterilizationRecordParams(id,curStatus,startDate,endDate,sterilizationPurpose,sterilizerName,frequency,sterilizationMethod,sterilizationUser){
 	// 灭菌程序store
 	var foldersJsonStore = new Ext.data.SimpleStore({
 		fields : [ 'id','cleaningMethod' ],
@@ -78,6 +78,44 @@
 							layout : 'form',
 							cls:'edit-part2-labelwidth',
 							items : [{
+								id : 'inputBarcode',
+								name : 'inputBarcode',
+								xtype : 'textfield',
+								fieldLabel : '扫描条码',
+								anchor : '100%',
+								allowBlank : true,
+								listeners : {
+									specialkey : function(thiz, e){
+										if(e.getKey() == 13){
+											var barcode = top.Ext.getCmp('inputBarcode').getValue();
+											if(barcode != null && barcode.length >0){
+												loadSterilizationUser(barcode);
+											}else{
+												showResult("请输入正确的条码！");
+											}
+											top.Ext.getCmp('inputBarcode').setValue("");
+										}
+									}
+								}
+							}]
+						},{
+							columnWidth : .5,
+							layout : 'form',
+							cls:'edit-part2-labelwidth',
+							items : [{
+								id : 'sterilizationUser1',
+								name : 'sterilizationUser1',
+								xtype : 'textfield',
+								fieldLabel : '灭菌员',
+								anchor : '100%',
+								readOnly : true,
+								allowBlank : false
+							}]
+						},{
+							columnWidth : .5,
+							layout : 'form',
+							cls:'edit-part2-labelwidth',
+							items : [{
 								id : 'frequency1',
 								name : 'frequency1',
 								xtype : 'textfield',
@@ -231,6 +269,22 @@
 	top.Ext.getCmp('sterilizerName1').setValue(sterilizerName);
 	top.Ext.getCmp('frequency1').setValue(frequency);
 	top.Ext.getCmp('sterilizationMethod1').setValue(sterilizationMethod);
+	top.Ext.getCmp('sterilizationUser1').setValue(sterilizationUser);
 	
 	tousseInstanceWindow.show();
 }
+
+	//扫描灭菌员条码
+	function loadSterilizationUser(barcode){
+		if(barcode != null && barcode.length > 0){
+			SterilizationRecordTableManager.getSterilizationUserByBarcode(barcode,function(response) {
+						var result = Ext.decode(response);
+						if (result.success == true) {
+							top.Ext.getCmp('sterilizationUser1').setValue(result.fullName);
+						}else{
+							showResult(result.message);
+						}
+					}
+				);
+		}
+	}
\ No newline at end of file
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r17192 -r17202
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 17192)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 17202)
@@ -1856,6 +1856,7 @@
 		String sterilizationPurpose = StrutsParamUtils.getPraramValue("sterilizationPurpose1", null);
 		String sterilizerName = StrutsParamUtils.getPraramValue("sterilizerName1", null);
 		String frequency = StrutsParamUtils.getPraramValue("frequency1", null);
+		String sterilizationUser = StrutsParamUtils.getPraramValue("sterilizationUser1", null);
 		String sterilizationRecordFinishConfirmStr = StrutsParamUtils.getPraramValue("sterilizationRecordFinishConfirm", null);
 		boolean sterilizationRecordFinishConfirm = false;
 		if("true".equals(sterilizationRecordFinishConfirmStr)){
@@ -1867,7 +1868,7 @@
 		try {
 			obj = sterilizationRecordManager.saveInterfereSterilizationRecord(sterilizationRecord_id,
 					startDate, endDate, sterilizerName, status,sterilizationPurpose,sterilizationMethod,frequency,
-					sterilizationRecordFinishConfirm);
+					sterilizationUser,sterilizationRecordFinishConfirm);
 			response = StrutsParamUtils.getResponse();
 		} catch (Exception e) {
 			obj = JSONUtil.buildJsonObject(false, "干预出现异常失败.");
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
===================================================================
diff -u -r17192 -r17202
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java	(.../SterilizationRecordManager.java)	(revision 17192)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java	(.../SterilizationRecordManager.java)	(revision 17202)
@@ -143,7 +143,7 @@
 	 * @param sterilizationMethod
 	 * @param frequency
 	 */
-	public JSONObject saveInterfereSterilizationRecord(String sterilizationRecord_id,String startDate,String endDate,String sterilizationName,String status,String sterilizationPurpose,String sterilizationMethod,String frequency,boolean sterilizationRecordFinishConfirm);
+	public JSONObject saveInterfereSterilizationRecord(String sterilizationRecord_id,String startDate,String endDate,String sterilizationName,String status,String sterilizationPurpose,String sterilizationMethod,String frequency,String sterilizationUser,boolean sterilizationRecordFinishConfirm);
 	public void tousseConvertSterilizationRecord(Long tousseId,Long recordId,String isBasketConvert,Long reviewedBasketId,String sterilizationBasket);
 	/**
 	 * 获取灭菌记录信息
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r17192 -r17202
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 17192)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 17202)
@@ -2273,7 +2273,9 @@
 	/**
 	 * 灭菌记录干预  针对整条记录
 	 */
-	public JSONObject saveInterfereSterilizationRecord(String sterilizationRecord_id,String startDate,String endDate,String sterilizationName,String status,String sterilizationPurpose,String sterilizationMethod,String frequency,boolean sterilizationRecordFinishConfirm){
+	public JSONObject saveInterfereSterilizationRecord(String sterilizationRecord_id,String startDate,String endDate,
+			String sterilizationName,String status,String sterilizationPurpose,String sterilizationMethod,
+			String frequency,String sterilizationUser,boolean sterilizationRecordFinishConfirm){
 		JSONObject obj = new JSONObject();
 		try{
 			SterilizationRecord sr = getSterilizationRecordById(sterilizationRecord_id);
@@ -2409,6 +2411,7 @@
 					tousseInstance.setSterileFrequency(frequency);
 					tousseInstance.setSterileStartTime(startDate);
 					tousseInstance.setSterileEndTime(endDate);
+					tousseInstance.setSterilizationUser(sterilizationUser);
 					tousseInstanceManager.saveOrUpdate(tousseInstance);
 				}
 				// 如果配了灭菌完成确认，则灭菌完成改为灭菌中，需要清空灭菌确认人，确认标识，确认时间
@@ -2441,6 +2444,7 @@
 					tousseInstance.setSterileFrequency(frequency);
 					tousseInstance.setSterileStartTime(startDate);
 					tousseInstance.setSterileEndTime(endDate);
+					tousseInstance.setSterilizationUser(sterilizationUser);
 					tousseInstanceManager.saveOrUpdate(tousseInstance);
 				}
 			}
@@ -2461,6 +2465,7 @@
 			sr.setSterilizationPurpose(sterilizationPurpose);
 			sr.setSterilizationType(sterilizationMethod);
 			sr.setFrequency(fre);
+			sr.setSterilizationUser(sterilizationUser);
 			
 			saveOrUpdate(sr);
 		}catch(Exception e) {