Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r34770 -r34775
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 34770)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 34775)
@@ -3707,11 +3707,16 @@
 				ErrorDamageRemark errorDamageRemark =  ti.getErrorDamageRemark();
 				if(errorDamageRemark != null){
 					idCardInstanceJsonObj.put("errorDamageRemarkId", errorDamageRemark.getId());
-					if(StringUtils.isNotBlank(msg) && errorDamageRemark.getErrorDamageRemark().equals(msg)){//如果丢失报损数据和上一轮无变动，则使用用户最后一次修改的丢失报损备注
-						msg = errorDamageRemark.getCustomErrorDamageRemark();
-					}else{
-						//优先显示自定义备注
-						msg = StringUtils.isBlank(errorDamageRemark.getCustomErrorDamageRemark())?errorDamageRemark.getErrorDamageRemark():errorDamageRemark.getCustomErrorDamageRemark();
+					if(StringUtils.isNotBlank(msg)){
+						if(msg.equals(errorDamageRemark.getErrorDamageRemark())){//如果丢失报损数据和上一轮无变动，则使用用户最后一次修改的丢失报损备注
+							if(StringUtils.isNotBlank(errorDamageRemark.getCustomErrorDamageRemark())){
+								msg = errorDamageRemark.getCustomErrorDamageRemark();
+							}
+						}
+					}else if(StringUtils.isNotBlank(errorDamageRemark.getCustomErrorDamageRemark())){//丢失报损没有了,并且有自定义备注
+						if(!errorDamageRemark.getCustomErrorDamageRemark().equals(errorDamageRemark.getErrorDamageRemark())){//没有自定义
+							msg = errorDamageRemark.getCustomErrorDamageRemark();
+						}
 					}
 				}
 			}