Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
===================================================================
diff -u -r40589 -r40593
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java	(.../ForeignTousseApplicationTableManager.java)	(revision 40589)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java	(.../ForeignTousseApplicationTableManager.java)	(revision 40593)
@@ -478,7 +478,7 @@
 			sqlBuffer.append(TousseItem.class.getSimpleName());
 			sqlBuffer.append(" tim on (td.id = tim.tousseDefinitionId or td.parentID = tim.tousseDefinitionId) where ");
 			sqlBuffer.append(SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.invoicePlanID", foreignTousseApplicationIdList));
-			sqlBuffer.append(" and (tim.isTerminated is null or tim.isTerminated <> 1) and ti.operationTime is not null ");
+			sqlBuffer.append(" and ti.operationTime is not null ");
 			
 			ResultSet rs = null;
 			
@@ -515,6 +515,8 @@
 			}
 		}
 		
+		//启用提前归还时不覆盖已完成状态的功能ZSYY-434
+		boolean enableEarlyReturnPreservesCompletedStatus = ConfigUtils.getSystemSetConfigByNameBool("enableEarlyReturnPreservesCompletedStatus");
 		for (Object row : rows) {
 			JSONObject obj = (JSONObject) row;
 			Long id = obj.optLong("id");
@@ -523,15 +525,6 @@
 			String packingState = "待装配";
 			//灭菌状态
 			String sterilizationState = "待灭菌";
-			//已经灭菌的器械包实例数量
-			if(StringUtils.equals(endStatus, InvoicePlan.STATUS_END)){
-				//申请单被终止时，装配状态、灭菌状态都显示"已终止"
-				packingState = "已终止";
-				sterilizationState = "已终止";
-				obj.put("packingState", packingState);
-				obj.put("sterilizationState", sterilizationState);
-				continue;
-			}
 			//材料总数
 			Integer totalMaterialAmount = totalMaterialAmountMap.get(id) == null ? 0 : totalMaterialAmountMap.get(id);
 			//已经装配材料总数
@@ -553,6 +546,24 @@
 					}
 				}
 			}
+			//已经灭菌的器械包实例数量
+			if(StringUtils.equals(endStatus, InvoicePlan.STATUS_END)){
+				//申请单被终止时，装配状态、灭菌状态都显示"已终止"
+				if(enableEarlyReturnPreservesCompletedStatus){
+					if(StringUtils.equals(packingState, "待装配")){
+						packingState = "已终止";
+					}
+					if(StringUtils.equals(sterilizationState, "待灭菌")){
+						sterilizationState = "已终止";
+					}
+				}else{
+					packingState = "已终止";
+					sterilizationState = "已终止";
+				}
+				obj.put("packingState", packingState);
+				obj.put("sterilizationState", sterilizationState);
+				continue;
+			}
 			obj.put("packingState", packingState);
 			obj.put("sterilizationState", sterilizationState);
 		}
@@ -575,7 +586,7 @@
 		sqlBuffer.append(TousseItem.class.getSimpleName());
 		sqlBuffer.append(" tim where ");
 		sqlBuffer.append(SqlUtils.getNonStringFieldInLargeCollectionsPredicate("tim.recyclingApplication_ID", foreignTousseApplicationIdList));
-		sqlBuffer.append(" and (tim.isTerminated is null or tim.isTerminated <> 1) ");
+		//sqlBuffer.append(" and (tim.isTerminated is null or tim.isTerminated <> 1) ");
 		sqlBuffer.append(" group by tim.recyclingApplication_ID ");
 		
 		ResultSet rs = null;