Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ErrorDamageDetailVo.java
===================================================================
diff -u -r28972 -r34841
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ErrorDamageDetailVo.java	(.../ErrorDamageDetailVo.java)	(revision 28972)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ErrorDamageDetailVo.java	(.../ErrorDamageDetailVo.java)	(revision 34841)
@@ -19,6 +19,15 @@
 	private String linkType;
 	private Integer unconfirmedAmount = 0;
 	private Integer status;
+	/**
+	 * 器械丢失备注
+	 */
+	private String errorRemark;
+	
+	/**
+	 * 器械报损备注
+	 */
+	private String damageRemark;
 	public ErrorDamageDetailVo(MaterialErrorDamageDetail detail){
 		this.id = detail.getId();
 		this.tousseDefinitionId = detail.getTousseDefinitionId();
@@ -30,10 +39,10 @@
 		this.type = detail.getType();
 		this.linkType = detail.getLinkType();
 		this.status = detail.getStatus();
+		this.errorRemark = detail.getErrorRemark();
+		this.damageRemark = detail.getDamageRemark();
 		if(detail.getStatus() != null && MaterialErrorDamageDetail.STATUS_TWO.intValue() == detail.getStatus().intValue()){
 			this.unconfirmedAmount = amount;
-		}else{
-			this.amount = amount;
 		}
 	}
 	public ErrorDamageDetailVo(){
@@ -105,5 +114,17 @@
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
+	public String getErrorRemark() {
+		return errorRemark;
+	}
+	public void setErrorRemark(String errorRemark) {
+		this.errorRemark = errorRemark;
+	}
+	public String getDamageRemark() {
+		return damageRemark;
+	}
+	public void setDamageRemark(String damageRemark) {
+		this.damageRemark = damageRemark;
+	}
 	
 }