Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r26672 -r26676
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 26672)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 26676)
@@ -2691,7 +2691,7 @@
     @Override
     public JSONObject saveInterfereSterilizationRecord(String sterilizationRecord_id,String startDate,String endDate,
             String sterilizationName,String status,String sterilizationPurpose,String sterilizationMethod,
-            String frequency,String sterilizationUser,boolean sterilizationRecordFinishConfirm){
+            String frequency,String sterilizationUser,boolean sterilizationRecordFinishConfirm,String finishComfirmer, String srSituationComfirmer){
         JSONObject obj = new JSONObject();
         try{
             SterilizationRecord sr = getSterilizationRecordById(sterilizationRecord_id);
@@ -2874,6 +2874,8 @@
                     + ",status : " + sr.getStatus()
                     + ", purpose : " + sr.getSterilizationPurpose()
                     + ",frequency : " + sr.getFrequency()
+                    + ",finishComfirmer :" + sr.getFinishComfirmer()
+                    + ",srSituationComfirmer :" + sr.getSrSituationComfirmer()
                     );
             // 保存灭菌记录信息
             Sterilizer sterilizer =  sterilizerManager.getSterilizerByName(sterilizationName);
@@ -2885,7 +2887,10 @@
             sr.setSterilizationType(sterilizationMethod);
             sr.setFrequency(fre);
             sr.setSterilizationUser(sterilizationUser);
-            
+            sr.setFinishComfirmer(finishComfirmer);
+            if(sterilizationRecordFinishConfirm){
+            	sr.setSrSituationComfirmer(srSituationComfirmer);
+            }
             saveOrUpdate(sr);
         }catch(Exception e) {
             e.printStackTrace();
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
===================================================================
diff -u -r17202 -r26676
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js	(.../interfereSterilizationTab1.js)	(revision 17202)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js	(.../interfereSterilizationTab1.js)	(revision 26676)
@@ -1,4 +1,8 @@
-function showSterilizationRecordParams(id,curStatus,startDate,endDate,sterilizationPurpose,sterilizerName,frequency,sterilizationMethod,sterilizationUser){
+var confirmLabel = "灭菌情况确认人";
+if(sstsConfig.hasOwnProperty('isSRFinishConfirmShowUnload') && sstsConfig.isSRFinishConfirmShowUnload){
+    confirmLabel = "灭菌卸载确认人";
+}
+function showSterilizationRecordParams(id,curStatus,startDate,endDate,sterilizationPurpose,sterilizerName,frequency,sterilizationMethod,sterilizationUser,srSituationComfirmer,finishComfirmer){
 	// 灭菌程序store
 	var foldersJsonStore = new Ext.data.SimpleStore({
 		fields : [ 'id','cleaningMethod' ],
@@ -206,6 +210,31 @@
 								anchor : '100%',
 								allowBlank : false
 							}]
+						},{
+							columnWidth : .5,
+							layout : 'form',
+							cls:'edit-part2-labelwidth',
+							items : [{
+								id : 'finishComfirmer',
+								name : 'finishComfirmer',
+								xtype : 'textfield',
+								fieldLabel : '完成确认人',
+								anchor : '100%',
+								allowBlank : true
+							}]
+						},{
+							columnWidth : .5,
+							layout : 'form',
+							hidden : !sstsConfig.sterilizationRecordFinishConfirm,
+							cls:'edit-part2-labelwidth',
+							items : [{
+								id : 'srSituationComfirmer',
+								name : 'srSituationComfirmer',
+								xtype : 'textfield',
+								fieldLabel : confirmLabel,
+								anchor : '100%',
+								allowBlank : true
+							}]
 						}]
 					}],
 					buttons : [
@@ -270,7 +299,8 @@
 	top.Ext.getCmp('frequency1').setValue(frequency);
 	top.Ext.getCmp('sterilizationMethod1').setValue(sterilizationMethod);
 	top.Ext.getCmp('sterilizationUser1').setValue(sterilizationUser);
-	
+	top.Ext.getCmp('srSituationComfirmer').setValue(srSituationComfirmer);
+	top.Ext.getCmp('finishComfirmer').setValue(finishComfirmer);
 	tousseInstanceWindow.show();
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.jsp
===================================================================
diff -u -r23136 -r26676
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.jsp	(.../interfereSterilizationView1.jsp)	(revision 23136)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.jsp	(.../interfereSterilizationView1.jsp)	(revision 26676)
@@ -24,10 +24,9 @@
 <script type="text/javascript" src="${ctx }/dwr/interface/SterilizationRecordTableManager.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="interfereSterilizationView1.js"></script>
 <script type="text/javascript" src="interfereSterilizationTab1.js"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
-
 <!-- 引入灭菌记录页面 -->
 <script type="text/javascript" src="${ctx}/disinfectsystem/interfere/interfereRecordForm.js"></script>
 
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r26517 -r26676
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 26517)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 26676)
@@ -1553,6 +1553,8 @@
 		String frequency = StrutsParamUtils.getPraramValue("frequency1", null);
 		String sterilizationUser = StrutsParamUtils.getPraramValue("sterilizationUser1", null);
 		String sterilizationRecordFinishConfirmStr = StrutsParamUtils.getPraramValue("sterilizationRecordFinishConfirm", null);
