Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r36346 -r36353
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 36346)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 36353)
@@ -643,6 +643,7 @@
 function statisticsTousseAndBasket() {
     var rootNode = sterilizationColumnTree.getRootNode();  //灭菌物品columnTree的根节点
     var basketAmount = 0;  //篮筐数量
+    var isDoubleCheckOfSterilization = '否';
     var tousseNameOfAmount = {};  //器械包名称和数量
     var statisticsAmount = { '篮筐': 0, '器械包': 0, '敷料包': 0, '外来器械包': 0, '代理灭菌包': 0, '灭菌物品总数量': 0, '植入物': 0 };
     rootNode.eachChild(function (pNode) {
@@ -662,11 +663,11 @@
     });
     top.Ext.getCmp('totalAmount').setText("灭菌物品总数量:" + (statisticsAmount['灭菌物品总数量']));
     if (sstsConfig.enableDoubleCheckOfSterilizationFunction) {
-        var isDoubleCheckOfSterilization = top.Ext.getCmp('isDoubleCheckOfSterilization').getValue();
+        isDoubleCheckOfSterilization = top.Ext.getCmp('isDoubleCheckOfSterilization').getValue();
         if (isDoubleCheckOfSterilization !== '是') {
             top.Ext.getCmp('checkTousseAmount').setValue(statisticsAmount['灭菌物品总数量']);
+            top.Ext.getCmp('hiddenCheckTousseAmount').setValue(statisticsAmount['灭菌物品总数量']);
         }
-        top.Ext.getCmp('hiddenCheckTousseAmount').setValue(statisticsAmount['灭菌物品总数量']);
     }
     top.Ext.getCmp('typeTotalAmount').setText(
         "篮筐:" + statisticsAmount['篮筐'] +
@@ -679,9 +680,13 @@
     tousseItemCountJsonStore.removeAll();
     for (var key in tousseNameOfAmount) {
         if (tousseNameOfAmount.hasOwnProperty(key)) {  //过滤掉非“tousseNameOfAmount”本对象的属性比较严谨一些
+            var count = tousseNameOfAmount[key];
+            if(isDoubleCheckOfSterilization == '是'){
+                count = ''
+            }
             tousseItemCountJsonStore.add(new tousseItemCountRecord({
                 tousseName: key,
-                count: tousseNameOfAmount[key]
+                count: count
             }));
         }
     }
@@ -2735,7 +2740,11 @@
     var children = [];
     if (type == '篮筐') {
         type = 'BASKET';
-        var urgentInfoMap = null;
+        var childObjBarcodes = [];
+        clickNode.eachChild(function(pNode){
+        	var childObjBarcode = pNode.attributes.barcode;
+        	childObjBarcodes.push(childObjBarcode);
+        });
         DWREngine.setAsync(false);
         //如果灭菌程序不能添加器械包，要清除灭菌物品列表
         SterilizationRecordTableManager.isTousseUrgent(null, childObjBarcodes, function (res) {
@@ -3057,7 +3066,7 @@
     });
     sterilizationColumnTreeColumnArray.push({ header: '名称', width: 120, dataIndex: 'name' });
     sterilizationColumnTreeColumnArray.push({ header: '库存', dataIndex: 'stockAmount', width: 0, hidden: true });
-    sterilizationColumnTreeColumnArray.push({ header: '数量', dataIndex: 'amount', width: 50 });
+    sterilizationColumnTreeColumnArray.push({ header: '数量', dataIndex: 'amount', width: 50});
     sterilizationColumnTreeColumnArray.push({ header: '灭菌方式', dataIndex: 'sterilingMode', width: 60 });
     sterilizationColumnTreeColumnArray.push({ header: '是否不追溯', dataIndex: 'unTraceable', width: 10, hidden: true });
 
@@ -3992,23 +4001,23 @@
                                                         top.Ext.getCmp("checkTousseAmount").getEl().dom.readOnly = true;
                                                         top.Ext.getCmp('isDoubleCheckOfSterilization').setValue('否');
                                                         statisticsTousseAndBasket();
-                                                        top.Ext.getCmp('typeTotalAmount').show();
                                                         top.Ext.getCmp('checkTousseAmount').allowBlank = true;
                                                         top.Ext.getCmp('reviewerName').allowBlank = true;
                                                         top.Ext.getCmp('verifierName').allowBlank = true;
                                                         top.Ext.getCmp('doubleCheckOfSterilizationBox').hide();
                                                         top.Ext.getCmp('totalAmount').show();
+
                                                     } else {
                                                         top.Ext.getCmp("checkTousseAmount").getEl().dom.readOnly = false;
                                                         top.Ext.getCmp('isDoubleCheckOfSterilization').setValue(result.data.isDoubleCheckOfSterilization);
-                                                        top.Ext.getCmp('typeTotalAmount').hide();
                                                         top.Ext.getCmp('checkTousseAmount').allowBlank = false;
                                                         top.Ext.getCmp('reviewerName').allowBlank = false;
                                                         top.Ext.getCmp('verifierName').allowBlank = false;
                                                         top.Ext.getCmp('doubleCheckOfSterilizationBox').show();
                                                         top.Ext.getCmp('totalAmount').hide();
                                                     }
                                                     top.Ext.getCmp('formDefinitionItems').doLayout();
+                                                    statisticsTousseAndBasket();
                                                 }
                                             }
                                         }
