Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
===================================================================
diff -u -r20190 -r20457
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java	(.../RecyclingApplicationManager.java)	(revision 20190)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java	(.../RecyclingApplicationManager.java)	(revision 20457)
@@ -79,11 +79,6 @@
 	public void saveOrUpdateRecyclingApplication(
 			RecyclingApplication recyclingApplication,Boolean isCommit);
 
-	public void createSecondSupplyRoomRecyclingApplicationByTousse(
-			Map<String, Integer> tousseNameAndAmount, String applicant,
-			String depart, String departCoding, String remark,
-			String operationRoom, String patientName,Date applicationCreateDate);
-
 	public Collection<RecyclingApplication> createRecyclingApplicationByTousse(
 			String applicant, String depart, String departCoding,
 			String remark, boolean canBeMerge,
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r20416 -r20457
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 20416)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 20457)
@@ -1013,54 +1013,6 @@
 	}
 	
 	/**
-	 * 4.1不再使用二级供应室回收单的机制
-	 */
-	@Deprecated
-	@Override
-	public void createSecondSupplyRoomRecyclingApplicationByTousse(
-			Map<String, Integer> tousseNameAndAmount, String applicant,
-			String depart, String departCoding, String remark,String operationRoom,String patientName,Date applicationCreateDate) {
-		if (tousseNameAndAmount.size() > 0) {
-			RecyclingApplication recyclingApplication = new RecyclingApplication();
-			recyclingApplication
-					.setType(RecyclingApplication.TYPE_SECOND_SUPPLY_ROOM);
-			recyclingApplication.setApplicant(applicant);
-			recyclingApplication.setDepart(depart);
-			recyclingApplication.setDepartCoding(departCoding);
-			recyclingApplication.setSettleAccountsDepart(depart);
-			recyclingApplication.setSettleAccountsDepartCoding(departCoding);
-			recyclingApplication.setReaders(";ORGUNIT_"
-					+ recyclingApplication.getDepartCoding() + ";");
-			recyclingApplication.setSerialNumber(serialNumManager
-					.getSerialNumberStr(SerialNum.TYPE_RECYCLINGAPPLICATION));
-			recyclingApplication
-					.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
-
-			recyclingApplication.setOrderByFiled(InvoicePlan.RECYCLING_AWAITRECYCLE);
-			recyclingApplication.setOperationRoom(operationRoom);
-			recyclingApplication.setOrSpelling(GB2Alpha.string2Alpha(operationRoom));
-			recyclingApplication.setOrWBCode(GB2WB.getWBCode(operationRoom));
-			recyclingApplication.setPatientName(patientName);
-			recyclingApplication.setApplicationTime(applicationCreateDate);
-			if (remark != null) {
-				recyclingApplication.setRemark(remark);
-			}
-			createApplicationItems(recyclingApplication, tousseNameAndAmount , null , 0 , null);
-			setApplicationStatus(recyclingApplication, tousseNameAndAmount);
-			// 备注里面增加普通器械包的数量
-			RecyclingApplicationUtils.appendTousseAmountRemark(recyclingApplication);
-			//设置处理科室
-			CssdServiceDepts cssdService = orgUnitManager.getCssdServiceDepts(departCoding, CssdServiceDepts.TOUSSETYPE_TOUSSE);
-			if(cssdService != null){
-				recyclingApplication.setHandleDepartCoding(cssdService.getCssdOrgUnitCode());
-				recyclingApplication.setHandleDepart(cssdService.getCssdOrgUnitName());
-			}
-			saveOrUpdateRecyclingApplication(recyclingApplication,true);
-			saveOrUpdate(recyclingApplication);
-		}
-	}
-
-	/**
 	 * 根据申请的器械包自动生成自定义器械申请记录
 	 * 
 	 * @param tousseNameAndAmount