Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ExpressInvoicePlanManagerImpl.java
===================================================================
diff -u -r26620 -r27450
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ExpressInvoicePlanManagerImpl.java	(.../ExpressInvoicePlanManagerImpl.java)	(revision 26620)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ExpressInvoicePlanManagerImpl.java	(.../ExpressInvoicePlanManagerImpl.java)	(revision 27450)
@@ -274,7 +274,7 @@
 				TousseInstance.class.getSimpleName(),TousseDefinition.class.getSimpleName(),
 				tousseDefinition.getId(),AcegiHelper.getCurrentOrgUnitCode(),
 				TousseInstance.STATUS_STERILED,sourceWarehouseId,validUntilSqlExpress,
-				supplyRoomConfig.getWarningTousseWhetherDelivery() == null || supplyRoomConfig.getWarningTousseWhetherDelivery().booleanValue() == false ? " and warningUntil > " + dateQueryAdapter.getTodayAdapter() : "",
+				supplyRoomConfig.getWarningTousseWhetherDelivery() == null || supplyRoomConfig.getWarningTousseWhetherDelivery().booleanValue() == false ? " and (warningUntil is null or warningUntil > " + dateQueryAdapter.getTodayAdapter() + ")" : "",
 				isLimitInvoiceDepart ? " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.departCoding", departCodeList) : "",	
 				isLimitInvoiceDepart ? " group by ti.departCoding " : ""
 				);
@@ -503,7 +503,7 @@
 				TousseInstance.class.getSimpleName(),TousseDefinition.class.getSimpleName(),
 				tousseDefinition.getId(),AcegiHelper.getCurrentOrgUnitCode(),
 				TousseInstance.STATUS_DISINFECTED,sourceWarehouseId,validUntilSqlExpress,
-				supplyRoomConfig.getWarningTousseWhetherDelivery() == null || supplyRoomConfig.getWarningTousseWhetherDelivery().booleanValue() == false ? " and warningUntil > " + dateQueryAdapter.getTodayAdapter() : "",
+				supplyRoomConfig.getWarningTousseWhetherDelivery() == null || supplyRoomConfig.getWarningTousseWhetherDelivery().booleanValue() == false ? " and (warningUntil is null or warningUntil > " + dateQueryAdapter.getTodayAdapter() + ")" : "",
 				isLimitInvoiceDepart ? " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.departCoding", departCodeListOfParam) : "",
 				isLimitInvoiceDepart ? " ti.departCoding, " : ""
 				);
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java
===================================================================
diff -u -r27331 -r27450
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java	(.../ExpressInvoiceManagerImpl.java)	(revision 27331)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java	(.../ExpressInvoiceManagerImpl.java)	(revision 27450)
@@ -342,7 +342,7 @@
 								validUntilSqlExpress);
 				//如果处于预警期的器械包不能发货
 				if(warningTousseWhetherDelivery == null || warningTousseWhetherDelivery == false){
-					queryTousseInstanceConditionCommon += " and warningUntil > " + dateQueryAdapter.getTodayAdapter();
+					queryTousseInstanceConditionCommon += " and (warningUntil is null or warningUntil > " + dateQueryAdapter.getTodayAdapter() + ")";
 				}
 				//排序语句
 				String queryTousseInstanceOrderCommon = " order by validUntil ";
@@ -883,7 +883,7 @@
 				
 				//如果处于预警期的器械包不能发货
 				if(warningTousseWhetherDelivery == null || warningTousseWhetherDelivery == false){
-					queryTousseInstanceConditionCommon += " and warningUntil > " + dateQueryAdapter.getTodayAdapter();
+					queryTousseInstanceConditionCommon += " and (warningUntil is null or warningUntil > " + dateQueryAdapter.getTodayAdapter() + ")";
 				}
 				//排序语句
 				String queryTousseInstanceOrderCommon = " order by validUntil ";