Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js =================================================================== diff -u -r22726 -r22880 --- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 22726) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 22880) @@ -1190,6 +1190,75 @@ LODOP.ADD_PRINT_HTM(0,0,"100%","100%",tableHtml); // LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page"); } +var recyclingDetailPrintConfig = { + customPrint:recyclingDetailPrintConfig_gzszyy +}; +/** + * 打印回收汇总清单 + */ +function recyclingDetailPrintConfig_gzszyy(printSummaryObj){ + LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM')); + var departGroup = [{name:'门诊科室',departs:['肺病科','口腔科']},{name:'住院科室',departs:['妇科','骨科']}]; + var data = {}; + var grpNames = []; + var departTotal = 0; + function group(detail){ + for(var i = 0 ; i < detail.length ; i++){ + for(var j = 0; j < departGroup.length;++j){ + var grp = departGroup[j]; + for(var k = 0; k < grp.departs.length;++k){ + if(grp.departs[k] == detail[i].showDepart){ + var grpDpts = data[grp.name]; + if(!grpDpts){ + grpDpts = []; + data[grp.name] = grpDpts; + grpNames.push(grp.name); + } + grpDpts.push({name:detail[i].showDepart,seq:k}); + departTotal+=1; + } + } + } + } + } + + var departmentGroupNames = printSummaryObj.recyclingDetail.departmentGroupNames + for(var i = 0; i < departmentGroupNames.length;++i){ + //科室分组 + group(printSummaryObj.recyclingDetail[departmentGroupNames[i]]); + } + var css="div{text-align:center;}table{margin:0px;padding:0px;width: 100%; border-collapse: collapse;table-layout:fixed;}"; + css+="tr{padding:0px;margin:0px;height:30px;}td{padding:0px;margin:0px;border:1px solid black;font-size: 16px;text-align:center;}"; + css+=".name{font-size: 20px;font-weight:bold;}.left{text-align:left;}"; + var tableHtml =""; + tableHtml += "
当天申请科室汇总
" + tableHtml +=""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + + for(var i = 0; i < grpNames.length;++i){ + var itemArr = data[grpNames[i]]; + itemArr.sort(function(a,b){return a.seq - b.seq}); + var departNames = []; + for(var j = 0; j < itemArr.length;++j){ + departNames.push(itemArr[j].name); + } + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + if(i < grpNames.length - 1){ + tableHtml += "" + } + } + + tableHtml += "
当前已申请科室总数："+departTotal; + tableHtml += "打印时间："+printSummaryObj.printDateTime+"
"+grpNames[i]+"科室数量："+itemArr.length+"
"+departNames.join('、')+"
 
"; + LODOP.ADD_PRINT_HTM(0,0,"100%","100%",tableHtml); +// LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page"); +} var printConfig = { //发货计划单 invoicePlan : invoicePlanPrintConfig, @@ -1249,5 +1318,7 @@ //调拨出库单 appropriationOutList : appropriationOutListConfig, //使用记录打印 - useRecord : useRecordPrintConfig + useRecord : useRecordPrintConfig, + //回收清单打印 + recyclingDetail:recyclingDetailPrintConfig }; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js =================================================================== diff -u -r22876 -r22880 --- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js (.../config.js) (revision 22876) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js (.../config.js) (revision 22880) @@ -67,6 +67,10 @@ showAuxiliaryInvoiceBtn: true, //科室申领中，是否重复打印当天已经打印的申领物品 reprintTodayPrintedTousseItem : true, + //待回收申请单，是否打印回收汇总单 + printWaitRecyclingInvoicePlanSummary:true, + //打印回收汇总单的统计天数 + waitRecyclingInvoicePlanSummaryDays:1, //是否显示按器械包分组选择框 isShowTousseGroup : true, //装配界面,扫描清洗篮筐后是否默认自动勾选篮筐内的器械包 Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js =================================================================== diff -u -r22812 -r22880 --- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 22812) +++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 22880) @@ -491,30 +491,29 @@ return ""; } function printWaitRecyclingInvoicePlanSummary(printDateTime,printUser,recyclingDetail){ - var LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM')); - LODOP.SET_PRINT_STYLE("FontSize",17); - LODOP.ADD_PRINT_TEXT(5,300,"100%",5,"回收汇总清单"); - LODOP.SET_PRINT_STYLE("FontSize",11); - LODOP.ADD_PRINT_TEXT(35,50,"100%",5,"制单人： " + printUser); - LODOP.ADD_PRINT_TEXT(35,450,"100%",5,"打印时间：" + printDateTime); - - var htmlTable =""; - var departmentGroupNames = recyclingDetail.departmentGroupNames - for(var i = 0; i < departmentGroupNames.length;++i){ - //科室分组 - htmlTable += ""; + function recyclingDetail_default(printSummaryObj){ + var LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM')); + LODOP.SET_PRINT_STYLE("FontSize",17); + LODOP.ADD_PRINT_TEXT(5,300,"100%",5,"回收汇总清单"); + LODOP.SET_PRINT_STYLE("FontSize",11); + LODOP.ADD_PRINT_TEXT(35,50,"100%",5,"制单人： " + printSummaryObj.printUser); + LODOP.ADD_PRINT_TEXT(35,450,"100%",5,"打印时间：" + printSummaryObj.printDateTime); + + var htmlTable ="
"; - htmlTable += buildDepartTable(recyclingDetail,departmentGroupNames[i]); - htmlTable += "
"; + var departmentGroupNames = printSummaryObj.recyclingDetail.departmentGroupNames + for(var i = 0; i < departmentGroupNames.length;++i){ + //科室分组 + htmlTable += ""; + } + htmlContent = "" + htmlTable + ""; + LODOP.ADD_PRINT_HTM(55,5,"100%","100%",htmlContent); } - //备注 -// htmlTable += ""; - - - htmlContent = "" + htmlTable + ""; - LODOP.ADD_PRINT_HTM(55,5,"100%","100%",htmlContent); - + var printSummaryObj = {printDateTime:printDateTime,printUser:printUser,recyclingDetail:recyclingDetail}; + formTypeOfPrinted = "recyclingDetail"; + printSummaryObj.printConfigObj_default = {customPrint:recyclingDetail_default}; + print2(printSummaryObj); //直接打印 LODOP.PRINT(); } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r22760 -r22880 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 22760) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 22880) @@ -3896,7 +3896,8 @@ public JSONObject printWaitRecyclingInvoicePlanSummary() { Calendar now = Calendar.getInstance(); String toTime = ForgonDateUtils.safelyFormatDate(now.getTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDD, ""); - now.add(Calendar.DATE, -1); + int days = CssdUtils.getSystemSetConfigByNameInt("waitRecyclingInvoicePlanSummaryDays", 2); + now.add(Calendar.DATE, 0-(days - 1)); String fromTime = ForgonDateUtils.safelyFormatDate(now.getTime(), Constants.SIMPLEDATEFORMAT_YYYYMMDD, ""); String handlerDepartCoding = AcegiHelper.getCurrentOrgUnitCode(); if(StringUtils.isBlank(handlerDepartCoding)){
"; + htmlTable += buildDepartTable(printSummaryObj.recyclingDetail,departmentGroupNames[i]); + htmlTable += "
"; -// htmlTable += buildRemarkTable(recyclingDetail.remarks,"备注"); -// htmlTable += "