Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
===================================================================
diff -u -r36058 -r36177
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 36058)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 36177)
@@ -3318,7 +3318,7 @@
 	 * @param departCoding 科室编码
 	 * @param applyDate 申请日期
 	 * @param appFormType 申请单类型
-	 * @param invoiceGroupByConfig 科室编码配置的字段名(即申请科室编码或结算科室编码)
+	 * @param invoiceGroupByConfig 科室编码配置的字段名(即申请科室编码或结算科室编码),config.js的配置项invoice_groupBy的配置值(即departCoding或settmentDepartCoding)
 	 * @param invoiceOrigin 发货数量依据
 	 * @param afterRecyclingTousseDeliver 是否回收后发货
 	 * @param limitInvoice 包定义的限制发货科室为是,则传true,否则为false
@@ -3434,7 +3434,7 @@
 						String.format("status='%s'" , TousseInstance.STATUS_STERILED),
 						warningTousseWhetherDelivery ? "1=1" : String.format("warningUntil>%s",dateQueryAdapter.dateAdapter(currentDateTime)),
 						String.format("validUntil>%s",dateQueryAdapter.dateAdapter(validUtilTodayCanInvoice ? currentDateOnly : currentDateTime)),
-						limitInvoice ? String.format("%s='%s'", invoiceGroupByConfig,departCoding) : "1=1",orgUnitCodingCondition
+						limitInvoice ? String.format("(%s is null or %s='%s')", invoiceGroupByConfig,invoiceGroupByConfig,departCoding) : "1=1",orgUnitCodingCondition
 					);
 
 				List<TousseInstance> canInvoiceTiList = new ArrayList<TousseInstance>();
@@ -3633,7 +3633,7 @@
 	 * @param departCoding 科室编码
 	 * @param applyDate 申请日期
 	 * @param appFormType 申请单类型
-	 * @param invoiceGroupByConfig 科室编码配置的字段名(即申请科室编码或结算科室编码)
+	 * @param invoiceGroupByConfig 科室编码配置的字段名(即申请科室编码或结算科室编码),config.js的配置项invoice_groupBy的配置值(即departCoding或settmentDepartCoding)
 	 * @param invoiceOrigin 发货数量依据
 	 * @param afterRecyclingTousseDeliver 是否回收后发货
 	 * @param limitInvoice 是否限制发货科室
@@ -3802,7 +3802,7 @@
 						String.format("status in ('%s','%s')" , TousseInstance.STATUS_DISINFECTED,TousseInstance.STATUS_STERILED),
 						warningTousseWhetherDelivery ? "1=1" : String.format("warningUntil>%s",dateQueryAdapter.dateAdapter(currentDateTime)),
 						String.format("validUntil>%s",dateQueryAdapter.dateAdapter(validUtilTodayCanInvoice ? currentDateOnly : currentDateTime)),
-						limitInvoice ? String.format("%s='%s'", invoiceGroupByConfig,departCoding) : "1=1",orgUnitCodingCondition
+						limitInvoice ? String.format("(%s is null or %s='%s')", invoiceGroupByConfig,invoiceGroupByConfig,departCoding) : "1=1",orgUnitCodingCondition
 					);
 
 				List<TousseInstance> canInvoiceTiList = new ArrayList<TousseInstance>();