Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js =================================================================== diff -u -r33434 -r33523 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js (.../modifyPatientOfForeignTousseInfoForm.js) (revision 33434) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js (.../modifyPatientOfForeignTousseInfoForm.js) (revision 33523) @@ -471,7 +471,7 @@ } var printForeignTousseForReceivedWindow; -//打开打印待接收外来器械包的界面 +//打开打印处理外来器械统计表的界面 function openPrintForeignTousseWindow() { var orgUnitGroupStore = new top.Ext.data.Store({ proxy: new Ext.data.HttpProxy({ @@ -635,7 +635,7 @@ printForeignTousseForReceivedWindow = new top.Ext.Window({ id: 'printForeignTousseForReceivedWindow', - title: '打印待接收外来器械包', + title: '打印处理外来器械统计表', height: 150, width: 600, resizable: false, Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js =================================================================== diff -u -r33421 -r33523 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 33421) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 33523) @@ -494,7 +494,7 @@ modifyPatientInfo(records[0].data.id); } }, '-', { - text : '打印待接收外来器械包', + text : '打印处理外来器械统计表', iconCls : 'icon_print', id : 'printTbar', hidden : !sstsConfig.enableTheFunctionOfPrintingOfForeignTousseToBeReceived, Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r33437 -r33523 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 33437) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 33523) @@ -4857,7 +4857,7 @@ }; } -//打印待接收外来器械包 +//打印处理外来器械统计表 function printForeignTousseForReceived(printObj, printType) { var configObj = printConfig.printForeignTousseForReceived; if (isUndefinedOrNullOrEmpty(configObj)) { @@ -4871,7 +4871,7 @@ LODOP.PRINT_INIT(""); setPrinterByConfig(); LODOP.SET_PRINT_STYLE("ItemType", 4); - LODOP.SET_PRINT_PAGESIZE(1, '297mm', '210mm', ""); + LODOP.SET_PRINT_PAGESIZE(0, 0, 0, "A4"); if (!isObjEmpty(configObj.headerFooter)) { var label = configObj.headerFooter[0].label; var fontSize = configObj.headerFooter[0].fontSize; Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js =================================================================== diff -u -r33449 -r33523 --- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js (.../printConfig.js) (revision 33449) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js (.../printConfig.js) (revision 33523) @@ -656,23 +656,23 @@ var printForeignTousseForReceivedConfig = { headerFooter : [ - {label : "待接收外来器械包统计表", dataIndex : '', fontSize : 22, position : [20,20,"95%",50]} + {label : "处理外来器械统计表", dataIndex : '', fontSize : 22, position : [20,20,"95%",50]} ], goodsTable :{ rowHeight : 22, fontSize:15, position : [80,"2.5%","95%","21cm"], columns : [ {header : "序号", dataIndex : '', width : '35', align : 'center'}, - {header : "申请时间", dataIndex : 'applicationTime', width : '70', align : 'center'}, + {header : "申请时间", dataIndex : 'applicationTimeStr', width : '70', align : 'center'}, {header : "申请科室", dataIndex : 'depart', width : '70', align : 'center'}, - {header : "床位", dataIndex : 'bedNumber', width : '35', align : 'center'}, + {header : "病人所属科室", dataIndex : 'ascriptionDepartment', width : '70', align : 'center'}, {header : "病人姓名", dataIndex : 'patient', width : '50', align : 'center'}, {header : "住院号", dataIndex : 'hospitalNumber', width : '40', align : 'center'}, {header : "手术名称", dataIndex : 'surgery', width : '60', align : 'center'}, - {header : "物品名称", dataIndex : 'tousseName', width : '60', align : 'center'}, {header : "供应商", dataIndex : 'supplier', width : '80', align : 'center'}, - {header : "手术医生", dataIndex : 'doctor', width : '50', align : 'center'} + {header : "执行者", width : '50', align : 'center'}, + {header : "备注", dataIndex : 'remark', width : '50', align : 'center'} ] } } @@ -1453,7 +1453,7 @@ }, //打印一次性物品汇总单 printDisposableGoodsInvoicePlanSummary:printDisposableGoodsInvoicePlanSummary_gdszyy, - //打印待接收外来器械包 + //打印处理外来器械统计表 printForeignTousseForReceived:printForeignTousseForReceivedConfig, //定制打印一次性物品汇总单的物资编码(必填) inventorySerialNumber:['31012600010','31011600013','31011600010','31011600001','31012600034','31012600040','31012600033','31012600032','31012600031',