Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r19445 -r19454
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19445)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19454)
@@ -2560,7 +2560,7 @@
 	 */
 	private void packingSplitPackages(String operator, String operatorCode,
 			String reviewer, String reviewerCode,String sterileUserName,String sterileUserCode, String sterilingType,String sterilizer, String frequency,
-			String stock, JSONArray splitPackages,TousseDefinition td, PackingRecord packingRecord,
+			String stock, JSONArray splitPackages,TousseDefinition td, PackingRecord packingRecord,String taskGroup,
 			String washBasket,ForeignTousseApplication foreignTousseApplication,String orgUnitCoding, 
 			String orgUnitName, Date packingDate,String tousseWeight,String remark, PackingTask currentPackingTask,Map<Long,WashAndDisinfectRecord> idToWashRecordMap,
 			Map<Long,RecyclingRecord> idToRecyclingRecordMap,Date sterileStartTime) {
@@ -2626,7 +2626,7 @@
 			// 包实例
 			TousseInstance tousseInstance = createTousseInstance(operator,
 					operatorCode, reviewer, reviewerCode,sterileUserName, sterileUserCode, packageType,
-					sterilingType, stock,washBasket, sterilizer, frequency, sterileStartTime, validUntil, warningUntil, packingRecord,
+					sterilingType, stock,washBasket, sterilizer, frequency, sterileStartTime, validUntil, warningUntil, packingRecord,taskGroup,
 					tousseDefinition, tousseType, tousseName,
 					foreignTousseApplication, packingDate, foreignTprice,
 					fluctuationPrice, tousseAmount, orgUnitCoding, orgUnitName,
@@ -3522,7 +3522,7 @@
 	
 					packingSplitPackages(operator, operatorCode,
 							reviewer, reviewerCode,sterileUserName, sterileUserCode, sterilingType, sterilizerName, sterileFrequency,
-							stock,splits, td,packingRecord, washBasket,foreignTousseApplication, orgUnitCoding,orgUnitName, 
+							stock,splits, td,packingRecord,taskGroup, washBasket,foreignTousseApplication, orgUnitCoding,orgUnitName, 
 							packingDate,tousseWeight,remark, currentPackingTask,idToWashRecordMap,idToRecyclingRecordMap,sterileStartTime);
 					currentPackingTaskAsList = packingTasks;
 				} else {
@@ -4143,7 +4143,7 @@
 	
 				TousseInstance tousseInstance = createTousseInstance(operator,
 					operatorCode, reviewer, reviewerCode,sterileUserName,sterileUserCode, packageType,sterilingType, stock,
-					washBasket, sterilizerName, sterileFrequency, sterileStartTime, validUntil, warningUntil, packingRecord,
+					washBasket, sterilizerName, sterileFrequency, sterileStartTime, validUntil, warningUntil, packingRecord,taskGroup,
 					tousseDefinition, tousseType, tousseName,foreignTousseApplication, packingDate, toussePrice,
 					fluctuationPrice, tousseAmount, orgUnitCoding, orgUnitName,unTraceableTousse, barcodeStr, tousseWeight,remark,
 					prePackingTask,idToWashRecordMap,idToRecyclingRecordMap,washJson,comboTousseInstanceId,comboTousseInstanceStatus);
@@ -4466,7 +4466,7 @@
 			String sterilingType, String stock, String washBasket,
 			String sterilizerName, String sterileFrequency,
 			Date sterileStartTime, Date validUntil, Date warningUntil,
-			PackingRecord packingRecord, TousseDefinition td, String tousseType,
+			PackingRecord packingRecord,String taskGroup, TousseDefinition td, String tousseType,
 			String tousseName,
 			ForeignTousseApplication foreignTousseApplication,
 			Date packingDate, double toussePrice, double fluctuationPrice,
@@ -4478,7 +4478,8 @@
 			JSONObject washJson, Long comboTousseInstanceId,String comboTousseStatus) {
 		TousseInstance tousseInstance = new TousseInstance();
 
-		tousseInstance.setTaskGroup(packingRecord.getTaskGroup());
+		tousseInstance.setTaskGroup(taskGroup);
+		
 		tousseInstance.setBarcode(barcodeStr);
 		tousseInstance.setWeight(tousseWeight);
 		tousseInstance.setRemark(remark);
@@ -4635,7 +4636,10 @@
 			tousseInstance.setRecyclingOperator(currentPackingTask.getRpRecyclingOperator());
 			tousseInstance.setRecyclingUser(currentPackingTask.getRpRecyclingOperator());
 		}
-		tousseInstance.setPackingRecord_id(packingRecord.getId());
+		if(packingRecord != null){
+			tousseInstance.setPackingRecord_id(packingRecord.getId());
+		}
+		
 
 		// 外来器械包,外来器械拆分小包关联外来器械申请单
 		if (TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(tousseType) || TousseDefinition.PACKAGE_TYPE_SPLIT.equals(tousseType)) {
@@ -6050,6 +6054,7 @@
 			String orgUnitName, String orgUnitCoding,
 			PackingRecord packingRecord) {
 		TousseInstance tousseInstance = new TousseInstance();
+		tousseInstance.setTaskGroup(packingRecord.getTaskGroup());
 		tousseInstance.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
 		tousseInstance.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE);
 		tousseInstance.setSterilizationUser(sterileUserName);