Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r27435 -r27443
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 27435)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 27443)
@@ -98,7 +98,6 @@
 import com.forgon.disinfectsystem.recyclingrecord.vo.DepartRecycleTousse;
 import com.forgon.disinfectsystem.recyclingrecord.vo.DisinfectionDetailVo;
 import com.forgon.disinfectsystem.recyclingrecord.vo.ErrorDamageDetailVo;
-import com.forgon.disinfectsystem.recyclingapplication.vo.ExpressRecyclingVo;
 import com.forgon.disinfectsystem.recyclingrecord.vo.RecyclingContext;
 import com.forgon.disinfectsystem.recyclingrecord.vo.RecyclingDetailItemVo;
 import com.forgon.disinfectsystem.recyclingrecord.vo.RecyclingDetailVo;
@@ -1322,116 +1321,6 @@
 			e.printStackTrace();
 		}	
 	}
-	/**
-	 * 获取快速回收器械包列表 版本0
-	 * @return
-	 */
-	public String getAwaitForQuickRecyclingTousseOld() {
-		int supplyRoomType = SupplyRoomConfig.SUPPLYROOM_TYPE_SYSTEM_CONFIG;
-		String loginUserOrgUnitCoding = AcegiHelper.getLoginUser()
-				.getOrgUnitCodingFromSupplyRoomConfig();
-
-		SupplyRoomConfig firstSupplyRoom = supplyRoomConfigManager
-				.getFirstSupplyRoomConfig();
-		if (StringUtils.equals(firstSupplyRoom.getOrgUnitCoding(),
-				loginUserOrgUnitCoding)) {
-			supplyRoomType = SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM;
-		} else {
-			List<SupplyRoomConfig> secondRooms = supplyRoomConfigManager
-					.getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM);
-			for (SupplyRoomConfig config : secondRooms) {
-				if (StringUtils.equals(loginUserOrgUnitCoding, config.getOrgUnitCoding())) {
-					supplyRoomType = SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM;
-					break;
-				}
-			}
-		}
-		List<TousseItem> tousseItems = invoicePlanManager.getExpressRecyclingTousse(supplyRoomType,"");
-		List<ExpressRecyclingVo> quickRecyclingList = new ArrayList<ExpressRecyclingVo>();
-		String ids = "";
-		if(tousseItems != null){
-			Set<Long> tdIds = tousseItems.stream().filter(p->p!=null).map(p->p.getTousseDefinitionId()).filter(p->p!=null).collect(Collectors.toSet());
-			List<TousseDefinition> tds = tousseDefinitionManager.getCollection(tdIds);
-			List<DepartmentGroup> groups = departmentGroupManager.getAll();
-			Map<String, String> departCodingToGroupIdMap = new HashedMap<String, String>();
-			for (TousseItem item : tousseItems) {
-				Integer recyclingAmount = item.getRecyclingAmount();
-				if(recyclingAmount == null){
-					InvoicePlan invoicePlan = item.getInvoicePlan();
-					if(!invoicePlan.readed()){
-						if(StringUtils.isNotBlank(ids)){
-							ids += ",";
-						}
-						ids += invoicePlan.getId();
-					}
-					TousseDefinition td = IDOperators.find(tds, item.getTousseDefinitionId());
-					ExpressRecyclingVo vo = new ExpressRecyclingVo();
-					vo.setApplicationId(invoicePlan.getId());
-					vo.setDepart(invoicePlan.getDepart());
-					vo.setInvoicePlanVersion(invoicePlan.getVersion());
-					vo.setApplicationTime(invoicePlan.getApplicationTime());
-					vo.setTousseName(item.getTousseName());
-					vo.setAmount(item.getAmount());
-					vo.setPrepareRecycleAmount(item.getPrepareRecycleAmount());
-					vo.setTousseDefinitionID(item.getTousseDefinitionId());
-					vo.setIsCleanedEntirely(StringUtils.isBlank(item.getIsCleanedEntirely())?"是":item.getIsCleanedEntirely());
-					vo.setIsApplyEntireTousse(StringUtils.isBlank(item.getIsApplyEntireTousse())?"是":item.getIsApplyEntireTousse());
-					vo.setTousseType(item.getTousseType());
-					vo.setDepartCoding(invoicePlan.getDepartCoding());
-					vo.setDepartGroupId(getDepartGroupId(vo.getDepartCoding(),groups,departCodingToGroupIdMap));
-					vo.setTousseGroupId(td!=null?td.getTousseGroupID():null);
-					quickRecyclingList.add(vo);
-				}
-			}
-		}
-		JSONArray jsonArray = JSONArray.fromObject(quickRecyclingList);
-		StrutsResponseUtils.output(jsonArray);
-		
-		if(StringUtils.isNotBlank(ids)){
-			String sql = "update invoicePlan set readed = "+InvoicePlan.READED+" where id in (" + ids +")";
-			recyclingApplicationManager.updateBySql(sql);
-		}
-		return null;
-	}
-	
-	/**
-	 * 获取科室所属回收分组
-	 * @param departCoding
-	 * @param groups
-	 * @param departCodingToGroupIdMap
-	 * @return
-	 */
-	private String getDepartGroupId(String departCoding,
-			List<DepartmentGroup> groups,
-			Map<String, String> departCodingToGroupIdMap) {
-		String groupId = "";
-		String departGroupId = departCodingToGroupIdMap.get(departCoding);
-		if (departGroupId != null) {
-			groupId = departGroupId;
-		} else {
-			if (StringUtils.isNotBlank(departCoding) && groups != null) {
-				for (DepartmentGroup departmentGroup : groups) {
-					String codings = departmentGroup.getDepartCodes();
-					if (StringUtils.isNotBlank(codings)) {
-						String[] codingArray = codings.split(";");
-						for (String coding : codingArray) {
-							//一个科室有可能属于多个分组的情况
-							if (departCoding.equals(coding)) {
-								if(StringUtils.isNotBlank(groupId)){
-									groupId += ";";
-								}
-								groupId += departmentGroup.getId().toString();
-								
-								departCodingToGroupIdMap.put(departCoding,groupId);
-							}
-						}
-					}
-				}
-			}
-		}
-		return groupId;
-	}
-	
 	public void loadPoItems(){
 		//String id = StrutsParamUtils.getPraramValue("id", null);
 		String idArray = StrutsParamUtils.getPraramValue("ids", null);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r27435 -r27443
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 27435)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 27443)
@@ -238,13 +238,6 @@
 	 * @param invoicePlan
 	 */
 	public void computeAndSetPrintStatus(InvoicePlan invoicePlan);
