Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r25611 -r25688
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 25611)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 25688)
@@ -1068,8 +1068,7 @@
 			
 			sql += " and po.departCoding in (" + departCodings + ")";
 		}
-		String handleDepartCoding = AcegiHelper.getLoginUser()
-				.getOrgUnitCodingFromSupplyRoomConfig();
+		String handleDepartCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
 		if (StringUtils.isNotBlank(handleDepartCoding)) {
 			sql += String.format(" and po.handleDepartCoding='%s'", handleDepartCoding);
 		}
@@ -1752,8 +1751,7 @@
 //								InvoicePlan.SIGNED_TRUE);
 //			}
 			LoginUserData loginUser = AcegiHelper.getLoginUser();
-			String userDeptCode = loginUser
-					.getOrgUnitCodingFromSupplyRoomConfig();
+			String userDeptCode = loginUser.getCurrentOrgUnitCode();
 			//外来器械跑代理灭菌流程(过滤二级供应室申请的外来器械申请单)
 			//外来器械包默认处理科室及任务组
 			JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = config.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(userDeptCode);