Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r33699 -r34029 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 33699) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 34029) @@ -839,6 +839,8 @@ obj.put("procStartTime",StringUtils.defaultString(firstSlrProcStartTime, " ")); //开始时间 obj.put("name",StringUtils.defaultString(sDefine.getMachineNumber(), " ")); //灭菌炉接口机器名称 obj.put("machName",StringUtils.defaultString(sterilizationRecord.getSterilizerName(), " ")); //机器炉号 + DeviceInterface deviceInterface = sDefine.getDeviceInterface(); + obj.put("deviceBrand", deviceInterface == null?"":deviceInterface.getDeviceBrand()); array.add(obj); } return array.toString();