Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r22081 -r22087
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 22081)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 22087)
@@ -2727,6 +2727,7 @@
 		return map;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public  List<Map<String, Object>> getExpensiveGoodsInvoicePlans(String invoicePlanId) {
 		//若有绑定的申请单id则只需按id查询
@@ -2736,15 +2737,14 @@
 			invoicePlanList = objectDao.findBySql(InvoicePlan.class.getSimpleName(),sql);
 		}else{
 			//获得类型为高值耗材且审核结束且不为已终止的申请单
-			String sql = String.format("where po.type = '%s' and po.processStatus = '%s' and po.endStatus <> '%s'", 
+			String sql = String.format("where po.type = '%s' and po.processStatus = '%s' and (po.endStatus <> '%s' or po.endStatus is null)", 
 					InvoicePlan.TYPE_EXPENSIVEGOODS_FORM,InvoicePlan.PROCESSSTATUS_BE_THROUGH_WITH,InvoicePlan.STATUS_END);
 			invoicePlanList = objectDao.findBySql(InvoicePlan.class.getSimpleName(),sql);
 			if(CollectionUtils.isNotEmpty(invoicePlanList)){
 				//若申请单已被绑定入库且绑定的实例已有使用记录则：不显示该申请单
 				for (int i = invoicePlanList.size()-1; i >= 0; i--) {
 					InvoicePlan invoicePlan = invoicePlanList.get(i);
 					String expensiveGoodsInstanceSql = String.format("where po.invoicePlanId = '%s'", invoicePlan.getId());
-					@SuppressWarnings("unchecked")
 					List<ExpensiveGoodsInstance> expensiveGoodsInstanceList = objectDao.findBySql(
 							ExpensiveGoodsInstance.class.getSimpleName(), expensiveGoodsInstanceSql);
 					if(CollectionUtils.isNotEmpty(expensiveGoodsInstanceList)){