Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r24106 -r24108
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 24106)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 24108)
@@ -808,11 +808,21 @@
     rootNode.eachChild(function(pNode){
         var pType = pNode.attributes.type;
         if(pType == '篮筐'){
-            tousseStr = "篮筐";
             pNode.eachChild(function(cNode){
-                var pTousseName = cNode.attributes.barcode;
-                
-
+            	//如果不为不追溯的包,则将灭菌方式加入至数组
+                if(!cNode.attributes.unTraceable){
+                	var sterilingMode = cNode.attributes.sterilingMode;
+                	//灭菌方式为空时,则判断是否有加过
+                	if(!sterilingMode){
+                		if(!alreadyAndBlankSterilingMode){
+    	            		resultArray.push("");
+    	            		alreadyAndBlankSterilingMode = true;
+                		}
+                	}else if(!sterilingModeObject[sterilingMode]){
+                		resultArray.push(sterilingMode);
+                		sterilingModeObject[sterilingMode] = sterilingMode;
+                	}
+                }               
             });
         }else if(pType == '器械包'){
         	//如果不为不追溯的包,则将灭菌方式加入至数组
@@ -1449,7 +1459,7 @@
                                 var newChildNodes = new Array();
                                 pNode.eachChild(function(cNode){
                                     if(cNode.attributes.objBarcode != barcode){
-                                        newChildNodes.push(createPendingSterilizationGoodsNode(cNode.attributes.objBarcode, cNode.attributes.objName, cNode.attributes.objAmount, cNode.attributes.type, cNode.attributes.depart, cNode.attributes.reviewTime));
+                                        newChildNodes.push(createPendingSterilizationGoodsNode(cNode.attributes.objBarcode, cNode.attributes.objName, cNode.attributes.objAmount, cNode.attributes.type, cNode.attributes.depart, cNode.attributes.reviewTime, cNode.attributes.sterilingMode));
                                     }
                                 });
                                 if(newChildNodes.length != 0){
@@ -1486,6 +1496,7 @@
     var depart = clickNode.attributes.depart;
     var reviewTime = clickNode.attributes.reviewTime;
     var amount = clickNode.attributes.amount;
+    var sterilingMode = clickNode.attributes.sterilingMode;
     var countAmount=0
     var array = new Array();
     var isBasketUrgent = false;  //篮筐是否加急
@@ -1516,7 +1527,7 @@
         type = 'TOUSSE';
     }
 
-    var node = createPendingSterilizationGoodsNode(objBarcode, objName, countAmount==0?1:countAmount, type, depart, reviewTime);
+    var node = createPendingSterilizationGoodsNode(objBarcode, objName, countAmount==0?1:countAmount, type, depart, reviewTime , sterilingMode);
     if(type == 'TOUSSE'){
         var isUrgent = '否';
         DWREngine.setAsync(false);
@@ -1555,9 +1566,10 @@
  * @param type          类型(值为“BASKET”或者“TOUSSE”或者“TOUSSE_IN”，分别表示“篮筐”、“没入篮筐的器械包”、“入灭菌筐的器械包”)
  * @param depart        科室
  * @param reviewTime    审核时间
+ * @param sterilingMode 灭菌方式
  * @returns
  */
-function createPendingSterilizationGoodsNode(objBarcode, objName, objAmount, type, depart, reviewTime) {
+function createPendingSterilizationGoodsNode(objBarcode, objName, objAmount, type, depart, reviewTime , sterilingMode) {
     var node;
     if(type == 'BASKET'){
         //创建父节点
@@ -1585,6 +1597,7 @@
     node.attributes.objAmount=objAmount;
     node.attributes.type=type;
     node.attributes.reviewTime=reviewTime;
+    node.attributes.sterilingMode=sterilingMode;
     return node;
 }
 
@@ -1676,6 +1689,7 @@
     var type = clickNode.attributes.type;
     var depart = clickNode.attributes.depart;
     var reviewTime = clickNode.attributes.reviewTime;
+    var sterilingMode = clickNode.attributes.sterilingMode;
     var amount = parseInt(clickNode.attributes.amount);
     var delAmount = clickNode.attributes.amount
     var fixedBarcode = clickNode.attributes.barcode
@@ -1696,12 +1710,12 @@
                 var amountRight = parseInt(pNode.attributes.objAmount);//右边的数量
                 var rootNode2 = sterilizationColumnTree.getRootNode();
                 removePendingSterilizationGoods(fixedBarcode)//删除右边的数据
-                node = createPendingSterilizationGoodsNode(fixedBarcode,objName,amount+amountRight,'TOUSSE','',reviewTime)
+                node = createPendingSterilizationGoodsNode(fixedBarcode,objName,amount+amountRight,'TOUSSE','',reviewTime,sterilingMode)
             }else{
                 if(stockAmount<0 || isNaN(stockAmount)){
                     stockAmount = 0;
                 }
-                node = createPendingSterilizationGoodsNode(fixedBarcode,objName,parseInt(stockAmount)+parseInt(amount),'TOUSSE','',reviewTime)
+                node = createPendingSterilizationGoodsNode(fixedBarcode,objName,parseInt(stockAmount)+parseInt(amount),'TOUSSE','',reviewTime,sterilingMode)
             }
         }
     });