Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r29709 -r29959
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 29709)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 29959)
@@ -11316,14 +11316,14 @@
 				tousseInstanceSql.append(" and po.tousseFixedBarcode = 0 ");
 				
 				//超过失效期的不查出来
-				tousseInstanceSql.append(" and po.validUntil > "+ DatabaseUtil.getSqlNowDateTimeExpress(dbConnection));
+				tousseInstanceSql.append(String.format(" and (po.validUntil is null or po.validUntil > %s)", DatabaseUtil.getSqlNowDateTimeExpress(dbConnection)));
 				//处理预警期的根据科室供应室配置判断能否发货
 				Boolean warningTousseWhetherDelivery = config
 						.getWarningTousseWhetherDelivery();
 				if (warningTousseWhetherDelivery) {
 					
 				} else {
-					tousseInstanceSql.append(" and po.warningUntil > "+ DatabaseUtil.getSqlNowDateTimeExpress(dbConnection));
+					tousseInstanceSql.append(String.format(" and (po.warningUntil is null or po.warningUntil > %s)", DatabaseUtil.getSqlNowDateTimeExpress(dbConnection)));
 				}
 				//限制发货科室(根据器械包实例的科室编码或结算科室编码)(最新辅助发货已经限制发货科室,所以不用考虑该配置项了)
 				/*boolean limit = true;