Index: forgon-tools/src/main/java/com/forgon/tools/string/StringTools.java
===================================================================
diff -u -r14325 -r15318
--- forgon-tools/src/main/java/com/forgon/tools/string/StringTools.java	(.../StringTools.java)	(revision 14325)
+++ forgon-tools/src/main/java/com/forgon/tools/string/StringTools.java	(.../StringTools.java)	(revision 15318)
@@ -204,7 +204,7 @@
 		boolean isNumeric = false;
 		
 		String regexStr = "^[0-9]*$";
-		if(s!=null && s.matches(regexStr))
+		if(StringTools.isNotBlank(s) && s.matches(regexStr))
 		{
 			isNumeric = true;
 		}
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r15213 -r15318
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 15213)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 15318)
@@ -1929,11 +1929,29 @@
 		config.setJsonPropertyFilter(buildPropertyFilterForSterilizationRecord());
 		return config;
 	}
-
-	// 获取当天的灭菌记录
+	/**
+	 * 获取当天的灭菌记录.android客户端从4.4.36开始,使用getSterilizationRecordList。因为要获取历史灭菌记录
+	 * @param params
+	 * @return
+	 */
+	@Deprecated
+	public String getSterilizationRecordListOfToday(JSONObject params){
+		return getSterilizationRecordList(params);
+	}
+	/**
+	 * 获取当天或者是历史灭菌记录。json参数中,daysAgo表示在当前的前几天内,如果为0,表示当天的数据,
+	 * 如果为1表示1天前,也就是昨天(包括昨天的数据),为6表示6天前,既为一周的数据。如果daysAgo为空或者是非数字,都获取当天的数据
+	 * @param params
+	 * @return
+	 */
 	@SuppressWarnings("unchecked")
-	public String getSterilizationRecordListOfToday(JSONObject params) {
+	public String getSterilizationRecordList(JSONObject params) {
 		String departCode = params.optString("departCode");
+		String daysAgo = params.optString("daysAgo");
+		int days = 0;
+		if(StringTools.isNumeric(daysAgo)){
+			days = Integer.parseInt(daysAgo);
+		}
 		if (StringUtils.isEmpty(departCode)) {
 			return JSONUtil.buildErrorMsgJsonResult("缺失参数departCode");
 		}
@@ -1942,6 +1960,8 @@
 		Date out_endTime = new Date();
 		supplyRoomConfigManager.getTodayTimeQuantum(out_beginTime, out_endTime);
 
+		long time = out_beginTime.getTime() - days * 24 * 60 * 60 * 1000;
+		out_beginTime.setTime(time);
 		String sqlWhere = String.format(
 				"where ((po.startDate between %s and %s) or po.status = '%s')"
 						+ " and po.orgUnitCoding = '%s'",