Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js =================================================================== diff -u -r25013 -r25430 --- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 25013) +++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 25430) @@ -256,6 +256,28 @@ showResult(result.cause); } }); + }else if(projectName == 'szszlyy'){ + //深圳肿瘤医院的打印 + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/recyclingRecordAction!printRecyclingDetailWithTousseAndOther.do', + params : { + startDateTime : startDateTime, + endDateTime : endDateTime, + handlerDepartCoding : handlerDepartCoding + }, + success : function(response, options) { + var obj = JSON.parse(response.responseText); + if(obj.success){ + doPrintRecyclingDetailWithTousseAndOther_szszlyy(printType,startDateTime,endDateTime,obj.printUser,obj); + }else{ + showResult(obj.message); + } + }, + failure : function(response, options) { + var result = Ext.decode(response.responseText); + showResult(result.cause); + } + }); }else if (sstsConfig.recyclingRecordListFilterByAssetBelong){ // 按器械包的资产归属过滤打印范围，需要在器械包定义中进行设置 Ext.Ajax.request({ @@ -788,6 +810,42 @@ } } +function doPrintRecyclingDetailWithTousseAndOther_szszlyy(printType,startDateTime,endDateTime,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,"CSSD每日回收登记表"); + LODOP.SET_PRINT_STYLE("FontSize",11); + LODOP.ADD_PRINT_TEXT(35,50,"100%",5,"制单人： " + printUser); + LODOP.ADD_PRINT_TEXT(35,200,"100%",5,"开始时间：" + startDateTime); + LODOP.ADD_PRINT_TEXT(35,450,"100%",5,"结束时间： " + endDateTime); + + // LODOP.SET_PRINT_STYLE("ItemType", 2); + // LODOP.ADD_PRINT_TEXT(10,600,"95%",5,"第#页/共&页"); + + var htmlTable =""; + //普通器械 + htmlTable += ""; + //其他 + htmlTable += ""; + //备注 + //htmlTable += ""; + htmlContent = "" + htmlTable + ""; + LODOP.ADD_PRINT_HTM(55,5,"100%","100%",htmlContent); + + if(printType == 0){//直接打印 + LODOP.PRINT(); + }else{//打印预览 + LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1); + LODOP.PREVIEW(); + } +} + function lodopPrint(printType,startDateTime,endDateTime,printUser,printDetail,disinfectionDetail,tableRowSize){ var LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM')); LODOP.SET_PRINT_STYLE("FontSize",17); Index: ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/print/recyclingDetailPrintConfig.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/print/recyclingDetailPrintConfig.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/print/recyclingDetailPrintConfig.js (revision 25430) @@ -0,0 +1,149 @@ +{ + 普通器械列头 : [ + { + columnName : '大换药包', + includeTousse : [ + {id : 652,tousseName : '大换药包'} + ] + }, + { + columnName : '小换药包', + includeTousse : [ + {id : 653,tousseName : '小换药包'} + ] + }, + { + columnName : '弯止血钳', + includeTousse : [ + {id : 654,tousseName : '弯止血钳'} + ] + }, + { + columnName : '直止血钳', + includeTousse : [ + {id : 655,tousseName : '直止血钳'} + ] + }, + { + columnName : '组织剪', + includeTousse : [ + {id : 656,tousseName : '组织剪'} + ] + }, + { + columnName : '线剪', + includeTousse : [ + {id : 657,tousseName : '线剪'} + ] + }, + { + columnName : '眼剪', + includeTousse : [ + {id : 658,tousseName : '眼剪'} + ] + }, + { + columnName : '持针钳', + includeTousse : [ + {id : 659,tousseName : '持针钳'} + ] + }, + { + columnName : '开口器', + includeTousse : [ + {id : 660,tousseName : '开口器'} + ] + }, + { + columnName : '舌钳', + includeTousse : [ + {id : 661,tousseName : '舌钳'} + ] + }, + { + columnName : '压舌板', + includeTousse : [ + {id : 662,tousseName : '压舌板'} + ] + }, + { + columnName : '弯蚊钳', + includeTousse : [ + {id : 663,tousseName : '弯蚊钳'} + ] + }, + { + columnName : '直蚊钳', + includeTousse : [ + {id : 664,tousseName : '直蚊钳'} + ] + }, + { + columnName : '长有齿镊', + includeTousse : [ + {id : 665,tousseName : '长有齿镊'} + ] + }, + { + columnName : '短有齿镊', + includeTousse : [ + {id : 666,tousseName : '短有齿镊'} + ] + }, + { + columnName : '长无齿镊', + includeTousse : [ + {id : 667,tousseName : '长无齿镊'} + + ] + }, + { + columnName : '短无齿', + includeTousse : [ + {id : 668,tousseName : '短无齿'} + ] + }, + { + columnName : '镊', + includeTousse : [ + {id : 669,tousseName : '镊'} + ] + }, + { + columnName : '弯盘', + includeTousse : [ + {id : 670,tousseName : '弯盘'} + ] + }, + { + columnName : '罐', + includeTousse : [ + {id : 671,tousseName : '罐'} + ] + }, + { + columnName : '布巾钳', + includeTousse : [ + {id : 672,tousseName : '布巾钳'} + ] + }, + { + columnName : '3#刀柄', + includeTousse : [ + {id : 673,tousseName : '3#刀柄'} + ] + }, + { + columnName : '4#刀柄', + includeTousse : [ + {id : 674,tousseName : '4#刀柄'} + ] + }, + { + columnName : '7#刀柄', + includeTousse : [ + {id : 674,tousseName : '7#刀柄'} + ] + } + ] +} Index: ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/config.js =================================================================== diff -u -r25198 -r25430 --- ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/config.js (.../config.js) (revision 25198) +++ ssts-web/src/main/webapp/disinfectsystem/config/szszlyy/config.js (.../config.js) (revision 25430) @@ -85,6 +85,8 @@ useRecordWashHandNurseAllowBlank:true, // 是否显示装配界面的打印按钮 packingView_currentTaskGroup_showPrintBtn: true, + //使用记录打印按钮显示隐藏 + ControlUseRecordprint: true, //允许部分回收 true为允许 enablePartRecycle:true, //自定义装配界面,装配数量的处理方式 0或者未定义:清空,1:表示保留当前值,2表示设置回默认值。其他值跟1一样，保留当前值 @@ -114,6 +116,8 @@ batchPrintInvoiceMergeType:'科室', //装配界面显示包装人字段 true:显示 false:不显示 showWrapperField:true, + //打印回收清单功能，打印物品的范围 + recyclingRecordListPrintTousseType:'全部', //自定义装配界面是否显示选择申请科室 true：显示选择申请科室,但不是必须选择的false或者没有配置:不显示 selectDepartInCustomPacking:true, //PDA上是否启用器械包签收功能 true:启用，点击签收图标可以选择签单或者签包 false或者未配置:不启用,点签收图标直接进入签单 @@ -123,5 +127,14 @@ //true：装配不用扫描标识牌条码即可装配 false：需要扫描标识牌条码装配 autoSetIDCardBarcodeForPacking:true, //发货时针对有植入物的器械包，是否要提示生物监测的情况 true：要提示 false或者没有配置：不提示 - biologicalMonitoringEnable:true + biologicalMonitoringEnable:true, + //灭菌装载页面如果第二个及后面的器械包的灭菌程序与第一个包的不一致时,是否提示 + isNoticeWhenScanDifferentSterileTypeTousseBarcode:true, + //是否启用标识牌跟篮筐绑定。如果启用，在回收的时候，扫描标识牌自动带出跟标识牌绑定的篮筐并将包实例入到篮筐中。 + enableIdCardBasketBinding:true, + //装配界面显示灭菌员字段 true：隐藏 false：不隐藏 + showSterileField:false, + //装配界面是否隐藏审核员字段,默认为显示 false:显示 true:隐藏 + hideReviewerField:true + } \ No newline at end of file

"; + htmlTable += buildTable(recyclingDetail,"普通器械列头",24); + htmlTable += "

"; + htmlTable += buildDepartTable(recyclingDetail,"专科器械"); + htmlTable += "

"; + //htmlTable += buildRemarkTable(recyclingDetail.remarks,"备注"); + //htmlTable += "