Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
===================================================================
diff -u -r32473 -r32475
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js	(.../proxyDisinfectionForm.js)	(revision 32473)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js	(.../proxyDisinfectionForm.js)	(revision 32475)
@@ -380,7 +380,7 @@
 							success: function (form, action) {
 								showResult(action.result.message);
 								window.close();
-								if (selectedRecords) {
+								if (Ext4.getCmp("todayHisPackingRecordPanel")) {
 									var store = Ext4.getCmp("todayHisPackingRecordPanel").getStore();
 									store.reload();
 								} else {
@@ -428,16 +428,26 @@
 					if (receiveTousse == true) {
 						var rootNode = top.Ext.getCmp('proxyDisinfectionTree').getRootNode();
 						var index = 0;
+						var boxIndex = 0;
+						var isBox = false;
 						rootNode.eachChild(function (pNode) {
-							if (pNode.attributes.barcode == barcode) {
-								pNode.remove();
+							if(pNode.attributes.type == '器械包'){
+								if (pNode.attributes.barcode == barcode) {
+									pNode.remove();
+									isBox = false;
+									return false;
+								}
+							}else {
+								isBox = true;
 								return false;
 							}
 							index++;
 						});
-						setTimeout(function () {
-							addTousseInstance(result.id, barcode, result.name, result.status, receiveTousse, index);
-						}, 100);
+						if(!isBox){
+							setTimeout(function () {
+								addTousseInstance(result.id, barcode, result.name, result.status, receiveTousse, index);
+							}, 100);
+						}
 					} else {
 						if (result.type == "器械包") {
 							if (result.isProxyed == true) {
@@ -830,7 +840,9 @@
 			if (pNode.attributes.type == '容器' && pNode.attributes.barcode == basketBarcode) {
 				basketNode = pNode;
 			} else if (pNode.attributes.type == '器械包') {
-				tousseNodes.push(pNode);
+				if(pNode.attributes.hasReceived == '是'){
+					tousseNodes.push(pNode);
+				}
 			}
 		});
 		if (basketNode == null) {