Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.jsp
===================================================================
diff -u -r12507 -r14885
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.jsp	(.../directPacking.jsp)	(revision 12507)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.jsp	(.../directPacking.jsp)	(revision 14885)
@@ -1,4 +1,4 @@
-<%@page import="java.util.Map"%>
+<%@page import="java.util.Map,com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
 <%@page import="com.forgon.disinfectsystem.common.Constants"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
@@ -12,12 +12,13 @@
 	SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
 	String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 	String orgUnitName = AcegiHelper.getLoginUser().getOrgUnitNameCodingFromSupplyRoomConfig();
+	SupplyRoomConfig  syscfg = supplyRoomConfigManager.getSystemParamsObj();
 	LoginUserData loginUser = AcegiHelper.getLoginUser();
 	request.setAttribute("orgUnitName",orgUnitName);
 	request.setAttribute("orgUnitCoding",orgUnitCoding);
 	request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
 	request.setAttribute("hospitalName", loginUser.getHospitalName());
-	request.setAttribute("foreignDefaultLabelpaper", loginUser.getForeignDefaultLabelpaper());
+	request.setAttribute("foreignDefaultLabelpaper", syscfg.getBarcodePaperType());
 %>