Index: ssts-web/src/main/webapp/WEB-INF/dwr.xml
===================================================================
diff -u -r14820 -r14951
--- ssts-web/src/main/webapp/WEB-INF/dwr.xml	(.../dwr.xml)	(revision 14820)
+++ ssts-web/src/main/webapp/WEB-INF/dwr.xml	(.../dwr.xml)	(revision 14951)
@@ -485,6 +485,11 @@
     	<param name="beanName" value="staffArchiveTableManager"></param>
     </create>
     
+    <!-- 用户IP地址段对应的默认科室配置 -->
+    <create creator="spring" javascript="UserIPAndOrgUnitMappingTableManager">
+      <param name="beanName" value="userIPAndOrgUnitMappingTableManager"/>
+    </create>
+    
     <convert match="com.forgon.disinfectsystem.returngoodsrecord.service.ReturnGoodsItemVO$PriceAmount" converter="bean"></convert>
     <convert match="com.forgon.disinfectsystem.vo.PriceAmount" converter="bean"></convert>
   </allow>
Index: ssts-web/src/main/webapp/openSystemMainPage.jsp
===================================================================
diff -u -r14770 -r14951
--- ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 14770)
+++ ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 14951)
@@ -2,9 +2,13 @@
 <%@ include file="/common/taglibs.jsp" %>
 <%@ page import="com.forgon.security.service.*,com.forgon.directory.vo.LoginUserData,com.forgon.tools.SpringBeanManger,com.forgon.security.service.OperationManager"%>
 <%@page import="com.forgon.systemsetting.service.HttpOptionManager,com.forgon.disinfectsystem.common.*"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.useripandorgunitmapping.service.UserIPAndOrgUnitMappingManager"%>
 <%@page import="java.util.List"%>
 <%
 LoginUserData loginUserData = AcegiHelper.getLoginUser();
+if(loginUserData.getDirectOrgUnitCodesWhereUserBelong().indexOf(";") > 0){
+	loginUserData = ((UserIPAndOrgUnitMappingManager)SpringBeanManger.getBean("userIPAndOrgUnitMappingManager")).setUserIPAndOrgUnitMapping(loginUserData);  //查看此用户是否跟科室绑定过IP地址
+}
 session.setAttribute("loginUserData",loginUserData);
 session.setAttribute("userName",loginUserData.getUserFullName());
 session.setAttribute("userId",loginUserData.getUserName());
Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
===================================================================
diff -u -r14913 -r14951
--- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml	(.../applicationContext-disinfectsystem-service.xml)	(revision 14913)
+++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml	(.../applicationContext-disinfectsystem-service.xml)	(revision 14951)
@@ -1885,4 +1885,26 @@
 	<bean id="staffArchiveManagerTarget"
 		class="com.forgon.disinfectsystem.basedatamanager.staffArchives.service.StaffArchiveManagerImpl">
 	</bean>
+	
+	<!-- 用户IP地址段对应的默认科室配置 -->
+	<bean id="userIPAndOrgUnitMappingManager"
+		class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager" ref="transactionManager" />
+		<property name="target">
+			<ref bean="userIPAndOrgUnitMappingManagerTarget" />
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="userIPAndOrgUnitMappingManagerTarget"
+		class="com.forgon.disinfectsystem.basedatamanager.useripandorgunitmapping.service.UserIPAndOrgUnitMappingManagerImpl">
+	</bean>
+	<bean id="userIPAndOrgUnitMappingTableManager"
+		class="com.forgon.disinfectsystem.basedatamanager.useripandorgunitmapping.dwr.UserIPAndOrgUnitMappingTableManager">
+	</bean>
+	
 </beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r14820 -r14951
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 14820)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 14951)
@@ -532,7 +532,8 @@
             {hidden :SSTS_SerialNumber,text:"流水号设置",href:WWWROOT+'/disinfectsystem/basedatamanager/serialnumconfig/serialNumConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_QualityItem,text:"质量监测项设置",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.jsp?type=质量监测',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Qualitymonitoring,text:"定期监测项设置",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.jsp?type=定期监测',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ImportBaseData,text:"导入导出基础数据",href:WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importBasedata.mhtml',hrefTarget:linkTarget,leaf:true}
+            {hidden :SSTS_ImportBaseData,text:"导入导出基础数据",href:WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importBasedata.mhtml',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ImportBaseData,text:"IP对应的默认科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingView.jsp',hrefTarget:linkTarget,leaf:true}  //用户当前科室的配置
 //            {hidden :false,text:"打印表单模板设置",href:WWWROOT+'/disinfectsystem/print/printForm.jsp',hrefTarget:linkTarget,leaf:true}
         ]
     },{