Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r23081 -r23424 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 23081) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 23424) @@ -346,6 +346,14 @@ displayName: '外来器械供应商', textForPreview: '康复' }),new ObjectDataSourceProperty({ + propName: 'supplierContactName', + displayName: '供应商联系人', + textForPreview: '张三' + }),new ObjectDataSourceProperty({ + propName: 'supplierPhoneNumber', + displayName: '供应商联系人电话', + textForPreview: '18912345678' + }),new ObjectDataSourceProperty({ propName: 'operationTime', displayName: '手术时间', textForPreview: '2017-02-27' Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r23082 -r23424 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 23082) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 23424) @@ -207,6 +207,8 @@ obj.put("bedNumber", bedNumber); obj.put("supplierName", StringTools.defaultString(app.getSupplierName())); + obj.put("supplierContactName", app.getSupplierContactName()); + obj.put("supplierPhoneNumber", app.getSupplierPhoneNumber()); String queryString = "select count(*) from TousseInstance po where po.foreignTousseApp_id = :id"; Session session = objectDao.getHibernateSession();