Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r35067 -r35342
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 35067)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 35342)
@@ -18,6 +18,7 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.invoicemanager.LostMaterialItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.TimeQuantum;
+import com.forgon.disinfectsystem.entity.specialInfection.SpecialInfection;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.recyclingapplication.vo.ApplicationGoodsVo;
 import com.forgon.disinfectsystem.recyclingapplication.vo.ExpensiveGoodsInvoicePlanVo;
@@ -382,6 +383,13 @@
 	 */
 	public RecyclingApplicationVo invoicePlan2RecyclingApplicationVo(InvoicePlan invoicePlan,boolean sort);
 	/**
+	 * 申请单转换为RecyclingApplicationVo对象
+	 * @param sort 申请单中的物品是否需要排序
+	 * @param invoicePlan
+	 * @param specialInfectionMap 特殊感染类型
+	 */
+	public RecyclingApplicationVo invoicePlan2RecyclingApplicationVo(InvoicePlan invoicePlan,boolean sort, Map<String, SpecialInfection> specialInfectionMap);
+	/**
 	 * 根据科室编码分组
 	 * @param invoicePlans 待分组的申请单
 	 * @return