Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r40444 -r40446 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 40444) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 40446) @@ -6593,7 +6593,7 @@ /** * 返回器械包实例条码及器械包定义id的map * @param tousseInstanceList 器械包实例 - * @param tousseBarcodeMap 器械包实例条码及器械包定义id的map + * @param tousseBarcodeMap 器械包实例条码或者标识牌条码及器械包定义id的map * @return */ private Map buildTousseBarcodeMap(List tousseInstanceList, @@ -6604,11 +6604,20 @@ return tempTousseBarcodeMap; } for (TousseInstance tousseInstance : tousseInstanceList) { + //器械包条码 Long tousseDefinitionId = tousseBarcodeMap.get(tousseInstance.getBarcode()); if(tousseDefinitionId == null){ continue; } tempTousseBarcodeMap.put(tousseInstance.getBarcode(), tousseDefinitionId); + + //标识牌条码 + tousseDefinitionId = tousseBarcodeMap.get(tousseInstance.getIdCardInstanceBarcode()); + if(tousseDefinitionId == null){ + continue; + } + tempTousseBarcodeMap.put(tousseInstance.getIdCardInstanceBarcode(), tousseDefinitionId); + } return tempTousseBarcodeMap; }