Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r28369 -r28373
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 28369)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 28373)
@@ -1256,8 +1256,12 @@
 	public void loadComboTousseByForeignTousseId(){
 		try {
 			Long foreignTousseId = StrutsParamUtils.getPraramLongValue("foreignTousseId", 0L);
-			Boolean showForeignTousseAncestorDefinition = StrutsParamUtils.getBoolPraramValue("isShowForeignTousseAncestorDefinitionForApply", true);
+			Boolean showForeignTousseAncestorDefinition = StrutsParamUtils.getBoolPraramValue("isShowForeignTousseAncestorDefinitionForApply", false);
 			List<TousseDefinition> combsTousseList = tousseDefinitionManager.loadComboTousseByForeignTousseId(foreignTousseId, showForeignTousseAncestorDefinition);
+			if(CollectionUtils.isEmpty(combsTousseList)){
+				combsTousseList = new ArrayList<TousseDefinition>();
+				combsTousseList.add(tousseDefinitionManager.get(foreignTousseId));
+			}
 			JSONArray data = new JSONArray();
 			if(CollectionUtils.isNotEmpty(combsTousseList)){
 				for (TousseDefinition tousseDefinition : combsTousseList) {
@@ -1274,9 +1278,14 @@
 						for (MaterialInstance materialInstance : materialInstances) {
 							JSONObject json = new JSONObject();
 							json.put("id", materialInstance.getId());
-							json.put("mterialName", materialInstance.getMaterialName());
+							String materialName = materialInstance.getMaterialName();
+							MaterialDefinition materialDefinition = materialInstance.getMaterialDefinition();
+							if(materialDefinition != null){
+								 materialName = CssdUtils.getMaterialName(materialDefinition);
+							}
+							json.put("materialName",materialName);
 							json.put("amount", materialInstance.getCount());
-							json.put("includeImplant", materialInstance.getIsImplant());
+							json.put("includeImplant", materialInstance.materialIsImplant());
 							json.put("minDismantleAmount", materialInstance.getMinDismantleAmount());
 							json.put("washClassifyType", materialInstance.getWashClassifyType());
 							materials.add(json);
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r28369 -r28373
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 28369)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 28373)
@@ -4707,8 +4707,11 @@
 			throw new RuntimeException("id无效");
 		}
 		TousseDefinition foreignTousse = this.get(foreignTousseId);
+		if(foreignTousse == null || foreignTousse.getAncestorID() == null){
+			return null;
+		}
 		TousseDefinition ancestorTousse = this.get(foreignTousse.getAncestorID());
-		if(!DatabaseUtil.isPoIdValid(ancestorTousse.getForeignComboId())){
+		if(ancestorTousse == null || !DatabaseUtil.isPoIdValid(ancestorTousse.getForeignComboId())){
 			return null;
 		}
 		return this.getCombForeignTousseDefinition(ancestorTousse.getForeignComboId(), showForeignTousseAncestorDefinition);