Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r29711 -r29747
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 29711)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 29747)
@@ -4291,7 +4291,11 @@
         }
     });
     
-    
+     //如果是编辑并且状态是灭菌完成或者登陆用户不属于供应室也不属于二级供应室
+    if((id && currentStatus==statusEnd) || (id && currentStatus==statusFailure)  || orgUnitCoding == null || orgUnitCoding == ''){
+        top.Ext.getCmp('saveBtn').setDisabled(true);
+    }
+    top.Ext.getCmp('inputBarcode').focus(false, 100);
     isNewRecord = reSterilization;
     if(sstsConfig.enableSterilizationDraftStatus){
         if((id && currentStatus == statusDraft)){
@@ -4300,42 +4304,56 @@
             top.Ext.getCmp('save2').show();
         }else if((id && currentStatus == statusFailure) || (id && currentStatus == statusEnd)){
             top.Ext.getCmp('saveBtn').show();
-            top.Ext.getCmp('monitorBtn').show();
+            top.Ext.getCmp('monitorBtn').hide();
             top.Ext.getCmp('save2').hide();
             //重新灭菌
             if(reSterilization){
                 top.Ext.getCmp('sterilizationRecordWin').setTitle("重新灭菌");
-                top.Ext.getCmp('monitorBtn').setDisabled(false);
-                top.Ext.getCmp('monitorBtn').setText("重新灭菌");
+                top.Ext.getCmp('saveBtn').setDisabled(false);
+                top.Ext.getCmp('saveBtn').setText("重新灭菌");
+                if(id && currentStatus==statusInterrupt){
+                    top.Ext.getCmp('continueBtn').show();
+                    top.Ext.getCmp('successBtn').show();
+                    top.Ext.getCmp('failureBtn').show();
+                    // 灭菌中断 没有重新灭菌按钮
+                    top.Ext.getCmp('saveBtn').hide();
+                }
             }
         }else if((id && currentStatus == statusInterrupt) || (id && currentStatus == statusBegin)){
             top.Ext.getCmp('saveBtn').show();
             top.Ext.getCmp('monitorBtn').hide();
             top.Ext.getCmp('save2').hide();
+            if(reSterilization){
+                top.Ext.getCmp('sterilizationRecordWin').setTitle("重新灭菌");
+                top.Ext.getCmp('saveBtn').setDisabled(false);
+                top.Ext.getCmp('saveBtn').setText("重新灭菌");
+                if(id && currentStatus==statusInterrupt){
+                    top.Ext.getCmp('continueBtn').show();
+                    top.Ext.getCmp('successBtn').show();
+                    top.Ext.getCmp('failureBtn').show();
+                    // 灭菌中断 没有重新灭菌按钮
+                    top.Ext.getCmp('saveBtn').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);
-    }
-    //重新灭菌
-    if(reSterilization){
-        top.Ext.getCmp('sterilizationRecordWin').setTitle("重新灭菌");
-        top.Ext.getCmp('saveBtn').setDisabled(false);
-        top.Ext.getCmp('saveBtn').setText("重新灭菌");
-        if(id && currentStatus==statusInterrupt){
-            top.Ext.getCmp('continueBtn').show();
-            top.Ext.getCmp('successBtn').show();
-            top.Ext.getCmp('failureBtn').show();
-            // 灭菌中断 没有重新灭菌按钮
-            top.Ext.getCmp('saveBtn').hide();
+    }else {
+        if(reSterilization){
+            top.Ext.getCmp('sterilizationRecordWin').setTitle("重新灭菌");
+            top.Ext.getCmp('saveBtn').setDisabled(false);
+            top.Ext.getCmp('saveBtn').setText("重新灭菌");
+            if(id && currentStatus==statusInterrupt){
+                top.Ext.getCmp('continueBtn').show();
+                top.Ext.getCmp('successBtn').show();
+                top.Ext.getCmp('failureBtn').show();
+                // 灭菌中断 没有重新灭菌按钮
+                top.Ext.getCmp('saveBtn').hide();
+            }
         }
     }
-    top.Ext.getCmp('inputBarcode').focus(false, 100);
 }
 function formatDateYear(v, p, record) {
     try {