+		String finishComfirmer = StrutsParamUtils.getPraramValue("finishComfirmer", null);
+		String srSituationComfirmer = StrutsParamUtils.getPraramValue("srSituationComfirmer", null);
 		boolean sterilizationRecordFinishConfirm = false;
 		if("true".equals(sterilizationRecordFinishConfirmStr)){
 			sterilizationRecordFinishConfirm = true;
@@ -1563,7 +1565,7 @@
 		try {
 			obj = sterilizationRecordManager.saveInterfereSterilizationRecord(sterilizationRecord_id,
 					startDate, endDate, sterilizerName, status,sterilizationPurpose,sterilizationMethod,frequency,
-					sterilizationUser,sterilizationRecordFinishConfirm);
+					sterilizationUser,sterilizationRecordFinishConfirm, finishComfirmer, srSituationComfirmer);
 			response = StrutsParamUtils.getResponse();
 		} catch (Exception e) {
 			obj = JSONUtil.buildJsonObject(false, "干预出现异常失败.");
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js
===================================================================
diff -u -r23215 -r26676
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js	(.../interfereSterilizationView1.js)	(revision 23215)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js	(.../interfereSterilizationView1.js)	(revision 26676)
@@ -1,5 +1,5 @@
 var grid;
-
+var sterilizationRecordFinishConfirm = sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm') && sstsConfig.sterilizationRecordFinishConfirm;
 function initQueryValueAndReload() {
 	$Id('parm_s_barcodeSearch').value = $Id('barcodeSearch').value;
 	grid.dwrReload();
@@ -61,11 +61,13 @@
 	var frequency = record.data.frequency;
 	var sterilizationMethod = record.data.sterilizationType;
 	var sterilizationUser = record.data.sterilizationUser;
+	var srSituationComfirmer = record.data.srSituationComfirmer;
+	var finishComfirmer = record.data.finishComfirmer;
 	var str = ""
 	if("灭菌完成"==status){
-	     str = "<input type=\"button\" value=\"修改灭菌参数\" onclick=\"openSterilizationRecord('"+record.data.id+"','"+status+"','"+startDate+"','"+endDate+"','"+sterilizationPurpose+"','"+sterilizerName+"','"+frequency+"','"+sterilizationMethod+"','"+sterilizationUser+"')\">"; 
+	     str = "<input type=\"button\" value=\"修改灭菌参数\" onclick=\"openSterilizationRecord('"+record.data.id+"','"+status+"','"+startDate+"','"+endDate+"','"+sterilizationPurpose+"','"+sterilizerName+"','"+frequency+"','"+sterilizationMethod+"','"+sterilizationUser+"','"+ srSituationComfirmer+"','"+ finishComfirmer + "')\">"; 
 	}else{
-	    str = "<input type=\"button\" value=\"修改灭菌参数\" onclick=\"showSterilizationRecordParams('"+record.data.id+"','"+status+"','"+startDate+"','"+endDate+"','"+sterilizationPurpose+"','"+sterilizerName+"','"+frequency+"','"+sterilizationMethod+"','"+sterilizationUser+"')\">";  
+	    str = "<input type=\"button\" value=\"修改灭菌参数\" onclick=\"showSterilizationRecordParams('"+record.data.id+"','"+status+"','"+startDate+"','"+endDate+"','"+sterilizationPurpose+"','"+sterilizerName+"','"+frequency+"','"+sterilizationMethod+"','"+sterilizationUser+"','"+srSituationComfirmer+"','"+finishComfirmer+ "')\">";  
 	}
 	
 //	if("灭菌完成"==status){
@@ -85,7 +87,7 @@
 }
 
 
-function openSterilizationRecord(id,status,startDate,endDate,sterilizationPurpose,sterilizerName,frequency,sterilizationMethod,sterilizationUser){
+function openSterilizationRecord(id,status,startDate,endDate,sterilizationPurpose,sterilizerName,frequency,sterilizationMethod,sterilizationUser,srSituationComfirmer,finishComfirmer){
     Ext.MessageBox.buttonText.yes="修改灭菌参数";  
     Ext.MessageBox.buttonText.no="增删器械包";  
     Ext.MessageBox.buttonText.cancel="取消";  
@@ -95,7 +97,7 @@
        buttons: Ext.MessageBox.YESNOCANCEL,  
        fn: function(btn){  
           if(btn=="yes"){
-              showSterilizationRecordParams(id,status,startDate,endDate,sterilizationPurpose,sterilizerName,frequency,sterilizationMethod,sterilizationUser)
+              showSterilizationRecordParams(id,status,startDate,endDate,sterilizationPurpose,sterilizerName,frequency,sterilizationMethod,sterilizationUser,srSituationComfirmer,finishComfirmer)
           }else if(btn == "no"){
               addAndEditSterilizationRecord(id,status,false)
           }
@@ -109,6 +111,7 @@
 			{header : "灭菌员",width : 60,dataIndex : 'sterilizationUser'},
 		    {header : "开始时间",width : 125,dataIndex : 'startDate'},
 		    {header : "确认完成人",width : 70,dataIndex : 'finishComfirmer'},
+		    {header : confirmLabel,width : 100,dataIndex : 'srSituationComfirmer',hidden:!sterilizationRecordFinishConfirm},
 		    {header : "结束时间",width : 125,dataIndex : 'endDate'},
 		    {header : "灭菌目的",width : 120,dataIndex : 'sterilizationPurpose'},
 		    {header : "灭菌炉",width : 160,dataIndex : 'sterilizerName'},
@@ -123,6 +126,7 @@
 	    {name : 'id'},
 	    {name : 'sterilizationUser'},
 	    {name : 'finishComfirmer'},
+	    {name : 'srSituationComfirmer'},
 	    {name : 'startDate'},
 	    {name : 'sterilizationPurpose'},
 	    {name : 'sterilizationType'},
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
===================================================================
diff -u -r25839 -r26676
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java	(.../SterilizationRecordManager.java)	(revision 25839)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java	(.../SterilizationRecordManager.java)	(revision 26676)
@@ -311,8 +311,10 @@
 	 * @param frequency			炉次
 	 * @param sterilizationUser  灭菌员
 	 * @param sterilizationRecordFinishConfirm 是否灭菌完成确认
+	 * @param srSituationComfirmer 灭菌卸载确认人
+	 * @param finishComfirmer 确认完成人
 	 */
-	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 JSONObject saveInterfereSterilizationRecord(String sterilizationRecord_id,String startDate,String endDate,String sterilizationName,String status,String sterilizationPurpose,String sterilizationMethod,String frequency,String sterilizationUser,boolean sterilizationRecordFinishConfirm,String finishComfirmer, String srSituationComfirmer);
 	
 	/**
 	 * 移动灭菌记录器械包保存.