Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r32547 -r32635
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 32547)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 32635)
@@ -3305,20 +3305,21 @@
 			List<PackingTask> packingTaskList = getPackingTaskListByIDCardInstanceID(idCardInstance
 					.getId());
 			String msg = getErrorDamageRemarkByPackingTasks(packingTaskList);
-			if(StringUtils.isNotBlank(msg)){
-				Long lastTousseInstanceId = idCardInstance.getLastTousseInstanceId();
-				if(DatabaseUtil.isPoIdValid(lastTousseInstanceId)){
-					TousseInstance ti = tousseInstanceManager.get(lastTousseInstanceId);
-					ErrorDamageRemark errorDamageRemark =  ti.getErrorDamageRemark();
-					if(errorDamageRemark != null){
-						idCardInstanceJsonObj.addProperty("errorDamageRemarkId", errorDamageRemark.getId());
-						if(errorDamageRemark.getErrorDamageRemark().equals(msg)){//如果丢失报损数据和上一轮无变动，则使用用户最后一次修改的丢书报损备注
-							msg = errorDamageRemark.getCustomErrorDamageRemark();
-						}
+			Long lastTousseInstanceId = idCardInstance.getLastTousseInstanceId();
+			if(DatabaseUtil.isPoIdValid(lastTousseInstanceId)){
+				TousseInstance ti = tousseInstanceManager.get(lastTousseInstanceId);
+				ErrorDamageRemark errorDamageRemark =  ti.getErrorDamageRemark();
+				if(errorDamageRemark != null){
+					idCardInstanceJsonObj.addProperty("errorDamageRemarkId", errorDamageRemark.getId());
+					if(StringUtils.isNotBlank(msg) && errorDamageRemark.getErrorDamageRemark().equals(msg)){//如果丢失报损数据和上一轮无变动，则使用用户最后一次修改的丢失报损备注
+						msg = errorDamageRemark.getCustomErrorDamageRemark();
+					}else{
+						//优先显示自定义备注
+						msg = StringUtils.isBlank(errorDamageRemark.getCustomErrorDamageRemark())?errorDamageRemark.getErrorDamageRemark():errorDamageRemark.getCustomErrorDamageRemark();
 					}
 				}
-				idCardInstanceJsonObj.addProperty("errorDamageRemark", msg);
 			}
+			idCardInstanceJsonObj.addProperty("errorDamageRemark", msg);
 			idCardInstanceJsonObj.addProperty("id", idCardInstance.getId());
 			idCardInstanceJsonObj.addProperty("barcode",
 					idCardInstance.getBarcode());
@@ -4012,7 +4013,7 @@
 			errorDamageRemark = (ErrorDamageRemark)objectDao.getById(ErrorDamageRemark.class.getSimpleName(), errorDamageRemarkId);
 			errorDamageRemark.setCustomErrorDamageRemark(remark);
 			errorDamageRemark.setErrorDamageRemark(errorDamageRemarkInfo);
-		}else if(StringUtils.isNotBlank(errorDamageRemarkInfo)){
+		}else if(StringUtils.isNotBlank(errorDamageRemarkInfo) || StringUtils.isNotBlank(remark)){
 			errorDamageRemark = new ErrorDamageRemark();
 			errorDamageRemark.setCustomErrorDamageRemark(remark);
 			errorDamageRemark.setErrorDamageRemark(errorDamageRemarkInfo);