Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r29813 -r29818
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 29813)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 29818)
@@ -8476,7 +8476,7 @@
 		}
 		comboTousse.put("currrentTaskAmount", totalAmount);
 		comboTousse.put("unWashAmount", unWashAmount);
-		return totalAmount;
+		return totalAmount+unWashAmount;
 	}
 	@Override
 	public Set<String> filterDepartmentsWithoutTousses(Set<String> departCodesSet) {
@@ -8490,22 +8490,13 @@
 			}else{
 				departCodingSql = "";
 			}
-			SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj();
-			//清洗完成后装配
-			String isPackingAfterWashTimeEndSql = "";
-			if(config != null){
-				boolean isPackingAfterWashTimeEnd = BooleanUtils.toBooleanDefaultIfNull(config.getIsPackingAfterWashTimeEnd(), true);
-				if(isPackingAfterWashTimeEnd){
-					isPackingAfterWashTimeEndSql = " and (pt.tasktype<>1 or pt.tasktype=1 and pt.washtime is not null) ";
-				}
-			}
 			String sql = String.format("select distinct pt.departCoding from %s pt "
 					+ " join %s td on td.id=pt.tousseDefinition_id "
 					+ " join %s ctc on ctc.toussedefinitionid=td.id "
 					+ " join %s co on co.id=ctc.combotoussedefinitionid "
 					+ " join %s cto on cto.combotoussedefinitionid=co.id and cto.unitcode=pt.departcoding "
 					+ " where  co.toussetype='%s' and (co.isDisable = '否' or co.isDisable is null)  "
-					+ " and pt.status = '%s' and pt.orgUnitCoding='%s' %s %s ",
+					+ " and pt.status = '%s' and pt.orgUnitCoding='%s' %s ",
 					PackingTask.class.getSimpleName(),
 					TousseDefinition.class.getSimpleName(),
 					ComboTousseComposite.class.getSimpleName(),
@@ -8514,8 +8505,7 @@
 					TousseDefinition.PACKAGE_TYPE_COMBO,
 					PackingTask.STATUS_AWAIT_PACKING,
 					handlerDepartCode,
-					departCodingSql,
-					isPackingAfterWashTimeEndSql);
+					departCodingSql);
 			rs = objectDao.executeSql(sql);
 			while (rs.next()) {
 				String departCoding = rs.getString("departCoding");