Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImplV2.java =================================================================== diff -u -r31408 -r31409 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImplV2.java (.../HIPMessageWebServiceImplV2.java) (revision 31408) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImplV2.java (.../HIPMessageWebServiceImplV2.java) (revision 31409) @@ -472,6 +472,14 @@ // 加急级别 tousseInstance.setUrgentLevelForUseRecord(tiBarcodeToUrgentLevelMap.get(tousseInstance.getBarcode())); } + if(MapUtils.isNotEmpty(errorRemarkMap)){ + // 丢失备注 + tousseInstance.setErrorRemark(errorRemarkMap.get(tousseInstance.getBarcode())); + } + if(MapUtils.isNotEmpty(damageRemarkMap)){ + // 报损备注 + tousseInstance.setDamageRemark(damageRemarkMap.get(tousseInstance.getBarcode())); + } } objectDao.batchSaveOrUpdate(tiList); String useRecordAuditMode = ConfigUtils.getSystemSetConfigByName("useRecordAuditMode", ""); @@ -507,9 +515,6 @@ List materialErrorDamageList = tiBarcodeToErrorDamageMap.get(tousseInstance.getBarcode()); if(CollectionUtils.isNotEmpty(materialErrorDamageList)){ setErrorDamageInfo(tousseInstance, tousseDefinition, materialErrorDamageList, newUseRecord); - // 丢失报损备注 - tousseInstance.setErrorRemark(errorRemarkMap.get(tousseInstance.getBarcode())); - tousseInstance.setDamageRemark(damageRemarkMap.get(tousseInstance.getBarcode())); } } }