Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
===================================================================
diff -u -r34110 -r34118
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java	(.../InvoicePlan.java)	(revision 34110)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java	(.../InvoicePlan.java)	(revision 34118)
@@ -60,7 +60,7 @@
 ,@Index(columnList="committedStatus",name="committedStatus_index"),@Index(columnList="type",name="type_index"),@Index(columnList="lastInvoiceTime",name="lastInvoiceTime_index")
 ,@Index(columnList="applicant",name="applicant_index"),@Index(columnList="endStatus",name="endStatus_index"),@Index(columnList="sequence",name="InvoicePlan_sequence_index")
 ,@Index(columnList="includeInvoiceItems",name="includeInvoiceItems_index"),@Index(columnList="urgentLevel_id",name="ip_urgentLevel_id_index")
-})
+,@Index(columnList="printTime",name="ip_printTime_index")})
 @Inheritance(strategy = InheritanceType.JOINED)
 @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 public class InvoicePlan implements IDAble,VersionAble {
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r34096 -r34118
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 34096)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 34118)
@@ -9824,7 +9824,7 @@
 		int printDisposableGoodsInvoicePlanSummaryUIVersion =
 				ConfigUtils.getSystemSetConfigByNameInt("printDisposableGoodsInvoicePlanSummaryUIVersion", 1);
 		if(printDisposableGoodsInvoicePlanSummaryUIVersion == 2){
-			// 查询打印状态为已打印、发货状态为待发货的一次性物品申请单，再按照发货计划打印计划分组打印
+			// 查询打印状态为已打印，发货状态为非【已终止】状态的所有一次性物品申请单，并且单上的物品不是已终止的物品，再按照发货计划打印计划分组打印
 			Map<PrintConfig, List<InvoicePlan>> printConfigInvoicePlanMap = 
 					this.getPrintConfigInvoicePlanMap(startTime, endTime, printRecordIds);
 			return getDisposableGoodsInvoicePlanSummary(printConfigInvoicePlanMap);
@@ -10055,7 +10055,7 @@
 				continue;
 			}
 			for (TousseItem tousseItem : tousseItemList) {
-				if(tousseItem.disposable()){
+				if(tousseItem.disposable() && !tousseItem.terminated()){
 					Long disposableGoodsId = tousseItem.getDisposableGoodsId();
 					TousseItemVo vo = tousseItemVoMap.get(disposableGoodsId);
 					if(vo == null){
@@ -10347,7 +10347,7 @@
 	@Override
 	public Map<PrintConfig, List<InvoicePlan>> getPrintConfigInvoicePlanMap(String startDate, String endDate, String printConfigIDs) {
 		Map<PrintConfig, List<InvoicePlan>> printConfigInvoicePlanMap = new HashMap<PrintConfig, List<InvoicePlan>>();
-		// 查询出打印时间介于所选的时间范围，申请单类型为一次性物品申请单，打印状态为已打印，发货状态为待发货的所有一次性物品申请单。
+		// 查询出打印时间介于所选的时间范围，申请单类型为一次性物品申请单，打印状态为已打印，终止状态为非【已终止】状态的所有一次性物品申请单。
 		String printTimeSql = "";
 		if(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
 			printTimeSql = " and " + dateQueryAdapter.dateAreaSql("po.printTime", startDate, endDate, false);
@@ -10357,11 +10357,11 @@
 			endDate = startDate;
 			printTimeSql = " and " + dateQueryAdapter.dateAreaSql("po.printTime", startDate, endDate, true);
 		}
-		String invoicePlanHql = String.format("select po from %s po where po.type = '%s' and po.printed = '%s' and po.deliverStatus = '%s' %s order by po.printTime ",
+		String invoicePlanHql = String.format("select po from %s po where po.type = '%s' and po.printed = '%s' and (po.endStatus is null or po.endStatus <> '%s') %s order by po.printTime ",
 				InvoicePlan.class.getSimpleName(),
 				InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM,
 				InvoicePlan.PRINT_STATUS_PRINTED,
-				InvoicePlan.DELIVERSTATUS_AWAITDELIVER,
+				InvoicePlan.STATUS_END,
 				printTimeSql);
 		List<InvoicePlan> invoicePlanList = objectDao.findByHql(invoicePlanHql);
 		if(CollectionUtils.isEmpty(invoicePlanList)){