Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManager.java
===================================================================
diff -u -r31729 -r34270
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManager.java	(.../InstrumentSetTypeManager.java)	(revision 31729)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManager.java	(.../InstrumentSetTypeManager.java)	(revision 34270)
@@ -76,4 +76,10 @@
 	 */
 	public String getParentIdPath(InstrumentSetType instrumentSetType);
 
+	/**
+	 * 查询所有第一级的器械包种类
+	 * @return
+	 */
+	public List<InstrumentSetType> getFirstGradeInstrumentSetTypeList();
+
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManagerImpl.java
===================================================================
diff -u -r31729 -r34270
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManagerImpl.java	(.../InstrumentSetTypeManagerImpl.java)	(revision 31729)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManagerImpl.java	(.../InstrumentSetTypeManagerImpl.java)	(revision 34270)
@@ -366,5 +366,11 @@
 		}
 		return sb.toString();
 	}
-	
+
+	@Override
+	public List<InstrumentSetType> getFirstGradeInstrumentSetTypeList() {
+		
+		return null;
+	}
+
 }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r33942 -r34270
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 33942)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 34270)
@@ -3096,6 +3096,7 @@
 
 	@Override
 	@SuppressWarnings("unchecked")
+	@Deprecated
 	public List<InvoicePlan> getAwaitForRecyclingInvoicePlan(
 			int supplyRoomType, String departCodings, String deptCodes) {
 		String sql = "where (po.recyclingStatus = '"
@@ -3137,7 +3138,23 @@
 		return getWaitingforRecyclingInvoicePlans(sql);
 	}
 	
+	
+	
 	@Override
+	public List<InvoicePlan> getAwaitForRecyclingInvoicePlanList(String orgUnitCodings,
+			String departmentGroupId, String barcode, Long instrumentSetTypeId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<TousseItem> getSortedTousseItemListByInvoicePlanIdAndInstrumentSetTypeId(
+			Long invoicePlanId, Long instrumentSetTypeId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
 	public List<InvoicePlan> getWaitTransitionInvoicePlans(String orgUnitCodings){
 		String sql = "where (po.recyclingStatus = '"
 				+ InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r33902 -r34270
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 33902)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 34270)
@@ -118,8 +118,29 @@
 	/**
 	 * @param departmentGroupId 回收科室分组id
 	 */
+	@Deprecated
 	public List<InvoicePlan> getAwaitForRecyclingInvoicePlan(int supplyRoomType,String orgUnitCodings,String departmentGroupId);
+
 	/**
+	 * 查询预回收的申请单的列表,参考getAwaitForRecyclingInvoicePlan方法,增加barcode和instrumentSetTypeId两个输入参数的过滤条件,返回InvoicePlanVo类型
+	 * 具体的业务详见ZJYY-108 的2.1小点
+	 * @param orgUnitCodings 科室名称,可能有多个值
+	 * @param departmentGroupId 科室分组id
+	 * @param barcode 条码(支持手术间条码、科室条码、标识牌条码,若为其它类型条码或非法条码直接抛异常)
+	 * @param instrumentSetTypeId(器械包种类id)
+	 * @return
+	 */
+	public List<InvoicePlan> getAwaitForRecyclingInvoicePlanList(String orgUnitCodings,String departmentGroupId,String barcode,Long instrumentSetTypeId);	
+
+	/**
+	 * 根据申请单id及器械包种类id查询申请项并按相关业务进行排序
+	 * 具体排序业务说明参考ZJYY-108 的2.2小点
+	 * @param invoicePlanId 申请单id
+	 * @param instrumentSetTypeId 器械包种类id
+	 * @return
+	 */
+	public List<TousseItem> getSortedTousseItemListByInvoicePlanIdAndInstrumentSetTypeId(Long invoicePlanId,Long instrumentSetTypeId);
+	/**
 	 * 获取待交接物品的申请单
 	 * @param orgUnitCodings
 	 * @return