Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
===================================================================
diff -u -r27816 -r27817
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 27816)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 27817)
@@ -159,7 +159,8 @@
 				+ "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(case when t1.id is null then 99999 else t1.sequence end),"
+				+ "order by max(case when ul.grade is null then 0 else ul.grade end) desc,"
+				+ "min(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(),