Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r15353 -r15479 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 15353) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 15479) @@ -383,6 +383,7 @@ tousseObj.foreignTousseApp_id = tousseAppID; tousseObj.isPrintOrg = records[i].data['isPrintOrg']; tousseObj.department = records[i].data['department']; + tousseObj.depart = tousseObj.department; tousseObj.applicant = records[i].data['applicant']; tousseObj.maker = records[i].data['maker']; tousseObj.assistant = records[i].data['assistant']; Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r15476 -r15479 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 15476) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 15479) @@ -165,6 +165,10 @@ displayName: '失效日期', textForPreview: '2016-09-17' }),new ObjectDataSourceProperty({ + propName: 'depart', + displayName: '科室', + textForPreview: '急诊科' + }),new ObjectDataSourceProperty({ propName: 'sterilizer', displayName: '炉号', textForPreview: '1号灭菌炉' @@ -203,6 +207,10 @@ displayName: '失效日期', textForPreview: '2016-09-17' }),new ObjectDataSourceProperty({ + propName: 'depart', + displayName: '科室', + textForPreview: '急诊科' + }),new ObjectDataSourceProperty({ propName: 'sterilizer', displayName: '炉号', textForPreview: '1号灭菌炉' Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r15459 -r15479 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 15459) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 15479) @@ -711,6 +711,7 @@ if(StringUtils.isNotBlank(department)){ obj.put("department", department);//新增器械包打印科室 + obj.put("depart", department);//新增器械包打印科室 } obj.put("isTraceable", isTraceable);