Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r21875 -r21886
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 21875)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 21886)
@@ -1457,6 +1457,7 @@
  * @param addAmount 修改后数量 - 修改前的数量 = 新增的数量
  */
 function addTousseInsAmount(fixedBarcode,addAmount){
+    top.Ext.getCmp('saveBtn').disable();//删除可能比较慢，先禁用保存按钮
     Ext.Ajax.request({
         url :  WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!fixedBarcodeBarcodeAdd.do',
         params : {
@@ -1473,6 +1474,7 @@
             }else{
                 showResult("增加数量失败，请勿提交数据");
             }
+            top.Ext.getCmp('saveBtn').enable();
         },
         failure : function(response, options) {
             showResult("系统发生异常，请勿提交数据");
@@ -1561,6 +1563,7 @@
  * @param fixedBarcode
  */
 function delTousseInsAmount(delAmount,fixedBarcode){
+    top.Ext.getCmp('saveBtn').disable();//删除可能比较慢，先禁用保存按钮
     Ext.Ajax.request({
         url :  WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!fixedBarcodeBarcodeSubtraction.do',
         params : {
@@ -1583,6 +1586,7 @@
             }else{
                 showResult("减少数量失败，请勿提交数据");
             }
+            top.Ext.getCmp('saveBtn').enable();//成功删除全部后，启用保存按钮
         },
         failure : function(response, options) {
             showResult("后台运行异常,请稍候再试...");
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r21875 -r21886
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 21875)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 21886)
@@ -3086,9 +3086,10 @@
                     amt++;
                     obj.put("amount", amt);
                     obj.put("barcode", tousseInstanceManager.getTousseInsFixedBarcode(tousseName));//固定条码
+                    
                     //覆盖
                     bMap.put(key, obj);
-                }else{//下一个~
+                }else{
                     JSONObject jsonObj = new JSONObject();
                     jsonObj.put("isParentNode", true);
                     jsonObj.put("barcode", tousse.getBarcode());
@@ -3104,11 +3105,13 @@
                     if(!isCountBarcode){
                         bMap.put(tousse.getBarcode(), jsonObj);  
                     }else{
+                        jsonObj.put("barcode", tousseInstanceManager.getTousseInsFixedBarcode(tousseName));//固定条码
                         bMap.put(key, jsonObj);
                     }
                 }
                
             }
+            
             for (String str : bMap.keySet()) {
                 JSONObject  tousseInBasket=bMap.get(str);
                 jsonArray.add(tousseInBasket);
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r21875 -r21886
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 21875)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 21886)
@@ -3345,10 +3345,12 @@
         }
         
         
+        
         //此固定条码下所有的包实例条码
-        List<String> barcodeList =getTousseInsDataByFixedBarcode(fixedBarcode,"","灭菌记录"); 
+        List<String> barcodeList =getTousseInsDataByFixedBarcode(fixedBarcode,"","灭菌中"); 
         
         
+        
         //筛选符合删除条件的条码
         oldBarcodesList.retainAll(barcodeList); 
         
@@ -3579,7 +3581,6 @@
                         amt++;
                         obj.put("objAmount", amt);
                         obj.put("objBarcode", getTousseInsFixedBarcode(objName));
-
                         //覆盖
                         bMap.put(key, obj);
                     }else{
@@ -3757,6 +3758,7 @@
         if(StringUtils.isNotBlank(idStr)){
             td = (TousseDefinition) objectDao.getByProperty(TousseDefinition.class.getSimpleName(), "id", Long.parseLong(idStr));
         }
+       //String betweenSql = String.format(" and %s ", dateQueryAdapter.dateAreaSql("r.enteringDate", startDate, endDate));
         String userCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
         if(null!=td){
             String findSql = "";
@@ -3785,12 +3787,15 @@
             if(type.indexOf("灭菌记录")!=-1 || type.indexOf("灭菌装载")!=-1){//添加灭菌记录扫固定条码、灭菌装载
                 findSql+="  and status = '"+TousseInstance.STATUS_REVIEWED+"'";//已审核
             }
-            if(type.indexOf("灭菌中")!=-1){
+            if(type.indexOf("灭菌中")!=-1){//对应固定条码删除的方法，可能是处于灭菌中的，也可能是已审核的
                 findSql+="  and status = '"+TousseInstance.STATUS_STERILING+"'";//灭菌记录详情需要用到的
+                findSql+="  or status = '"+TousseInstance.STATUS_REVIEWED+"'";//已审核
             }
             if(type.indexOf("审核")!=-1){
                 findSql+="  and status = "+TousseInstance.STATUS_PACKED+"";//已装配
             }
+            
+            
             ResultSet rs = objectDao.executeSql(findSql);
             List<String> barcodeList = new ArrayList<String>();
             try {