Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
===================================================================
diff -u -r16654 -r17490
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java	(.../UseRecordManager.java)	(revision 16654)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java	(.../UseRecordManager.java)	(revision 17490)
@@ -45,7 +45,7 @@
 	
 	public UseRecord getUseRecordById(Long id);
 	
-	public List<UseRecord> getUseRecordList(String departCoding, int firstIndex, int maxResults);
+	public List<UseRecord> getUseRecordList(String departCoding);
 	
 	/**
 	 * 根据使用记录id查询器械材料使用记录
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r17281 -r17490
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 17281)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 17490)
@@ -4,6 +4,7 @@
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -19,6 +20,7 @@
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.jfree.chart.axis.DateAxis;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.ResultSetExtractor;
@@ -167,12 +169,15 @@
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public List<UseRecord> getUseRecordList(String departCoding,
-			int firstIndex, int maxResults) {
+	public List<UseRecord> getUseRecordList(String departCoding) {
+		Date now = new Date();
+		Date start = new Date();
+		start.setTime(now.getTime() - 24 * 60*60*1000);
+		
 		String sql = String
-				.format("where po.departCoding = '%s'", departCoding);
-		return objectDao.findBySql(UseRecord.class.getSimpleName(), sql,
-				firstIndex, maxResults, "enteringDate desc");
+				.format("where po.departCoding = '%s' and %s",departCoding,dateQueryAdapter.dateAreaSql("po.enteringDate", 
+						Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(start), Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(now), false));
+		return objectDao.findBySql(UseRecord.class.getSimpleName(), sql, "enteringDate desc,operationRoom asc");
 	}
 
 	public void saveOrUpdate(UseRecord useRecord) {
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r17400 -r17490
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 17400)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 17490)
@@ -1323,7 +1323,7 @@
 		int maxResultCount = params.optInt("maxResultCount");
 
 		List<UseRecord> useRecordList = useRecordManager.getUseRecordList(
-				departCode, firstIndex, maxResultCount);
+				departCode);
 		JsonConfig jsonConfig = new JsonConfig();
 		jsonConfig.registerJsonValueProcessor(Date.class,
 				_defaultDateJsonValueProcessor1);
@@ -1597,7 +1597,41 @@
 		return new JSONStringer().object().key("success").value(true)
 				.endObject().toString();
 	}
+	
+	public String auditAndConvertUserecord(JSONObject params){
+		JSONArray useRecordIdsJSONArray = params.optJSONArray("useRecordIds");
+		String operator = params.optString("operator");
+		String depart = params.optString("depart");
+		String departCode = params.optString("departCode");
+		if (useRecordIdsJSONArray == null) {
+			return JSONUtil.buildErrorMsgJsonResult("缺失参数useRecordIds");
+		}
+		String applicationFormType = CssdUtils.getSystemSetConfigByName("applicationFormType");
+		List<Long> ids = new ArrayList<Long>();
+		List<String> failedMessages = new ArrayList<>();
+		for (int i = 0; i < useRecordIdsJSONArray.size(); ++i) {
+			long useRecordId = useRecordIdsJSONArray.optLong(i);
+			ids.add(useRecordId);
 
+			// 多条使用记录转换申请单不合成一张单简单处理
+			try {
+				useRecordManager
+						.createRecyclingApplicationByUseRecords(ids,
+								operator, depart, departCode,
+								new Date(),applicationFormType);
+			} catch (Exception e) {
+				logger.warn(e.getMessage());
+				e.printStackTrace();
+				failedMessages.add(e.getMessage());
+			}
+		}
+		if(failedMessages.size() > 0){
+			return JSONUtil.buildJsonObject(false, StringTools.join(failedMessages, ",")).toString();
+		}else{
+			return JSONUtil.buildJsonObject(true).toString(); 
+		}
+	}
+
 	// 把多条使用记录转换为申请单
 	public String createApplicationByUserecords(JSONObject params) {
 		JSONArray useRecordIdsJSONArray = params.optJSONArray("useRecordIds");