Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp =================================================================== diff -u -r14297 -r14885 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp (.../reviewView.jsp) (revision 14297) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp (.../reviewView.jsp) (revision 14885) @@ -1,4 +1,5 @@ <%@page import="com.forgon.directory.vo.LoginUserData"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance" %> <%@ page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container" %> @@ -16,11 +17,13 @@ <% SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); + SupplyRoomConfig syscfg = supplyRoomConfigManager.getSystemParamsObj(); + LoginUserData loginUser = AcegiHelper.getLoginUser(); request.setAttribute("userName",loginUser.getUserFullName()); request.setAttribute("fontSize",loginUser.getFontSize() == null?"12":loginUser.getFontSize()); request.setAttribute("hospitalName", loginUser.getHospitalName()); - request.setAttribute("foreignDefaultLabelpaper", loginUser.getForeignDefaultLabelpaper()); + request.setAttribute("foreignDefaultLabelpaper", syscfg.getBarcodePaperType()); %> <%@ include file="/common/includeExtJsAndCss.jsp"%> Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp =================================================================== diff -u -r12331 -r14885 --- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 14885) @@ -1,4 +1,5 @@ -<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier,com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%> +<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> <%@ include file="/common/includeExtJsAndCss.jsp"%> @@ -32,9 +33,12 @@ <% + SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); LoginUserData loginUser = AcegiHelper.getLoginUser(); + SupplyRoomConfig syscfg = supplyRoomConfigManager.getSystemParamsObj(); + request.setAttribute("hospitalName", loginUser.getHospitalName()); - request.setAttribute("foreignDefaultLabelpaper", loginUser.getForeignDefaultLabelpaper()); + request.setAttribute("foreignDefaultLabelpaper", syscfg.getBarcodePaperType()); %>