Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r26368 -r26500
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 26368)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 26500)
@@ -1205,18 +1205,21 @@
 	}
 	
 	/**
-	 * 获取待回收申请单
+	 * 获取待回收申请单，供PC端的待回收列表页面调用
 	 */
 	public void getAwaitForRecyclingInvoicePlan() {
 		
 		//申请科室编码
 		String orgUnitCoding = StrutsParamUtils.getPraramValue("orgUnitCoding", "");
+		//回收科室分组的id
 		String groupId = StrutsParamUtils.getPraramValue("groupId", "");
+		// 申请单的类型
 		String appType = StrutsParamUtils.getPraramValue("appType", "");
 		String applyTimeOrder = StrutsParamUtils.getPraramValue("applyTimeOrder", "");
 		String operationRoom = StrutsParamUtils.getPraramValue("operationRoom", "");
+		// 器械包分组的id
 		String tousseGroupId = StrutsParamUtils.getPraramValue("tousseGroupId", null);
-		
+		//用户所属的部门供应室编码（一级供应室，二级供应室，普通科室）
 		String loginUserDeptCoding = AcegiHelper.getLoginUser()
 				.getOrgUnitCodingFromSupplyRoomConfig();
 
@@ -1232,6 +1235,10 @@
 		
 		List<InvoicePlan> disinfectApp = new ArrayList<InvoicePlan>();
 		JSONArray jsonArray = new JSONArray();
+		
+		// 对查询的结果，按科室分组进行过滤。
+		// TODO:要改进为在invoicePlanManager.getWaitingforRecyclingInvoicePlans()方法里进行过滤
+		// 而不是查出来后才进行过滤。Terry Kwan，2019-06-08
 		if(invoicePlanList != null){
 			for(InvoicePlan ip : invoicePlanList){
 				if(deptCodes != null && !deptCodes.contains(ip.getDepartCoding())){
@@ -1459,7 +1466,10 @@
 	}
 	
 	/**
-	 * 查出历史回收记录，触摸屏单独分页
+	 * 查出历史回收记录，在回收清点页面的历史回收记录列表显示。进行分页显示
+	 * 传入参数：
+	 * page：页码
+	 * filter：过滤条件，包括查询的开始时间、结束时间等信息
 	 * 
 	 * @return
 	 */
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r26368 -r26500
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 26368)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 26500)
@@ -78,7 +78,15 @@
 	 * @return
 	 */
 	public List<InvoicePlan> getWaitTransitionInvoicePlans(String orgUnitCodings);
-	
+	/**
+	 * 获取待回收的申请单
+	 * @param handleDepartCoding 处理科室的编码，供应室或者二级供应室的编码
+	 * @param applicationOrgUnitCoding 申请科室编码，过滤条件
+	 * @param applicationType 申请单类型，过滤条件
+	 * @param applyTimeOrder 按申请时间排序的规则，升序或者降序
+	 * @param operationRoom 手术间
+	 * @param tousseGroupId 器械包分组的id
+	 */
 	public List<InvoicePlan> getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding,
 			String applicationType,String applyTimeOrder,String operationRoom,String tousseGroupId);
 
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r26389 -r26500
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 26389)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 26500)
@@ -1267,12 +1267,6 @@
 		return list;
 	}
 	
-	/**
-	 * 获取待回收的申请单
-	 * handleDepartCoding 处理科室
-	 * applicationOrgUnitCoding 申请科室编码
-	 * applicationType 申请单类型
-	 */
 	@Override
 	public List<InvoicePlan> getWaitingforRecyclingInvoicePlans(
 			String handleDepartCoding, String applicationOrgUnitCoding,
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
===================================================================
diff -u -r26368 -r26500
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java	(.../RecyclingRecordManager.java)	(revision 26368)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java	(.../RecyclingRecordManager.java)	(revision 26500)
@@ -53,6 +53,37 @@
 	
 	public RecyclingRecord getByRecyclingApplicationId(String applicationId);
 
+	/**
+	 * 获取历史回收记录列表
+	 * @param start 查询的开始记录数
+	 * @param end 查询的结束记录数
+	 * @param filterJson 过滤条件，包括回收的科室编码、处理状态（未确认、已确认），申请单类型，回收的开始时间、结束时间等信息
+	 * 示例格式如下：
+	 * 
+			{
+				"departCode": "2015",  // 回收的科室编码
+				"status": "未确认",  // 处理状态
+				"applicationType":"器械包申请单", // 申请单类型
+				"recyclingDateRange": {  // 回收的时间范围
+					"start": {
+						"year": 2019,
+						"month": 6,
+						"day": 8,
+						"hour": 10,
+						"minute": 40
+					},
+					"end": {
+						"year": 2019,
+						"month": 6,
+						"day": 8,
+						"hour": 10,
+						"minute": 40
+					}
+				}
+			}
+	 * 
+	 * @return
+	 */
 	public JSONObject getRecyclingRecordListByJson(long start, long end,String filterJson);
 
 	public List<ApplicationItemVO> findApplicationItemVOs(