Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r27812 -r27816
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 27812)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 27816)
@@ -801,7 +801,8 @@
 			// 2、如果已灭菌和未灭菌的器械包中有器械包，外来器械包，消毒物品，外部代理灭菌包，排序顺序为：器械包-外来器械包-消毒物品-外部代理灭菌包
 			// 3、如果同时存在多种加急的物品，则按照物品的申请时间升序排序，申请时间越早，排序越靠前
 			// 4、一次性物品的排序要在器械包排序后边
-			urgentList = orderApplicationGoodsVoByApplicationTimeASC(urgentList);
+			//先注释掉(兼容新版本发化优化后的待发货物品明细查询的排序)
+			//urgentList = orderApplicationGoodsVoByApplicationTimeASC(urgentList);
 			tousseList.addAll(disinfectionList);
 			List<ApplicationGoodsVo> tousseVoList = orderApplicationGoodsVo(tousseList);
 			reorderedList = new ArrayList<ApplicationGoodsVo>();
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
===================================================================
diff -u -r27815 -r27816
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 27815)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 27816)
@@ -159,8 +159,7 @@
 				+ "left join %s ul on "+ invoicePlanTableAlias +".urgentLevel_id=ul.id "
 				+ "left join (select sequence,orgUnitCoding,id from %s src where src.supplyRoomType = 3) t1 on t1.orgUnitCoding="+ invoicePlanTableAlias +".departCoding"
 				+ "%s group by %s "
-				+ "order by max(ul.grade) desc,"
-				+ "min(case when t1.id is null then 99999 else t1.sequence end),"
+				+ "order by max(case when t1.id is null then 99999 else t1.sequence end),"
 				+ "min("+ invoicePlanTableAlias +".applicationTime)", 
 				queryColumns , InvoicePlan.class.getSimpleName(), 
 				UrgentLevel.class.getSimpleName(), SupplyRoomConfig.class.getSimpleName(),