-	/**
-	 * 获取快速回收的待回收申请项。申请单回收状态为待回收和部分回收的。外来器械包申请单不处理(包括通用申请单里的外来器械也不处理)。isThereIdentificationCard为是的也不处理。expressRecycling不为是的也过滤掉
-	 * @param supplyRoomType 供应室类型。实际上没有用
-	 * @param handleDepartCodings 处理科室,目前调用的地方也是传空，实际上没用
-	 * @return
-	 */
-	public List<TousseItem> getExpressRecyclingTousse(int supplyRoomType, String handleDepartCodings);
 	
 	/**
 	 * 获取快速回收的待回收申请项。申请单回收状态为待回收和部分回收的。外来器械包申请单不处理(包括通用申请单里的外来器械也不处理)。isThereIdentificationCard为是的也不处理。expressRecycling不为是的也过滤掉
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r27438 -r27443
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 27438)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 27443)
@@ -1269,28 +1269,7 @@
 		
 		return getWaitingforRecyclingInvoicePlans(sql);
 	}
-	
 	@Override
-	public List<TousseItem> getExpressRecyclingTousse(int supplyRoomType, String handleDepartCodings){
-		String sql = String.format("where po.invoicePlan.recyclingStatus in('%s','%s') and po.invoicePlan.committedStatus=true", 
-				InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE,InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE);
-		
-		if (StringUtils.isNotBlank(handleDepartCodings)) {
-			if (!handleDepartCodings.startsWith("'")){
-				handleDepartCodings = "'" + handleDepartCodings + "'";
-			}
-			sql += " and po.invoicePlan.handleDepartCoding in (" + handleDepartCodings + ")";
-		}
-		sql += " and po.invoicePlan.type != '" + InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION + "'";
-		sql += " and (po.tousseType != '" + TousseDefinition.PACKAGE_TYPE_FOREIGN + "' and po.tousseType != '" + TousseDefinition.PACKAGE_TYPE_SPLIT + "')";
-		sql += " and ( po.invoicePlan.includeRecyclingItems is null or po.invoicePlan.includeRecyclingItems = " + InvoicePlan.SIGNED_TRUE + " )";
-		sql += " and (po.isThereIdentificationCard is null or po.isThereIdentificationCard = '" + Constants.STR_NO + "')";
-		sql += " and po.expressRecycling = '" + Constants.STR_YES + "'";
-		sql += " order by po.tousseName asc";
-		return objectDao.findBySql(TousseItem.class.getSimpleName(), sql);
-	}
-	
-	@Override
 	public List<ExpressRecyclingVo> getExpressRecyclingTousseVo(){
 		StringBuffer sql = new StringBuffer(800);
 		sql.append(" select ip.id,po.tousseDefinitionId,ip.readed,ip.depart,ip.departCoding,ip.[version],ip.applicationTime,po.tousseName,po.amount,po.prepareRecycleAmount,po.isCleanedEntirely,po.isApplyEntireTousse,po.tousseType,td.tousseGroupID ")