Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java =================================================================== diff -u -r34678 -r34679 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 34678) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 34679) @@ -1178,7 +1178,7 @@ throw new SystemException("标识牌实例无效"); } List result = new ArrayList(); - String sql = String.format("select ici.id IDCardInstanceId, md.id materialDefinitionId, md.name materialDefinitionName, " + String sql = String.format("select ici.id IDCardInstanceId, md.id materialDefinitionId, md.name materialDefinitionName, md.specification, " + "ii.id instrumentInstanceId, ii.udi, ii.instrumentBarcode, mi.count " + "from %s ici " + "join %s icd on icd.id = ici.idCardDefinitionID " @@ -1207,7 +1207,12 @@ InstrumentInstanceVo vo = new InstrumentInstanceVo(); vo.setIdCardInstanceId(rs.getLong("IDCardInstanceId")); vo.setMaterialDefinitionId(rs.getLong("materialDefinitionId")); - vo.setMaterialDefinitionName(rs.getString("materialDefinitionName")); + String name = rs.getString("materialDefinitionName"); + String specification = rs.getString("specification"); + if (StringUtils.isNotBlank(specification)) { + name = name + "[" + specification + "]"; + } + vo.setMaterialDefinitionName(name); vo.setId(rs.getLong("instrumentInstanceId")); vo.setUdi(rs.getString("udi")); vo.setInstrumentBarcode(rs.getString("instrumentBarcode"));