Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32426 -r32431
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32426)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32431)
@@ -449,7 +449,7 @@
 			{header: '包装类型', dataIndex: 'packageType'},
 			{header: '装配时间', dataIndex: 'packTimeStr',width: 150},
 			{header: '灭菌方式', dataIndex: 'sterilingMode',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)},
-			{header: '已生成代理灭菌单', dataIndex: 'isTran',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && isFirstRoomPeople)},
+			{header: '已生成代理灭菌单', dataIndex: 'isTran',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)},
 			{header: '材料汇总', dataIndex: 'foreignMaterialsAmount',width: 200},
 			{header: '医生', dataIndex: 'doctor',width: 100}
 			]
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r32341 -r32431
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 32341)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 32431)
@@ -51,6 +51,10 @@
 	request.setAttribute("projectName", projectName);
 	request.setAttribute("fontSize",(loginUser == null || loginUser.getFontSize() == null) ? "12" : loginUser.getFontSize());
 	request.setAttribute("getPrintUserFullName",supplyRoomConfigManager.getSystemParamsObj().isPrintUserFullName());
+	String supplyRoomCoding = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
+	String supplyRoomName = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitName();
+    request.setAttribute("supplyRoomCoding", supplyRoomCoding);
+	request.setAttribute("supplyRoomName", supplyRoomName);
 	request.setAttribute("TEMPLATE_NAME_PREFIX",LabelTemplate.TEMPLATE_NAME_PREFIX);
 %>
 <head>
@@ -227,8 +231,8 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/js/jquery-message.js?version=${svnRevision}"></script>
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
 <script>
-	var currentDepartCoding = '<%=AcegiHelper.getLoginUser().getCurrentOrgUnitCode()%>';
-	var currentDepartName = '<%=AcegiHelper.getLoginUser().getCurrentOrgUnitName()%>';
+	var currentDepartCoding = '<%=request.getAttribute("supplyRoomCoding")%>';
+	var currentDepartName = '<%=request.getAttribute("supplyRoomName")%>';
 	var entityName = '代理灭菌';
 	var editMode = true;
 	var SSTS_ProxyDisinfection_Update = true;
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp
===================================================================
diff -u -r32339 -r32431
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp	(.../proxyDisinfectionView.jsp)	(revision 32339)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp	(.../proxyDisinfectionView.jsp)	(revision 32431)
@@ -1,7 +1,12 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%
-    request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+	SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+	String supplyRoomCoding = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
+	String supplyRoomName = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitName();
+    request.setAttribute("supplyRoomCoding", supplyRoomCoding);
+	request.setAttribute("supplyRoomName", supplyRoomName);
 %>
 <html>
 <head>
@@ -45,8 +50,8 @@
 enableSaveBtn = true;
 </c:if>
 
-var currentDepartCoding = '<%=AcegiHelper.getLoginUser().getCurrentOrgUnitCode()%>';
-var currentDepartName = '<%=AcegiHelper.getLoginUser().getCurrentOrgUnitName()%>';
+var currentDepartCoding = '<%=request.getAttribute("supplyRoomCoding")%>';
+var currentDepartName = '<%=request.getAttribute("supplyRoomName")%>';
 </script>
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css?version=${svnRevision}"></link>
