Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r28921 -r28923
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 28921)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 28923)
@@ -3960,6 +3960,11 @@
             handler : save
         },{
             id : 'monitorBtn',
+            text : '保存',
+            hidden :true,
+            handler : saveMonitor
+        },{
+            id : 'save2',
             text : '暂存',
             hidden :!sstsConfig.enableSterilizationDraftStatus,
             handler : save2
@@ -4104,15 +4109,15 @@
                 top.Ext.getCmp('monitorAuditor').disable();
                 
                 if(sr.status == statusFailure && reSterilization == false){
-                    top.Ext.getCmp('monitorBtn').hide();
-                    top.Ext.getCmp('saveBtn').show();
+                    top.Ext.getCmp('monitorBtn').show();
+                    top.Ext.getCmp('saveBtn').hide();
                     top.Ext.getCmp('inputBarcode').setDisabled(true);
                     top.Ext.getCmp('biologicalMonitoringStartDate').setDisabled(true);
                     disableItems();
                 }
                 if(sr.status == statusInterrupt && reSterilization == false){
-                    top.Ext.getCmp('monitorBtn').hide();
-                    top.Ext.getCmp('saveBtn').show();
+                    top.Ext.getCmp('monitorBtn').show();
+                    top.Ext.getCmp('saveBtn').hide();
                     top.Ext.getCmp('inputBarcode').setDisabled(true);
                     disableItems();
                 }
@@ -4126,8 +4131,8 @@
                 top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(sr.biologicalMonitoringStartDate));  //生物监测的开始时间
                 top.Ext.getCmp('biologicalMonitoringEndDate').setValue(formatDateYear(sr.biologicalMonitoringEndDate));  //生物监测的结束时间
                 
-                top.Ext.getCmp('monitorBtn').hide();
-                top.Ext.getCmp('saveBtn').show();
+                top.Ext.getCmp('monitorBtn').show();
+                top.Ext.getCmp('saveBtn').hide();
                 disableItems();
             }
             
@@ -4158,16 +4163,26 @@
     if(sstsConfig.enableSterilizationDraftStatus){
         if((id && currentStatus == statusDraft)){
             top.Ext.getCmp('saveBtn').hide();
+            top.Ext.getCmp('monitorBtn').hide();
+            top.Ext.getCmp('save2').show();
+        }else if((id && currentStatus == statusFailure) || (id && currentStatus == statusEnd)){
+            top.Ext.getCmp('saveBtn').hide();
             top.Ext.getCmp('monitorBtn').show();
-        }else if((id && currentStatus !== statusDraft)){
+            top.Ext.getCmp('save2').hide();
+        }else if((id && currentStatus == statusInterrupt) || (id && currentStatus == statusBegin)){
+            top.Ext.getCmp('saveBtn').hide();
+            top.Ext.getCmp('monitorBtn').show();
+            top.Ext.getCmp('save2').hide();
+        }else {
             top.Ext.getCmp('saveBtn').show();
             top.Ext.getCmp('monitorBtn').hide();
+            top.Ext.getCmp('save2').show();
         }
     }
 
     //如果是编辑并且状态是灭菌完成或者登陆用户不属于供应室也不属于二级供应室
     if((id && currentStatus==statusEnd) || (id && currentStatus==statusFailure)  || orgUnitCoding == null || orgUnitCoding == ''){
-        top.Ext.getCmp('saveBtn').setDisabled(true);
+        //top.Ext.getCmp('saveBtn').setDisabled(true);
     }
     
     //重新灭菌
@@ -4198,8 +4213,8 @@
     top.Ext.getCmp('frequency').disable();
     top.Ext.getCmp('sterilizationType').disable();
     top.Ext.getCmp('sterilizationPurpose').disable();
-    top.Ext.getCmp('startDate').disable();
-    top.Ext.getCmp('endDate').disable();
+    //top.Ext.getCmp('startDate').disable();
+    //top.Ext.getCmp('endDate').disable();
     top.Ext.getCmp('parameter').disable();
 }
 
@@ -4324,6 +4339,7 @@
         var result = getItemTreeData();
         top.Ext.getCmp("sterilizationGoods").setValue(result);
         top.Ext.getCmp("delTousseJson").setValue(JSON.stringify(delTousseJson));
+        //top.Ext.getCmp("status").setValue('');
         var barcodePostionInfo = getBarcodePositionData();
         top.Ext.getCmp("barcodePositionInfo").setValue(barcodePostionInfo);
         Ext.getCmp("formSubmitResult").setValue(0);
@@ -4452,6 +4468,7 @@
         top.Ext.getCmp("sterilizationGoods").setValue(result);
         top.Ext.getCmp("delTousseJson").setValue(JSON.stringify(delTousseJson));
         var barcodePostionInfo = getBarcodePositionData();
+        //top.Ext.getCmp("status").setValue('');
         top.Ext.getCmp("barcodePositionInfo").setValue(barcodePostionInfo);
         Ext.getCmp("formSubmitResult").setValue(0);
         formObj.form