Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r14519 -r14885 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 14519) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 14885) @@ -1,4 +1,4 @@ -<%@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.entity.packing.PackingTask"%> <%@page import="java.util.Map"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%> @@ -23,6 +23,7 @@ String orgUnitCoding = loginUser.getOrgUnitCodingFromSupplyRoomConfig(); String orgUnitName = loginUser.getOrgUnitNameCodingFromSupplyRoomConfig(); double toussePriceFluctuation = supplyRoomConfigManager.getSystemParamsObj().getToussePriceFluctuation(); + SupplyRoomConfig syscfg = supplyRoomConfigManager.getSystemParamsObj(); request.setAttribute("toussePriceFluctuation",toussePriceFluctuation); request.setAttribute("orgUnitName",orgUnitName); @@ -32,7 +33,7 @@ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); request.setAttribute("today", dateFormat.format(new Date())); request.setAttribute("hospitalName", loginUser.getHospitalName()); - request.setAttribute("foreignDefaultLabelpaper", loginUser.getForeignDefaultLabelpaper()); + request.setAttribute("foreignDefaultLabelpaper", syscfg.getBarcodePaperType()); %>