Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java =================================================================== diff -u -r33817 -r35271 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java (.../TousseItemVo.java) (revision 33817) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java (.../TousseItemVo.java) (revision 35271) @@ -180,6 +180,10 @@ * 物品申领备注 */ private String remarkOfApplyGoods; + /** + * 回收项id + */ + private Long recyclingItemId; @Override public String toString() { return "{\"id\":\"" + id + "\", \"ancestorId\":\"" + ancestorId @@ -676,5 +680,13 @@ public void setRemarkOfApplyGoods(String remarkOfApplyGoods) { this.remarkOfApplyGoods = remarkOfApplyGoods; } + + public Long getRecyclingItemId() { + return recyclingItemId; + } + + public void setRecyclingItemId(Long recyclingItemId) { + this.recyclingItemId = recyclingItemId; + } } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r35133 -r35271 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 35133) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 35271) @@ -455,6 +455,7 @@ tousseItemVo = tousseDefIdTousseItemVoMap.get(td.getAncestorID()); } if (tousseItemVo != null) { + tousseItemVo.setRecyclingItemId(recyclingItem.getId()); //回收时扫描的器械包实例条码或者标识牌实例条码的集合(用分号分隔) String tousseOrIDCardInstanceBarcodes = tousseItemVo.getTousseOrIDCardInstanceBarcodes(); //设置对应包实例的“回收状态”和“回收项id” @@ -502,7 +503,12 @@ Map tousseIdToRecyclingItemIdMap = new HashMap(); for (RecyclingItem recyclingItem : items) { tousseIdToRecyclingItemIdMap.put(recyclingItem.getTousseDefinitionId(), recyclingItem.getId()); - TousseItemVo vo = tousseDefIdTousseItemVoMap.get(recyclingItem.getTousseDefinitionId()); + TousseItemVo vo = null; + for (Entry entry : tousseDefIdTousseItemVoMap.entrySet()) { + if(MathTools.equals(entry.getValue().getRecyclingItemId(), recyclingItem.getId())){ + vo = entry.getValue(); + } + } if(vo != null){ recyclingItem.setRemark(vo.getTousseRemark()); recyclingItem.setErrorRemark(vo.getErrorRemark());