Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
===================================================================
diff -u -r28611 -r28613
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 28611)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 28613)
@@ -4239,6 +4239,7 @@
 		/**
 		 * 申请项过滤条件:
 		 * 1.所在的申请单表的条件:
+		 *  1.0处理科室编码过滤
 		 * 	1.1过滤的科室编码:(申请或结算科室编码,默认为申请科室编码,以配置为准)为该科室,受invoiceGroupByConfig和departCoding参数控制
 		 *  1.2终止状态不为已终止(固定写上,不受任何参数控制)
 		 *  1.3申请单类型:受invoiceTypeList参数控制
@@ -4247,6 +4248,7 @@
 		 *  1.6打印状态:受hideUnprintedDisposableGoodsInvoicePlan参数影响,如果单类型是一次性物品申请,则打印状态不为已打印的不显示
 		 *  1.7.借物单审核状态(只能为null或不为未审核,前提是有包含借物单的话)
 		 */
+		String handleDepartCodingCondition = String.format("invoicePlan.handleDepartCoding='%s'",AcegiHelper.getCurrentOrgUnitCode());
 		String departCodingCondition = String.format("invoicePlan.%s='%s'",InvoiceUtils.getInvoiceGroupByConfig(),departCoding);
 		//单类型过滤条件
 		String typeCondition = "1=1";
@@ -4312,6 +4314,7 @@
 		}
 		/*
 		 * 条件如下:
+		 * 0.处理科室编码过滤
 		 * 1.过滤的科室编码:(申请或结算科室编码,默认为申请科室编码,以配置为准)为该科室,受invoiceGroupByConfig和departCoding参数控制
 		 * 2.终止状态不为已终止(固定写上,不受任何参数控制)
 		 * 3.申请单类型:受invoiceTypeList参数控制
@@ -4320,8 +4323,8 @@
 		 * 6.打印状态:受hideUnprintedDisposableGoodsInvoicePlan参数影响,如果单类型是一次性物品申请,则打印状态不为已打印的不显示
 		 * 7.借物单审核状态(只能为null或不为未审核)
 		 */
-		String invoicePlanCondition = String.format(" %s and (invoicePlan.endStatus is null or invoicePlan.endStatus <> '%s') "
-				+ "and %s and %s and %s and %s and %s", departCodingCondition,InvoicePlan.STATUS_END,
+		String invoicePlanCondition = String.format(" %s and %s and (invoicePlan.endStatus is null or invoicePlan.endStatus <> '%s') "
+				+ "and %s and %s and %s and %s and %s", handleDepartCodingCondition,departCodingCondition,InvoicePlan.STATUS_END,
 				typeCondition,deliverStatusCondition,recyclingStatusCondition,printedCondition,borrowConfirmStatusCondition
 				);
 		if(DatabaseUtil.isPoIdValid(invoicePlanId)){