Index: ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/print/printConfig.js =================================================================== diff -u -r34851 -r34852 --- ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/print/printConfig.js (.../printConfig.js) (revision 34851) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/print/printConfig.js (.../printConfig.js) (revision 34852) @@ -1,4 +1,12 @@ -var appropriationInListConfig = { +var printerNameMapping = { + '模板-普通小标签' : 'ZDesigner GK888t', + '模板-外器小标签' : 'ZDesigner GK888t', + '模板-外部代理灭菌小标签' : 'ZDesigner GK888t', + '模板-科室' : 'ZDesigner GK888t (包内标签)', + '模板-用户' : 'ZDesigner GK888t (包内标签)', + '模板-固定条码' : 'ZDesigner GK888t (包内标签)' +}; +var appropriationInListConfig = { headerFooter : [ // 页眉名称 {label : "河北省唐山工人医院调拨入库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]}, @@ -255,15 +263,15 @@ // 页眉名称 {label : "河北省唐山工人医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, // 标题 - {label : "材料出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, - {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]}, - {label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]}, - {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["55","35%","90%",5]}, - {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["80","35%","90%",5]}, - {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]}, - {label : "主管:", dataIndex : '', fontSize : 11, position : ["10cm","5%","90%",5]}, - {label : "领料人:", dataIndex : '', fontSize : 11, position : ["10cm","40%","90%",5]}, - {label : "发料人:", dataIndex : 'sender', fontSize : 11, position : ["10cm","75%","90%",5]}, + {label : "供应室发货单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, + {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["45","2%","90%",5]}, + {label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["45","75%","90%",5]}, + {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["45","35%","90%",5]}, + {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["60","35%","90%",5]}, + {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["60","2%","90%",5]}, + {label : "主管:", dataIndex : '', fontSize : 11, position : ["8cm","5%","90%",5]}, + {label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["8cm","25%","90%",5]}, + {label : "签收人:", dataIndex : '', fontSize : 11, position : ["8cm","50%","90%",5]}, {barcodes : [ {codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"], styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, @@ -273,23 +281,23 @@ } ]} ], - currentPageNumber : {label : "第#页", fontSize : 11, position : ["11cm","75%","90%",5]}, - totalPageAmount : {label : "共&页", fontSize : 11, position : ["11cm","81%","90%",5]}, + currentPageNumber : {label : "第#页", fontSize : 11, position : ["8cm","80%","90%",5]}, + totalPageAmount : {label : "共&页", fontSize : 11, position : ["8cm","85%","90%",5]}, goodsTable :{ - rowHeight : 25, - position : ["100","1%","97%","6.5cm"], + rowHeight : 20, + position : ["75","1%","88%","5.5cm"], headRepeat : true, columns : [ {header : "序号", dataIndex : 'serialNumber', width : '10%', align : 'center', fontSize : 11}, {header : "名称", dataIndex : 'name', width : '30%', align : 'left', fontSize : 11}, {header : "规格", dataIndex : 'specification', width : '15%', align : 'center', fontSize : 11}, - {header : "包装规格", dataIndex : 'packageSpec', width : '15%', align : 'center', fontSize : 11}, + //{header : "包装规格", dataIndex : 'packageSpec', width : '15%', align : 'center', fontSize : 11}, {header : "单位", dataIndex : 'unit', width : '5%', align : 'center', fontSize : 11}, {header : "数量", dataIndex : 'amount', width : '5%', align : 'right', fontSize : 11}, -// {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11}, -// {header : "失效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11}, - {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11}, - {header : "金额", dataIndex : 'totalPrice', width : '10%', align : 'right', fontSize : 11} + {header : "灭菌日期/批次", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11}, + {header : "失效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11} +// {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11}, +// {header : "金额", dataIndex : 'totalPrice', width : '10%', align : 'right', fontSize : 11} ] } } @@ -1100,6 +1108,9 @@ tableHtml += "
"+barcode; tableHtml += ""; tableHtml += "器械总数量:"+ret.amount+"件"; + if(tousseDefinitionObj.currentDateTime && tousseDefinitionObj.currentDateTime !== ''){ + tableHtml += "
打印日期: "+tousseDefinitionObj.currentDateTime+""; + } tableHtml += ""; tableHtml += ""; @@ -1124,6 +1135,8 @@ invoiceTousse : invoiceComboPrintConfig, // 发货单（消毒物品） invoiceDisinfectGoods : invoiceComboPrintConfig, + //外部代理灭菌申请单打印 + foreignProxyDisinfectionApplication:batchPrintInvoicesConfig, // 申请单 application : applicationPrintConfig, // 消毒物品申请单 Index: ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/menu/menuconfigure.js =================================================================== diff -u -r34851 -r34852 --- ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34851) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34852) @@ -141,8 +141,7 @@ children:[ {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查表定义",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SatisfactionSurveyTable_Menu,text:"满意度调查表",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查明细报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyDetailView.jsp',hrefTarget:linkTarget,leaf:true} + {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true} ] }; DisinfectsystemTreeData[11] = { @@ -575,19 +574,18 @@ singleClickExpand:singleClickExpandTree, hidden:SSTS_WorkLoad_Menu, children:[ - {hidden :!(sstsConfig.enableNewYearWorkloadReport) || SSTS_YearWorkload,text:"消毒供应中心年度工作量统计报表(新)",href:WWWROOT+'/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_YearWorkload,text:"消毒供应中心年度工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心员工绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心员工工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!((sstsConfig.hasOwnProperty('enableWorkloadScoreStatisticReport')) && sstsConfig.enableWorkloadScoreStatisticReport),text:"工作量积分统计报表",href:WWWROOT+'/disinfectsystem/reportforms/workloadScoreStatisticView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableCSSDWorkloadReportForTangshanWorkersHospital,text:"消毒供应室工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/cssdWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!(sstsConfig.enableNewYearWorkloadReport) || SSTS_YearWorkload,text:"年度消毒中心指标工作量统计(新)",href:WWWROOT+'/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_YearWorkload,text:"年度消毒中心指标工作量统计",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心工作人员绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!(sstsConfig.enableCSSDWorkloadReportForTangshanWorkersHospital && supplyRoomUser),text:"消毒供应室工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/cssdWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_TOTAL,text:"使用记录录入统计报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordTotalView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_Item,text:"使用记录录入明细报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordItemView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_OperatorTotal,text:"使用记录人员汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_ForGoods,text:"使用记录物品分类汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashingMachineStoveUseCountReport,text:"清洗机使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washingMachineStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizingStoveUseCountReport,text:"灭菌炉使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseWorkLoadTotalReport,text:(sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_CleaningAreaWorkloadForUser,text:'清洗区人员工作量统计报表',href:WWWROOT+'/disinfectsystem/reportforms/cleaningAreaWorkloadForUser.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_CleaningAreaWorkloadForUser,text:'清洗区人员工作量统计报表',href:WWWROOT+'/disinfectsystem/reportforms/cleaningAreaWorkloadForUser.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WaitPackingTaskReport,text:'待装配任务工作表',href:WWWROOT+'/disinfectsystem/reportforms/waitPackingTaskReport.jsp',hrefTarget:linkTarget,leaf:true} ] @@ -598,31 +596,31 @@ children:[ //“临床护理质量管理与控制指标”报表暂时屏蔽，等客户现场确认不用后，应该把相应的业务代码全部删除 //{hidden :true,text:"临床护理质量管理与控制指标",href:WWWROOT+'/disinfectsystem/reportforms/qualityControlOfClinic.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_QualityControlOfClinic,text:"供应室护理质量指标统计表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomQualityQuota.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_QualityControlOfClinic,text:"供应室护理质量指标统计表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomQualityQuota.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_QuotaReport,text:"十八项指标分析报表",href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WorkQualityCountReport,text:"工作质量持续收集统计报表",href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true}, -// {hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashMaterialTypeWorkloadReport,text:"清洗区材料类型工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_PackingUnqualifieReport,text:"包装区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/packingUnqualifieReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizationWorkloadReport,text:"灭菌区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_sterilizationAreaWorkLoadReport,text:"灭菌区工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationAreaWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_sterilizationAreaWorkLoadReport,text:"灭菌区工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationAreaWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_tousseSterilizationInspectSituation,text:"器械消毒灭菌检查情况报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseSterilizationInspectSituation.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :hideDeviceMaintenaceReport,text:"设备维护报表",href:WWWROOT+'/disinfectsystem/reportforms/deviceMaintenanceView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :hideDeviceMaintenaceCusReport,text:"设备维护报表",href:WWWROOT+'/disinfectsystem/reportforms/deviceMaintenanceCusReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_QualityMonitoringReport,text:"质量监测报表",href:WWWROOT+'/disinfectsystem/reportforms/qualityMonitoringView.jsp',hrefTarget:linkTarget,leaf:true}, - //{hidden :SSTS_QualityMonitoringReport,text:qualityMonthViewName,href:WWWROOT+'/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_QualityMonitoringReport,text:qualityMonthViewName,href:WWWROOT+'/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_QualityMonitoringReport,text:"器械清洗不合格部位数量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialWashUnqualifiedPositionView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_QualityMonitoringReport,text:"器械清洗不合格评估方法数量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialWashUnqualifiedAssessMethodView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableMaterialWashUnUnqualifiedReport,text:"器械材料清洗不合格统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washUnUnqualifiedReportView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_YearWashReportChart,text:"清洗不合格率环比折线图报表",href:WWWROOT+'/disinfectsystem/reportforms/yearWashReportChartView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_YearWashReportChart,text:"清洗不合格率环比折线图报表",href:WWWROOT+'/disinfectsystem/reportforms/yearWashReportChartView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失汇总统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialMissTotalView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialMissItemView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损汇总统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageTotalView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageItemView.jsp',hrefTarget:linkTarget,leaf:true}, // {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失报损分类统计月报",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageMissMonthView.jsp',hrefTarget:linkTarget,leaf:true}, -// {hidden :SSTS_SterilizationRecordInfoReport,text:"灭菌情况报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}, -// {hidden :SSTS_WashAndDisinfectRecordInfoReport,text:"清洗情况报表",href:WWWROOT+'/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_SterilizationRecordInfoReport,text:"灭菌情况报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_WashAndDisinfectRecordInfoReport,text:"清洗情况报表",href:WWWROOT+'/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableTousseOverloadReport,text:"器械包实际负载组合统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseOverLoad.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableTousseMorrowSend,text:"器械包次日下送率统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseMorrowSend.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableNurseWorkload,text:"护理工作质量指标报表",href:WWWROOT+'/disinfectsystem/reportforms/nurseWorkload.jsp',hrefTarget:linkTarget,leaf:true}, @@ -641,22 +639,22 @@ {hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true}, // {hidden :SSTS_GodownEntryStatistic,text:"一次性物品三类查询报表",href:WWWROOT+'/disinfectsystem/reportforms/goodsAmountSummaryByGradeView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_GodownEntryStatistic,text:"入/退库物品统计报表(按供应商)",href:WWWROOT+'/disinfectsystem/reportforms/godownEntrySummaryView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_GodownEntryStatistic,text:"入/退库物品统计报表(按供应商)",href:WWWROOT+'/disinfectsystem/reportforms/godownEntrySummaryView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_GodownEntryStatistic,text:"一次性物品发货量对比报表",href:WWWROOT+'/disinfectsystem/reportforms/invoiceAmountContrastChartView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_MaterialStockReport,text:"材料库存统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialStockReportView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_GodownEntryStatistic,text:"一次性物品发货量对比报表",href:WWWROOT+'/disinfectsystem/reportforms/invoiceAmountContrastChartView.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_MaterialStockReport,text:"材料库存统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialStockReportView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_ReturnGoodsDetailReport,text:"签收统计报表",href:WWWROOT+'/disinfectsystem/reportforms/signGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ReturnGoodsDetailReport,text:"退货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/returnGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_GoodsDistributeReportChart,text:"物品发放分布饼图",href:WWWROOT+'/disinfectsystem/reportforms/goodsDistributeReportChartView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseDeliverReport,text:"器械包发货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseDeliverStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DisposableGoodsDeliverReport,text:"一次性物品发放表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, - //{hidden :SSTS_ForeignTousseReport,text:"外来器械申请单统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ForeignTousseReport,text:"外来器械申请单统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_ApparatusInfusionisType,text:"各类型输液器报表",href:WWWROOT+'/disinfectsystem/reportforms/apparatusInfusionisTypeView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseMaterialMonthCheckReport,text:"消毒供应中心器械月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_BorrowReport,text:"借还物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/borrowReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ForeignTousseSterilizationMonitorAndDelivery,text:"含植入物器械包灭菌监测及发放情况报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.jsp',hrefTarget:linkTarget,leaf:true}, -// {hidden :SSTS_ForeignTousseAfterUseDelivery,text:"外来器械使用后交接报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_UrgentNeedGoodsProcessingCycle,text:"急用物品处理周期统计报表",href:WWWROOT+'/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ForeignTousseAfterUseDelivery,text:"外来器械使用后交接报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.jsp',hrefTarget:linkTarget,leaf:true}, + //{hidden :SSTS_UrgentNeedGoodsProcessingCycle,text:"急用物品处理周期统计报表",href:WWWROOT+'/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseSpecificationSizeStatistics,text:"器械包规格大小统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseSpecificationSizeStatistics.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseApplySummary,text:"各部门器械包申请汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseApplySummary.jsp',hrefTarget:linkTarget,leaf:true} ] Index: ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/timer.xml =================================================================== diff -u -r34851 -r34852 --- ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/timer.xml (.../timer.xml) (revision 34851) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/timer.xml (.../timer.xml) (revision 34852) @@ -3,12 +3,53 @@ - - - - - - - + + + + + + + autoWasteOutdateTousseInstances + + + + + + + + + 0 0 1 * * ? + + + + + + + + + + + + + + + + + + + timingAutoSignInvoice + + + + + + + + + 0 0 2 * * ? + + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/HIS.xml =================================================================== diff -u -r34851 -r34852 --- ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/HIS.xml (.../HIS.xml) (revision 34851) +++ ssts-web/src/main/webapp/disinfectsystem/config/hbstsgryy/spring/HIS.xml (.../HIS.xml) (revision 34852) @@ -89,12 +89,21 @@ + + + + + +