Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js =================================================================== diff -u -r23697 -r28508 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js (.../invoicePrint.js) (revision 23697) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js (.../invoicePrint.js) (revision 28508) @@ -423,7 +423,7 @@ myObj.beforeBatchPrintInvoices(invoicesInfo); } } - if(true == sstsConfig.mergePrintInvoiceGoods){ + if(true == sstsConfig.mergePrintInvoiceGoods){ //合并打印 var goods = []; // 器械包 @@ -438,20 +438,27 @@ if(invoicesInfo.disinfectGoods.length > 0){ goods = goods.concat(invoicesInfo.disinfectGoods); } - invoicesInfo.goods = goods; - printInvoiceInfo_local(invoicesInfo, printType); - - }else{ - // 器械包 - if(invoicesInfo.tousse.length > 0){ - invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices'; - var tousseObj = printConfig['batchPrintInvoice_Tousse']; - if(!isUndefinedOrNullOrEmpty(tousseObj)){ - invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_Tousse'; - } - invoicesInfo.goods = invoicesInfo.tousse; - printInvoiceInfo_local(invoicesInfo, printType); - } + + invoicesInfo.goods = goods; + if(true == sstsConfig.mergePrintForeignTousseInvoiceByApplication){ + if(invoicesInfo.goods.length > 0){ + printInvoiceInfo_local(invoicesInfo, printType); + } + + }else{ + printInvoiceInfo_local(invoicesInfo, printType); + } + }else{ + // 器械包 + if(invoicesInfo.tousse.length > 0){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices'; + var tousseObj = printConfig['batchPrintInvoice_Tousse']; + if(!isUndefinedOrNullOrEmpty(tousseObj)){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_Tousse'; + } + invoicesInfo.goods = invoicesInfo.tousse; + printInvoiceInfo_local(invoicesInfo, printType); + } // 一次性物品 if(invoicesInfo.diposableGoods.length > 0){ //invoicesInfo.applicationType = "一次性物品申请单"; @@ -485,6 +492,25 @@ printInvoiceInfo_local(invoicesInfo, printType); } } + + //DGSDBZXYY-47 外来器械发货单打印格式优化 + if(true == sstsConfig.mergePrintForeignTousseInvoiceByApplication){ + if(invoicesInfo.foreignTousseList.length > 0){ + var foreignTousseObj = printConfig['batchPrintInvoice_foreignGoods']; + if(!isUndefinedOrNullOrEmpty(foreignTousseObj)){ + if(!isUndefinedOrNullOrEmpty(foreignTousseObj)){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_foreignGoods'; + } + + for(var i = 0;i < invoicesInfo.foreignTousseList.length; i++){ + var tempInvoicesInfo = invoicesInfo.foreignTousseList[i]; + invoicesInfo.goods = tempInvoicesInfo.tousseJson; + invoicesInfo.goodsTitle = tempInvoicesInfo; + printInvoiceInfo_local(invoicesInfo, printType); + } + } + } + } } function printInvoiceInfo_local(invoicesInfo, type){ Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/print/printConfig.js =================================================================== diff -u -r28485 -r28508 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/print/printConfig.js (.../printConfig.js) (revision 28485) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/print/printConfig.js (.../printConfig.js) (revision 28508) @@ -1156,6 +1156,44 @@ LODOP.ADD_PRINT_HTM(0,0,"95%","100%",""+tableHtml+""); } +var batchPrintForeignInvoicesConfig = { + headerFooter : [ + // 标题 + {label : "外来器械发货单", dataIndex : '', fontSize : 20, position : ["7","35%","99%",5]}, + {label : "使用部门:", dataIndex : 'depart', fontSize : 12, position : ["42","2%","90%",5]}, + {label : "申请公司:", dataIndex : 'company', fontSize : 12, position : ["42","35%","90%",5]}, + {label : "打印时间:", dataIndex : 'printTime', fontSize : 12, position : ["42","65%","90%",5]}, + {label : "患者姓名:", dataIndex : 'patient', fontSize : 12, position : ["62","2%","90%",5]}, + {label : "患者住院号:", dataIndex : 'hospitalNumber', fontSize : 12, position : ["62","35%","90%",5]}, + {label : "患者科室:", dataIndex : 'ascriptionDepartment', fontSize : 12, position : ["62","65%","90%",5]}, + {label : "手术名称:", dataIndex : 'surgery', fontSize : 12, position : ["82","2%","90%",5]}, + {label : "病床:", dataIndex : 'bedNumber', fontSize : 12, position : ["82","65%","90%",5]}, + {label :"发货人:", dataIndex : 'deliver',fontSize : 12, position : ["310","2%","90%",5]}, + {label :"下送人:", dataIndex : 'sender',fontSize : 12, position : ["310","35%","99%",5]}, + {label :"接收人:", dataIndex : 'receiptor',fontSize : 12, position : ["310","65%","99%",5]}, + {label :"二次消毒后归还交接签名:", dataIndex : 'sign',fontSize : 12, position : ["330","2%","99%",5]}, + {label :"归还时间:", dataIndex : '',fontSize : 12, position : ["330","65%","99%",5]}, + {label :"一式三联：一张交给手术室，一张存放与发放间留存，一张存放污区用于归还交接",fontSize : 12,position : ["350","2%","99%",5]} + ], + currentPageNumber : {label : "第#页", fontSize : 9, position : ["9.5cm","90%","90%",5]}, + totalPageAmount : {label : "共&页", fontSize : 9, position : ["9.5cm","95%","90%",5]}, + goodsTable :{ + //rowHeight : 22, + position : ["102","1%","98%","4cm"], + headRepeat : true, + donotPrintTotal:true,//不打印合计 + columns : [ + {header : "序号", dataIndex : 'serialNumber', width : '5%', align : 'center', fontSize : 8}, + {header : "名称", dataIndex : 'name', width : '16%', align : 'left', fontSize : 8}, + {header : "包内器械数量", dataIndex : 'materialInstances', width : '17%', align : 'center', fontSize : 8}, + {header : "包装/审核/灭菌", dataIndex : 'operators', width : '15%', align : 'center', fontSize : 8}, + {header : "炉号/炉次", dataIndex : 'sterilizer', width : '11%', align : 'right', fontSize : 8}, + {header : "监测结果", dataIndex : 'monitorResult', width : '17%', align : 'center', fontSize : 8}, + {header : "核对员", dataIndex : 'monitorChecker', width : '9%', align : 'right', fontSize : 8}, + {header : "金额", dataIndex : 'totalPrice', width : '10%', align : 'right', fontSize : 8}, + ] + } +} var printConfig = { //发货计划单 invoicePlan : invoicePlanPrintConfig, @@ -1171,6 +1209,8 @@ invoiceTousse : invoiceComboPrintConfig, // 发货单（消毒物品） invoiceDisinfectGoods : invoiceComboPrintConfig, + //批量打印发货单(外来器械) + batchPrintInvoice_foreignGoods:batchPrintForeignInvoicesConfig, // 申请单 application : applicationPrintConfig, // 消毒物品申请单 Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r28471 -r28508 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 28471) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 28508) @@ -243,8 +243,18 @@ var text = item.label; if (item.dataIndex != '' && typeof item.dataIndex != 'undefined'){ - - var temp = printSummaryObj[item.dataIndex]; + //DGSDBZXYY-47 外来器械发货单打印格式优化 + if(true == sstsConfig.mergePrintForeignTousseInvoiceByApplication && printSummaryObj.foreignTousseList.length > 0){ + if(printSummaryObj.goodsTitle){ + var temp = printSummaryObj.goodsTitle[item.dataIndex]; + if(item.dataIndex == "sign"){ + temp = " / "; + } + + } + }else{ + var temp = printSummaryObj[item.dataIndex]; + } if (temp != null && temp != '' && typeof temp != 'undefined'){ text += temp; } @@ -409,7 +419,14 @@ for (var i=0;i" + item.header + ""; + var itemHeader = item.header; + if(true == sstsConfig.mergePrintForeignTousseInvoiceByApplication){ + if( item.dataIndex == "monitorResult"){ + itemHeader += "
(物理/化学/生物)"; + } + } + + tableHtml += "" + itemHeader + ""; } tableHtml += ""; Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js =================================================================== diff -u -r28506 -r28508 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js (.../config.js) (revision 28506) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js (.../config.js) (revision 28508) @@ -189,5 +189,7 @@ //允许回收还物单 allowInsteadReturn:true, //历史回收记录列表显示手术间列 - showORRoomColumnInHistoryRecyclingRecordList:true + showORRoomColumnInHistoryRecyclingRecordList:true, + //外来器械发货单是否按申请单合并打印 + mergePrintForeignTousseInvoiceByApplication:true } \ No newline at end of file