Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java =================================================================== diff -u -r37872 -r37953 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 37872) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java (.../InstrumentInstanceManagerImpl.java) (revision 37953) @@ -1632,7 +1632,7 @@ if(rowCount > 0){ - String sql = String.format("select md.name materialDefinitionName, ii.id, ii.udi, ii.instrumentBarcode, ii.receiveRecordId %s ", fromSql); + String sql = String.format("select md.name materialDefinitionName, md.specification, ii.id, ii.udi, ii.instrumentBarcode, ii.receiveRecordId %s ", fromSql); ResultSet rs = null; try { @@ -1649,6 +1649,10 @@ InstrumentInstanceVo vo = new InstrumentInstanceVo(); vo.setId(rs.getLong("id")); vo.setMaterialDefinitionName(rs.getString("materialDefinitionName")); + vo.setSpecification(rs.getString("specification")); + if(StringUtils.isNotBlank(vo.getSpecification())){ + vo.setMaterialDefinitionName(String.format("%s[%s]", vo.getMaterialDefinitionName(), vo.getSpecification())); + } vo.setUdi(rs.getString("udi")); vo.setInstrumentBarcode(rs.getString("instrumentBarcode")); vo.setReceiveRecordId(rs.getLong("receiveRecordId"));