@@ -4630,10 +4639,13 @@
                                                         var result = Ext.decode(response.responseText);
                                                         if (result.success) {
                                                             var name = result.data.name;
+                                                            var id = result.data.id;
                                                             top.Ext.getCmp('reviewerName').setRawValue(name);
+                                                            top.Ext.getCmp('userIdOfReviewer').setValue(id);
                                                         } else {
                                                             showMultipleResult(result.message);
                                                             top.Ext.getCmp('reviewerName').setRawValue('');
+                                                            top.Ext.getCmp('userIdOfReviewer').setValue('');
                                                         }
                                                     }
                                                 });
@@ -4684,10 +4696,13 @@
                                                         var result = Ext.decode(response.responseText);
                                                         if (result.success) {
                                                             var name = result.data.name;
+                                                            var id = result.data.id;
                                                             top.Ext.getCmp('verifierName').setRawValue(name);
+                                                            top.Ext.getCmp('userIdOfVerifier').setValue(id);
                                                         } else {
                                                             showMultipleResult(result.message);
                                                             top.Ext.getCmp('verifierName').setRawValue('');
+                                                            top.Ext.getCmp('userIdOfVerifier').setValue('');
                                                         }
                                                     }
                                                 });
@@ -5816,23 +5831,20 @@
                         top.Ext.getCmp("checkTousseAmount").getEl().dom.readOnly = true;
                         top.Ext.getCmp('isDoubleCheckOfSterilization').setValue(sr.sterilizer.isDoubleCheckOfSterilization);
                         statisticsTousseAndBasket();
-                        top.Ext.getCmp('typeTotalAmount').show();
                         top.Ext.getCmp('checkTousseAmount').allowBlank = true;
                         top.Ext.getCmp('reviewerName').allowBlank = true;
                         top.Ext.getCmp('verifierName').allowBlank = true;
                         top.Ext.getCmp('doubleCheckOfSterilizationBox').hide();
-                        top.Ext.getCmp('totalAmount').show();
                     } else {
                         top.Ext.getCmp("checkTousseAmount").getEl().dom.readOnly = false;
                         top.Ext.getCmp('checkTousseAmount').setValue(sr.checkTousseAmount || '');
                         top.Ext.getCmp('isDoubleCheckOfSterilization').setValue(sr.sterilizer.isDoubleCheckOfSterilization);
-                        top.Ext.getCmp('typeTotalAmount').hide();
                         top.Ext.getCmp('checkTousseAmount').allowBlank = false;
                         top.Ext.getCmp('reviewerName').allowBlank = false;
                         top.Ext.getCmp('verifierName').allowBlank = false;
                         top.Ext.getCmp('doubleCheckOfSterilizationBox').show();
-                        top.Ext.getCmp('totalAmount').hide();
                     }
+                    top.Ext.getCmp('formDefinitionItems').doLayout();
                     if(sr.reviewers){
                         top.Ext.getCmp('reviewerName').setRawValue(sr.reviewers.fullName);
                         top.Ext.getCmp('userIdOfReviewer').setValue(sr.reviewers.id);