Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r21304 -r21330
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 21304)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 21330)
@@ -1013,7 +1013,7 @@
 			obj.put("department", department);
 		}
 		obj.put("includedTousseAmount", tousseInstance.getTousseInstancesAmountBelongToThisComboTousse(objectDao));
-		if(tousseInstance.getHaveUnSupplementMaterials()){
+		if(tousseInstance.safelyGetHaveUnSupplementMaterials()){
 			TousseInstanceUtils.setReduceAndDamageDescription(objectDao, tousseInstance, obj);
 		}
 	}
@@ -2783,18 +2783,19 @@
 	 */
 	private PackingRecord createPackingRecord(String inspector, String operator, String wrapper, String orgUnitCoding,String orgUnitName, String taskGroup,
 			String sterilizer, String frequency, TousseDefinition tousseDefinition,
-			Date packingDate, Integer packingAmount, PackingTask currentPackingTask , List<PackingTask> packingTaskList) {
+			Date packingDate, Integer packingAmount, PackingTask currentPackingTask , 
+			List<PackingTask> packingTaskList,String reviewer,ForeignTousseApplication foreignTousseApplication,JSONArray splits) {
 		boolean allowForeignToussePartiallyPacking = CssdUtils.getSystemSetConfigByNameBool("allowForeignToussePartiallyPacking");
 		PackingRecord packingRecord = new PackingRecord();
 		packingRecord.setIsDirectPacking(false);
 		packingRecord.setSterilizer(sterilizer);
 		packingRecord.setFrequency(frequency);
 		packingRecord.setInspector(inspector);
 		packingRecord.setPacker(operator);
+		packingRecord.setReviewer(reviewer);
 		packingRecord.setWrapper(wrapper);
 		packingRecord.setPackTime(packingDate);
-		String tousseName =tousseDefinition
-				.getName();
+		String tousseName = tousseDefinition.getName();
 		packingRecord.setTousseName(tousseName);
 		packingRecord.setTousseType(tousseDefinition
 				.getTousseType());
@@ -2823,7 +2824,65 @@
 
 		packingRecord.setOrgUnitCoding(orgUnitCoding);
 		packingRecord.setOrgUnitName(orgUnitName);
-
+		if(foreignTousseApplication != null){
+			packingRecord.setSupplierName(foreignTousseApplication.getSupplierName());
+			packingRecord.setDoctor(foreignTousseApplication.getDoctor());
+		}
+		if(splits.size() > 0){
+			// 增加拆分名字
+			List<String> nameSet = new LinkedList<String>();
+			for (int i=0;i<splits.size();i++) {
+				JSONObject tousse = (JSONObject)splits.get(i);
+				String name = tousse.optString("tousseName");
+				nameSet.add(name);
+			}
+			packingRecord.setSplitTousseName(StringUtils.join(nameSet, ","));
+		}
+		// 外来器械设置工具和植入物数量信息
+		if(tousseDefinition.isForeignTousse()){
+			int toolAmount = 0;
+			int implantAmount = 0;
+			if(splits.size() > 0){
+				for (int ti=0;ti<splits.size();ti++) {
+					JSONObject tousse = (JSONObject)splits.get(ti);
+					JSONArray materialsArray = tousse.optJSONArray("materialsJsonArray");
+					for (int i=0;i<materialsArray.size();i++) {
+						JSONObject item = (JSONObject)materialsArray.get(i);
+						
+						String includeImplant = item.optString("includeImplant");
+						int amount = item.optInt("materialAmount");
+						
+						if (Constants.STR_YES.equals(includeImplant)) {
+							implantAmount += amount;
+						}else{
+							toolAmount += amount;
+						}
+					}
+				}
+			}else{
+				List<MaterialInstance> materialInstances = tousseDefinition.getMaterialInstances();
+				if(materialInstances != null){
+					for (MaterialInstance materialInstance : materialInstances) {
+						int amount = materialInstance.getCount();
+						if(Constants.STR_YES.equals(materialInstance.materialIsImplant())){
+							implantAmount += amount;
+						}else{
+							toolAmount += amount;
+						}
+					}
+				}
+			}
+			List<String> list = new LinkedList<String>();
+			if(toolAmount>0){
+				list.add(String.format("工具*%s", toolAmount));
+			}
+			if(implantAmount>0){
+				list.add(String.format("植入物*%s", implantAmount));
+			}
+			if(list.size() > 0){
+				packingRecord.setForeignMaterialsAmount(StringUtils.join(list, "、"));
+			}
+		}
 		saveOrUpdate(packingRecord);
 		
 		//记录装配记录与篮筐实例的对应关系
@@ -3720,7 +3779,7 @@
 					splitsTousseList = new ArrayList<TousseInstance>(splits.size());
 	
 					PackingRecord packingRecord = createPackingRecord( inspector, operator, wrapper, orgUnitCoding, orgUnitName,taskGroup, sterilizerName,
-							sterileFrequency, td, packingDate, currentPackAmount, currentPackingTask , null);
+							sterileFrequency, td, packingDate, currentPackAmount, currentPackingTask , null,reviewer,foreignTousseApplication,splits);
 					
 					// 汇总装配记录对应的一次性物品扣减信息
 //					summaryOutDisposableGoodsStockInfo(packingRecordToDisposableGoodsOutAmount, packingRecord, disposableGoodsIdToAmount);
@@ -3775,7 +3834,7 @@
 						packingRecord = createPackingRecord(inspector,
 								operator, wrapper, orgUnitCoding,orgUnitName, taskGroup,
 								sterilizerName, sterileFrequency, td, packingDate,
-								packingAmountForThisTask, currentPackingTask , currentPackingTaskAsList);
+								packingAmountForThisTask, currentPackingTask , currentPackingTaskAsList,reviewer,foreignTousseApplication,splits);
 					}
 					
 					Long packignRecordId = null;