Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
===================================================================
diff -u -r16571 -r16589
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 16571)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 16589)
@@ -107,5 +107,7 @@
   //做生物监测时监测核对员必须填写
   monitorCheckerMustFill : true,
   // 是否显示辅助发货按钮
-  showAuxiliaryInvoiceBtn: true
+  showAuxiliaryInvoiceBtn: true,
+  // 待回收列表申请时间排序方式
+  waitRecycleListApplyTimeSortDirection : "DESC"
 }
\ No newline at end of file
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r16436 -r16589
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 16436)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 16589)
@@ -943,12 +943,11 @@
 		userObj.put("fullName", user.getFullName());
 		return userObj;
 	}
+	
 	/**
-	 * （触摸屏回收页面）查出所有待回收申请单
-	 * 
-	 * @return
+	 * 待回收申请单
 	 */
-	public String getAwaitForRecyclingInvoicePlan() {
+	public void getAwaitForRecyclingInvoicePlan() {
 		
 		String orgUnitCoding = StrutsParamUtils.getPraramValue("orgUnitCoding", "");
 		String groupId = StrutsParamUtils.getPraramValue("groupId", "");
@@ -963,61 +962,46 @@
 			if(group != null){
 				deptCodes = group.getDepartCodes();
 			}
-			
 		}
-		List<InvoicePlan> invoicePlans = new ArrayList<InvoicePlan>();
-		
-		/*List<InvoicePlan> tempInvoicePlans = invoicePlanManager
-				.getAwaitForRecyclingInvoicePlan(supplyRoomType,orgUnitCoding);*/
-		
-		List<InvoicePlan> tempInvoicePlans = invoicePlanManager
+		List<InvoicePlan> invoicePlanList = invoicePlanManager
 				.getWaitingforRecyclingInvoicePlans(loginUserDeptCoding,orgUnitCoding,appType);
 		
-		//消毒物品申请单排在最下边
 		List<InvoicePlan> disinfectApp = new ArrayList<InvoicePlan>();
-		for(InvoicePlan invoicePlan: tempInvoicePlans){
-			if(deptCodes != null && deptCodes.indexOf(invoicePlan.getDepartCoding()) < 0){
+		JSONArray jsonArray = new JSONArray();
+		for(InvoicePlan ip : invoicePlanList){
+			if(deptCodes != null && deptCodes.indexOf(ip.getDepartCoding()) < 0){
 				continue;
 			}
-			if(!invoicePlan.getType().equals(InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM)){
-				invoicePlans.add(invoicePlan);
+			if(ip.getType().equals(InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM)){
+				disinfectApp.add(ip);
 			}else{
-				disinfectApp.add(invoicePlan);
+				buildJsonItem(jsonArray, ip);
 			}
 		}
-		
-		for (InvoicePlan invoicePlan : disinfectApp) {
-			invoicePlans.add(invoicePlan);
+		//消毒物品申请单排在最后
+		for (InvoicePlan ip : disinfectApp) {
+			buildJsonItem(jsonArray, ip);
 		}
-		
-		JsonConfig config = new JsonConfig();
-		config.setExcludes(new String[] { "applicationItems", "invoice",
-				"recyclingApplications", "parent",
-				"recyclingRecord" });
-		config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);
-		JSONArray jsonArray = new JSONArray();// = JSONArray.fromObject(invoicePlans, config);
-		for(InvoicePlan ip : invoicePlans){
-			JSONObject obj = new JSONObject();
-			obj.put("id",ip.getId());
-			obj.put("depart", StringTools.getDefaultString((ip.getDepart())));
-			obj.put("settleAccountsDepart",StringTools.getDefaultString(ip.getSettleAccountsDepart()));
-			obj.put("applicationTime", ip.getApplicationTime());
-			obj.put("applicant", StringTools.getDefaultString(ip.getApplicant()));
-			obj.put("type", StringTools.getDefaultString(ip.getType()));
-			String operationRoom = null;
-			if(ip instanceof RecyclingApplication){
-				RecyclingApplication app = (RecyclingApplication)ip;
-				operationRoom = app.getOperationRoom();
-			}
-			obj.put("operationRoom", StringTools.getDefaultString(operationRoom));
-			obj.put("remark", StringTools.getDefaultString(ip.getRemark()));
-			jsonArray.add(obj);
-		}
-
 		StrutsResponseUtils.output(jsonArray);
-		
-		return null;
 	}
+
+	private void buildJsonItem(JSONArray jsonArray, InvoicePlan ip) {
+		JSONObject obj = new JSONObject();
+		obj.put("id",ip.getId());
+		obj.put("depart", StringTools.getDefaultString((ip.getDepart())));
+		obj.put("settleAccountsDepart",StringTools.getDefaultString(ip.getSettleAccountsDepart()));
+		obj.put("applicationTime", ip.getApplicationTime());
+		obj.put("applicant", StringTools.getDefaultString(ip.getApplicant()));
+		obj.put("type", StringTools.getDefaultString(ip.getType()));
+		String operationRoom = null;
+		if(ip instanceof RecyclingApplication){
+			RecyclingApplication app = (RecyclingApplication)ip;
+			operationRoom = app.getOperationRoom();
+		}
+		obj.put("operationRoom", StringTools.getDefaultString(operationRoom));
+		obj.put("remark", StringTools.getDefaultString(ip.getRemark()));
+		jsonArray.add(obj);
+	}
 	
 	/**
 	 * 获取快速回收器械包列表
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r16474 -r16589
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 16474)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 16589)
@@ -397,6 +397,11 @@
 		ftSbf.append(ftRecyclingStatusSQL);
 		
 		String orderSql = " order by po.sequence,po.departCoding,po.applicationTime";
+		//申请时间是否按降许
+		String sortDirection = CssdUtils.getSystemSetConfigByName("waitRecycleListApplyTimeSortDirection");
+		if(StringUtils.isNotBlank(sortDirection) && "DESC".equals(sortDirection.toUpperCase())){
+			orderSql += " DESC";
+		}
 		sb.append(orderSql);
 		ftSbf.append(orderSql);