Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r17781 -r17795
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 17781)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 17795)
@@ -642,7 +642,7 @@
         applyDateDataArray.push(['今天', time.todayTime]);
         applyDateDataArray.push(['昨天', time.yesterdayTodayTime]);
         applyDateDataArray.push(['近三天', time.threeDayBeforeTodayTime]);
-        applyDateDataArray.push(['近一周', time.thisWeekTodayTime]);
+        applyDateDataArray.push(['一周内', time.withinWeekTodayTime]);
     });
     return applyDateDataArray;
 }
Index: forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java
===================================================================
diff -u -r16046 -r17795
--- forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java	(.../ServerTimeAction.java)	(revision 16046)
+++ forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java	(.../ServerTimeAction.java)	(revision 17795)
@@ -85,6 +85,7 @@
 			String endOfToday = DateTools.endOfToday(dateFormat);
 			String startOfYesterday = DateTools.startOfYesterday(dateFormat);
 			String endOfYesterday = DateTools.endOfYesterday(dateFormat);
+			String startOfAgoWeek = DateTools.startOfAgoWeek(dateFormat);
 			String startOfThisWeek = DateTools.startOfThisWeek(dateFormat);
 			String endOfThisWeek = DateTools.endOfThisWeek(dateFormat);
 			String startOfBeforeYesterday = DateTools.startOfBeforeYesterday(dateFormat);
@@ -97,6 +98,8 @@
 			json.put("yesterdayTodayTime", startOfYesterday + ";" + endOfYesterday);
 			//近三天
 			json.put("threeDayBeforeTodayTime", startOfBeforeYesterday + ";" + endOfToday);
+			//一周内
+			json.put("withinWeekTodayTime", startOfAgoWeek + ";" + endOfToday);
 			//近一周
 			json.put("thisWeekTodayTime", startOfThisWeek + ";" + endOfThisWeek);
 			//今天上午
Index: forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
===================================================================
diff -u -r16049 -r17795
--- forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java	(.../DateTools.java)	(revision 16049)
+++ forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java	(.../DateTools.java)	(revision 17795)
@@ -716,6 +716,16 @@
 	}
 
 	/**
+	 * 前一周的开始时间
+	 * @return
+	 */
+	public static String startOfAgoWeek(String format) {
+		Calendar calendar = Calendar.getInstance();
+		setStart(calendar);
+		calendar.add(Calendar.DATE, -7);
+		return formatTime(calendar, format);
+	}
+	/**
 	 * 昨天的开始时间
 	 * @return
 	 */
Index: forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java
===================================================================
diff -u -r16192 -r17795
--- forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java	(.../CssdServiceDepts.java)	(revision 16192)
+++ forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java	(.../CssdServiceDepts.java)	(revision 17795)
@@ -13,7 +13,7 @@
 import com.fasterxml.jackson.annotation.JsonFilter;
 
 /**
- * 供应室服务临床科室配置配置
+ * 供应室服务临床科室配置
  * @author shuyongfu
  * @since 2016-03-19
  */