Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
===================================================================
diff -u -r40746 -r40937
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java	(.../RecyclingRecordManager.java)	(revision 40746)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java	(.../RecyclingRecordManager.java)	(revision 40937)
@@ -284,7 +284,7 @@
 	 * 保存并拆分回收记录(PYQZYY-173 多手术室器械包流转功能改造)
 	 * @param recyclingContext
 	 */
-	public void saveAndSplitRecyclingRecord(RecyclingContext recyclingContext);
+	public void saveAndSplitRecyclingRecord(RecyclingContext recyclingContext, RecyclingRecord recyclingRecord);
 	/**
 	 * 获取清洗装载状态，且里面的物品未被全部终止的篮筐
 	 * @return
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r40876 -r40937
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 40876)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 40937)
@@ -756,7 +756,7 @@
 				recyclingRecordManager.save(recyclingContext);
 			}else{
 				// 保存并根据科室拆分回收记录(PYQZYY-173 多手术室器械包流转功能改造)
-				recyclingRecordManager.saveAndSplitRecyclingRecord(recyclingContext);
+				recyclingRecordManager.saveAndSplitRecyclingRecord(recyclingContext , null);
 			}
 		}catch(RecyAmountNoMatchException e){
 			success = false;
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r40897 -r40937
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 40897)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 40937)
@@ -1723,7 +1723,7 @@
 			rc.setRecyclingApplicationId(params.optString("recyclingApplicationId"));
 			jsonParamObject.put("splitTousseJson", params.optJSONArray("splitTousseJson"));
 			// 保存并根据科室拆分回收记录(PYQZYY-173 多手术室器械包流转功能改造)
-			saveAndSplitRecyclingRecord(rc);
+			saveAndSplitRecyclingRecord(rc, record);
 		}
 	}
 	
@@ -10329,10 +10329,19 @@
 	}
 	
 	@Override
-	public void saveAndSplitRecyclingRecord(RecyclingContext recyclingContext) {
+	public void saveAndSplitRecyclingRecord(RecyclingContext recyclingContext, RecyclingRecord recyclingRecord) {
 		
 		//被拆分回收的申请单
 		RecyclingApplication invoicePlan = recyclingApplicationManager.get(recyclingContext.getRecyclingApplicationId());
+		if(recyclingRecord == null){
+			 invoicePlan = recyclingApplicationManager.get(recyclingContext.getRecyclingApplicationId());
+		}else{
+			InvoicePlan ip = recyclingRecord.getRecyclingApplication();
+			if(ip instanceof RecyclingApplication){
+				invoicePlan = (RecyclingApplication)ip;
+			}
+			
+		}
 		//参数拆分
 		splitRecyclingContext(recyclingContext, invoicePlan);
 		JSONObject jsonParamObject = recyclingContext.getJsonParamObject();
@@ -10354,7 +10363,12 @@
 			
 			//继续回收保留在原来申请单上的物品
 			if(tousseJson != null && tousseJson.size() > 0){
-				this.save(recyclingContext);
+				//不拆分回收
+				if(recyclingRecord != null){
+					this.save(recyclingRecord, recyclingContext);
+				}else{
+					this.save(recyclingContext);
+				}
 			}
 			
 			//拆分回收 根据科室分组
@@ -10381,11 +10395,21 @@
 					OrgUnit ou = (OrgUnit)objectDao.getByProperty(OrgUnit.class.getSimpleName(), "name", depart);
 					tempRecyclingContext.setDepartCode(ou == null ? "" : ou.getOrgUnitCoding());
 				}
-				this.save(tempRecyclingContext);
+				//不拆分回收
+				if(recyclingRecord != null){
+					this.save(recyclingRecord, recyclingContext);
+				}else{
+					this.save(recyclingContext);
+				}
 			}
 		} else {
 			//不拆分回收
-			this.save(recyclingContext);
+			if(recyclingRecord != null){
+				this.save(recyclingRecord, recyclingContext);
+			}else{
+				this.save(recyclingContext);
+			}
+			
 		}
 //		throw new RuntimeException("回收测试");
 	}