Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r23860 -r24188 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 23860) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 24188) @@ -314,6 +314,10 @@ displayName: '科室', textForPreview: '急诊科' }),new ObjectDataSourceProperty({ + propName: 'processType', + displayName: '处理方式', + textForPreview: '加急' + }),new ObjectDataSourceProperty({ propName: 'sterilizer', displayName: '炉号', textForPreview: '1号灭菌炉' Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r23860 -r24188 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 23860) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 24188) @@ -194,7 +194,7 @@ } applicationItemTotal = "工具" + toolsAmount + ",植入物" + implantsAmount; - + obj.put("processType", StringTools.defaultString(app.getProcessType())); obj.put("clinicNumber", clinicNumber); obj.put("hospitalNumber", hospitalNumber); obj.put("doctor", doctor);