Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r36627 -r36694 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 36627) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 36694) @@ -845,8 +845,26 @@ // 打印物品内容行 var columnCount = myObj.goodsTable.columns.length; var goodsArray = printSummaryObj.goods; + var patient = printSummaryObj.patient || ''; + var hospitalNumber = printSummaryObj.hospitalNumber || ''; + var clinicNumber = printSummaryObj.clinicNumber || ''; + var ascriptionDepartment = printSummaryObj.ascriptionDepartment || ''; for (var k = 0; k < goodsArray.length; k++) { var row = goodsArray[k]; + if(patient !== ''){ + row.patient = patient; + } + //NFYY-86:printConfig添加3个字段 + if(hospitalNumber !== '' && clinicNumber !== ''){ + row.clinicNumber = hospitalNumber+'/'+clinicNumber; + }else if(hospitalNumber !== '' && clinicNumber == ''){ + row.clinicNumber = hospitalNumber; + }else if(hospitalNumber == '' && clinicNumber !== ''){ + row.clinicNumber = clinicNumber; + } + if(ascriptionDepartment){ + row.ascriptionDepartment = ascriptionDepartment; + } tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight, myObj.goodsTable.fontSize); for (var i = 0; i < columnCount; i++) { var item = myObj.goodsTable.columns[i];