Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r20091 -r20370
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 20091)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 20370)
@@ -957,6 +957,8 @@
                						isThereIdentificationCard: isThereIdentificationCard,
                						isApplyEntireTousse: td.isApplyEntireTousse,
                						urgentAmount : 0,
+               						errorRemark : ti.errorRemark,
+               						damageRemark : ti.damageRemark,
                						tousseRemark:'',
                						errorDamageQmKey : errorDamageQmKey
                				};
@@ -1032,6 +1034,8 @@
                             						isThereIdentificationCard: '是',
                             						isApplyEntireTousse: td.isApplyEntireTousse,
                             						urgentAmount : 0,
+                            						errorRemark : ti.errorRemark,
+                               						damageRemark : ti.damageRemark,
                             						tousseRemark:'',
                             						errorDamageQmKey : errorDamageQmKey
                             			 };
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r20154 -r20370
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 20154)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 20370)
@@ -972,7 +972,7 @@
 		boolean isIDCardInstance = false;
 		String errorMessage = null;
 		Long idCardUseAmount = null;
-		List<MaterialErrorDamageDetail> details = null;
+		List<ErrorDamageDetailVo> details = null;
 		if (StringUtils.isNotBlank(barcode)) {
 			orgUnit = orgUnitManager.getOrgUnitByBarcode(barcode);
 			if (orgUnit != null) {
@@ -1031,7 +1031,11 @@
 							}
 							
 							if(!StringUtils.equals(TousseInstance.STATUS_RECYCLED, tousseInstance.getStatus())){
-								details = materialErrorDamageDetailManager.get(tousseInstance);
+								details = build(materialErrorDamageDetailManager.get(tousseInstance));
+								List<TousseMaterialErrorDamage> tousseErrorDamages = tousseMaterialErrorDamageManager.getByProperty("tousseInstanceId", tousseInstance.getId());
+								List<Long> materialDefinitionIds = tousseErrorDamages.stream().map(tmed->tmed.getMaterialDefinitionId()).collect(Collectors.toList());
+								Collection<MaterialDefinition> materialDefinitions = materialDefinitionManager.getCollection(materialDefinitionIds);
+								details.addAll(buildTousseMaterialErrorDamage(tousseInstance,tousseErrorDamages,materialDefinitions));
 							}
 						}
 					}
@@ -1083,7 +1087,11 @@
 									|| tousseInstance.isSigned()
 									|| tousseInstance.isPreRecycled()) {
 								if(!tousseInstance.isRecycled()){
-									details = materialErrorDamageDetailManager.get(tousseInstance);
+									details = build(materialErrorDamageDetailManager.get(tousseInstance));
+									List<TousseMaterialErrorDamage> tousseErrorDamages = tousseMaterialErrorDamageManager.getByProperty("tousseInstanceId", tousseInstance.getId());
+									List<Long> materialDefinitionIds = tousseErrorDamages.stream().map(tmed->tmed.getMaterialDefinitionId()).collect(Collectors.toList());
+									Collection<MaterialDefinition> materialDefinitions = materialDefinitionManager.getCollection(materialDefinitionIds);
+									details.addAll(buildTousseMaterialErrorDamage(tousseInstance,tousseErrorDamages,materialDefinitions));
 								}
 							} else {
 								errorMessage = "器械包必须是已发货、已使用、已签收或预回收的状态,该包当前状态为:" + status;