Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
===================================================================
diff -u -r16508 -r16512
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java	(.../ProxyDisinfectionAction.java)	(revision 16508)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java	(.../ProxyDisinfectionAction.java)	(revision 16512)
@@ -379,7 +379,7 @@
 			if (barcodeDevice != null
 					&& barcodeDevice instanceof TousseInstance) {
 				TousseInstance tousseInstance = (TousseInstance) barcodeDevice;
-				String departCodeOfTousse = tousseInstance.getDepartCoding();
+				String departCodeOfTousse = tousseInstance.getOrgUnitCoding();
 				if (StringUtils.isNotEmpty(departCodeOfTousse)
 						&& StringUtils.equals(departCodeOfTousse, AcegiHelper.getCurrentOrgUnitCode())) {
 					message = "此器械包为本科室装配，无需录入代理灭菌记录";
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp
===================================================================
diff -u -r12331 -r16512
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp	(.../proxyDisinfectionView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp	(.../proxyDisinfectionView.jsp)	(revision 16512)
@@ -42,6 +42,8 @@
 <c:if test="${not empty param.editMode}">
 enableSaveBtn = true;
 </c:if>
+
+var currentDepartCoding = '<%=AcegiHelper.getLoginUser().getCurrentOrgUnitCode()%>';
 </script>
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
===================================================================
diff -u -r16510 -r16512
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js	(.../proxyDisinfectionView.js)	(revision 16510)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js	(.../proxyDisinfectionView.js)	(revision 16512)
@@ -785,41 +785,52 @@
 								showResult(result.containerName + "已经扫描");
 								return false;
 							}
-							var orgUnitCode = result.produceDeptCode;
-							var orgUnitName = result.produceDeptName;
-							var departCodingCmp = top.Ext.getCmp('departCoding');
 							top.Ext.getCmp('basketBarcode').setValue(barcode);
 							var remark = top.Ext.getCmp('remark').getValue();
 							remark = barcode+";"+remark;
 							top.Ext.getCmp('remark').setValue(remark);
 							top.Ext.getCmp('reviewedBasketId').setValue(result.basketId);
 							top.Ext.getCmp('basketName').setValue(result.containerName);
 							
-							if(departCodingCmp.getValue() == ''){
-								departCodingCmp.setValue(orgUnitCode);
-								top.Ext.getCmp('depart').setValue(orgUnitName);
-								bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
-							}else if(departCodingCmp.getValue() != orgUnitCode){
-								top.Ext.MessageBox.confirm("请确认","该灭菌筐属于"+orgUnitName+",是否将申请科室改为"+orgUnitName+"并清空器械包明细列表?",
-									function(button, text) {
-										if ("yes" == button){
-											departCodingCmp.setValue(orgUnitCode);
-											top.Ext.getCmp('depart').setValue(orgUnitName);
-											clearGoodsGrid();
-											bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
+							var orgUnitCode = result.produceDeptCode;
+							var orgUnitName = result.produceDeptName;
+							if(currentDepartCoding != orgUnitCode){
+								var departCodingCmp = top.Ext.getCmp('departCoding');
+								if(departCodingCmp.getValue() == ''){
+									departCodingCmp.setValue(orgUnitCode);
+									top.Ext.getCmp('depart').setValue(orgUnitName);
+									bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);									
+								}else if(departCodingCmp.getValue() != orgUnitCode){
+									top.Ext.MessageBox.confirm("请确认","该灭菌筐属于"+orgUnitName+",是否将申请科室改为"+orgUnitName+"并清空器械包明细列表?",
+										function(button, text) {
+											if ("yes" == button){
+												departCodingCmp.setValue(orgUnitCode);
+												top.Ext.getCmp('depart').setValue(orgUnitName);
+												clearGoodsGrid();
+												bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
+											}
 										}
-									}
-								);
-							}else{
-								bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
+									);
+								}else{
+									bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
+								}
 							}
 						}else{
-							showResult('代理灭菌入筐只能使用灭菌筐。');
+							if(result.message){
+								showResult(result.message);
+							}else{
+								showResult('代理灭菌入筐只能使用灭菌筐。');
+							}
+							
 						}
 						
 					}
 				}else{
-					showResult('请扫描器械包或者篮筐条码！');
+					if(result.message){
+						showResult(result.message);
+					}else{
+						showResult('请扫描器械包或者篮筐条码！');
+					}
 				}
 
 			},