Index: ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/print/printConfig.js =================================================================== diff -u -r36694 -r36699 --- ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/print/printConfig.js (.../printConfig.js) (revision 36694) +++ ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/print/printConfig.js (.../printConfig.js) (revision 36699) @@ -284,9 +284,9 @@ columns : [ {header : "序号", dataIndex : 'serialNumber', width : '5%', align : 'center', fontSize : 11}, {header : "名称", dataIndex : 'name', width : '13%', align : 'left', fontSize : 11}, - {header : "病人姓名", dataIndex : 'patient', width : '9%', align : 'left', fontSize : 11}, - {header : "住院号/诊疗号", dataIndex : 'clinicNumber', width : '13%', align : 'left', fontSize : 11}, - {header : "病人所属科室", dataIndex : 'ascriptionDepartment', width : '12%', align : 'left', fontSize : 11}, + {header : "病人姓名", dataIndex : 'patientNames', width : '9%', align : 'left', fontSize : 11}, + {header : "住院号/诊疗号", dataIndex : 'hospitalNumAndClinicNumber', width : '13%', align : 'left', fontSize : 11}, + {header : "病人所属科室", dataIndex : 'ascriptionDepartments', width : '12%', align : 'left', fontSize : 11}, {header : "规格", dataIndex : 'specification', width : '10%', align : 'center', fontSize : 11}, {header : "单位", dataIndex : 'unit', width : '5%', align : 'center', fontSize : 11}, {header : "数量", dataIndex : 'amount', width : '5%', align : 'right', fontSize : 11}, Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r36694 -r36699 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 36694) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 36699) @@ -852,18 +852,18 @@ for (var k = 0; k < goodsArray.length; k++) { var row = goodsArray[k]; if(patient !== ''){ - row.patient = patient; + row.patientNames = patient; } //NFYY-86:printConfig添加3个字段 if(hospitalNumber !== '' && clinicNumber !== ''){ - row.clinicNumber = hospitalNumber+'/'+clinicNumber; + row.hospitalNumAndClinicNumber = hospitalNumber+'/'+clinicNumber; }else if(hospitalNumber !== '' && clinicNumber == ''){ - row.clinicNumber = hospitalNumber; + row.hospitalNumAndClinicNumber = hospitalNumber; }else if(hospitalNumber == '' && clinicNumber !== ''){ - row.clinicNumber = clinicNumber; + row.hospitalNumAndClinicNumber = clinicNumber; } - if(ascriptionDepartment){ - row.ascriptionDepartment = ascriptionDepartment; + if(ascriptionDepartment !== ''){ + row.ascriptionDepartments = ascriptionDepartment; } tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight, myObj.goodsTable.fontSize); for (var i = 0; i < columnCount; i++) {