Index: ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/config.js =================================================================== diff -u -r33154 -r39066 --- ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/config.js (.../config.js) (revision 33154) +++ ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/config.js (.../config.js) (revision 39066) @@ -1,4 +1,4 @@ -var sstsConfig = { +var sstsConfig = { // 回收时科室显示结算科室 showSettleAccountsDepartInRecycling : false, // 审核器械包必须入篮筐（一级供应室） @@ -19,6 +19,10 @@ hideEnterReviewListButton : false, // 是否自动补全用户名 autoFillUserName:false, + //报表小数点 + moneyDigitCount:2, + //外来器械图标 + desktopShortcutIconsConfig:["外来器械申请"], // 自动补全用户名的长度 autoFillUserNameLength:6, //装配界面的配包人是否默认为上一次装配的配包人 @@ -80,16 +84,16 @@ //在灭菌视图界面是否显示“生物监测的状态”属性 showBiologicalMonitoringStatus : true, //是否显示辅助发货按钮 - showAuxiliaryInvoiceBtn : false, + showAuxiliaryInvoiceBtn : true, //公司名称 "dingxiang"显示主页显示丁香的logo companyName : "dingxiang", //是否显示包实例科室(待灭菌与待灭菌装载的表格) showDepartOfTousseInstanceSterile : true, //对申请单的物品申请数量是否启用干预功能 enableInterfereApplyAmount : true, - //是否是加强版的“消毒供应中心员工工作量统计报表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是 + //是否是加强版的“消毒供应中心工作量统计报表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是 strengthenStatisticalWorkload:true, - //启用新的年度消毒供应中心员工工作量统计报表 + //启用新的年度消毒供应中心工作量统计报表 enableNewYearWorkloadReport:true, //是否禁用整筐发货 disableScanBasketInvoice : false, @@ -143,17 +147,18 @@ disableDeviceInterface:false, //审核列表 tousseWithDifferentSterilingTypeCanNotBatchAddReview :false, - //辅助发货 - showAuxiliaryInvoiceBtn :true, - //打印器械包标签的时候，一次性物品名称打出来 - tousseLabelPrintDisposableGoods:true, - - showAuxiliaryInvoiceBtn : true, - //签收不验证 + //是否启用部分回收功能 + enablePartRecycle:true, + //打印器械包标签时，是否打印一次性物品材料 + tousseLabelPrintDisposableGoods:true, + //签收不验证 notValidateLocationWhenSignTousse:true, - // + //装配界面是否显示灭菌炉与炉次 showSterilizer:true, - tousseDefinitionCanBatchEdit:true - - + //器械包定义是否批量修改 + tousseDefinitionCanBatchEdit:true, + //当有丢失、报损时允许不补充材料即可装配 + allowPackingWhenUnSupplementMaterial : true, + //开启加急功能 + enableUrgentFunction:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/menu/menuconfigure.js =================================================================== diff -u -r35830 -r39066 --- ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 35830) +++ ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 39066) @@ -108,7 +108,7 @@ //{hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约汇总发货",href:WWWROOT+'/disinfectsystem/invoice/operationReservationMergeInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_CustomDelivery_Manager,text:"自定义发货",href:WWWROOT+'/disinfectsystem/invoice/customInvoiceForm.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_Invoice_Menu,text:"快速发货",href:WWWROOT+'/disinfectsystem/invoice/expressInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - //{hidden :SSTS_Invoice_Menu,text:"科室发货计划设置",href:WWWROOT+'/disinfectsystem/invoice/invoiceDepartmentView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Menu,text:"科室发货计划设置",href:WWWROOT+'/disinfectsystem/invoice/invoiceDepartmentView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Invoice_Menu,text:"发货单管理",href:WWWROOT+'/disinfectsystem/invoice/invoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_Invoice_Menu,text:"材料发货管理",href:WWWROOT+'/disinfectsystem/invoice/materialInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, //{hidden :true,text:"发货单批量打印",href:WWWROOT+'/disinfectsystem/invoice/invoicePrintView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, @@ -139,12 +139,11 @@ DisinfectsystemTreeData[10] = { text:"满意度调查", singleClickExpand:singleClickExpandTree, - hidden:true, + hidden:SSTS_SatisfactionSurvey_Menu, 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] = { @@ -577,9 +576,9 @@ 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.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 :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}, @@ -599,7 +598,7 @@ //“临床护理质量管理与控制指标”报表暂时屏蔽，等客户现场确认不用后，应该把相应的业务代码全部删除 //{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 :true,text:"十八项指标分析报表",href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :false,text:"十八项指标分析报表",href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :true,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_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, @@ -611,7 +610,7 @@ {hidden :true,text:"设备维护报表",href:WWWROOT+'/disinfectsystem/reportforms/deviceMaintenanceView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :true,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 :true,text:"器械材料清洗不合格统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washUnUnqualifiedReportView.jsp',hrefTarget:linkTarget,leaf:true}, @@ -621,7 +620,7 @@ {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_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}, @@ -653,7 +652,7 @@ //{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 :true,text:"消毒供应中心器械月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :true,text:"借还物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/borrowReportView.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 :true,text:"急用物品处理周期统计报表",href:WWWROOT+'/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp',hrefTarget:linkTarget,leaf:true}, @@ -694,6 +693,7 @@ hidden :System_Manage_Menu, children:[ {hidden :System_Orgunit_Select,text:"组织机构",href:WWWROOT+'/systemmanage/orgUnitExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_org.gif'}, + {hidden :System_Orgunit_Select,text:"停用的组织机构",href:WWWROOT+'/systemmanage/disabledOrgUnitExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_org.gif'}, {hidden :System_User_Select,text:"用户管理",href:WWWROOT+'/systemmanage/userExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_user.gif'}, {hidden :System_Role_Select,text:"权限管理",href:WWWROOT+'/systemmanage/roleList.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_role.gif'}, {hidden :System_Log_Menu,text:"日志管理",href:WWWROOT+'/log/loggrid.jsp',hrefTarget:linkTarget,leaf:true}, @@ -747,7 +747,7 @@ {hidden :!((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),text:"位置管理",href:WWWROOT+'/disinfectsystem/basedatamanager/position/positionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_CleanMethod,text:"清洗程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Rinser,text:"清洗机管理",href:WWWROOT+'/disinfectsystem/basedatamanager/rinser/rinserView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilerGroup/sterilerGroupView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilerGroup',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Sterilizer,text:"灭菌炉管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizationPurpose_manager,text:"灭菌目的设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationPurpose',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizationMode_manager,text:"灭菌方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationMode',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/print/printConfig.js =================================================================== diff -u -r32601 -r39066 --- ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/print/printConfig.js (.../printConfig.js) (revision 32601) +++ ssts-web/src/main/webapp/disinfectsystem/config/szhzyy/print/printConfig.js (.../printConfig.js) (revision 39066) @@ -257,7 +257,7 @@ {label : "深圳禾正医院", dataIndex : '', fontSize : 9, position : ["2","1%","90%",5]}, // 标题 {label : "消毒供应室器械包发放查询单", dataIndex : '', fontSize : 14, position : ["8","35%","99%",5]}, - {label : "申请科室：", dataIndex : 'depart', fontSize : 9, position : ["30","2%","90%",5]}, + {label : "申请科室：", dataIndex : 'depart', fontSize : 15, position : ["30","2%","90%",5]}, {label : "仓库:消毒供应中心", dataIndex : '', fontSize : 9, position : ["50","70%","90%",5]}, //{label : "制单人:", dataIndex : 'printUser', fontSize : 9, position : ["55","35%","90%",5]}, {label : "发放日期:", dataIndex : 'printTime', fontSize : 9, position : ["50","35%","90%",5]}, @@ -1019,7 +1019,7 @@ headerContent : [ // 标题 {label : "深圳禾正医院", dataIndex : '', fontSize : 10, position : ["10","4%","90%",5]}, - {label : "外来器械接收单", dataIndex : 'header', fontSize : 17, position : ["30","15%","99%",22]}, + {label : "使用后清洗取走外来器械接收单", dataIndex : 'header', fontSize : 17, position : ["30","15%","99%",22]}, {label : "姓名：", dataIndex : 'patient', fontSize : 11, position : ["90","4%","90%",5]}, {label : "性别：", dataIndex : 'patientSex', fontSize : 11, position : ["90","80mm","90%",5]}, @@ -1044,14 +1044,14 @@ {label : "手术器械清单：", dataIndex : '', fontSize : 11, position : ["400","4%","90%",10]}, - - {label : "清洗注意事项：", dataIndex : '', fontSize : 11, position : ["680","4%","90%",5]}, - {label : "灭菌方式：", dataIndex : '', fontSize : 11, position : ["720","4%","90%",5]}, + {label : "清洗消毒完毕时间：", dataIndex : '', fontSize : 11, position : ["640","4%","90%",5]}, + {label : "清洗炉号：", dataIndex : '', fontSize : 11, position : ["680","4%","90%",5]}, + {label : "卸载人员：", dataIndex : '', fontSize : 11, position : ["720","4%","90%",5]}, {label : "公司名称：", dataIndex : 'supplierName', fontSize : 11, position : ["760","4%","90%",5]}, - {label : "联系方式：", dataIndex : '', fontSize : 11, position : ["800","4%","90%",5]}, - {label : "送包日期及时间：", dataIndex : '', fontSize : 11, position : ["840","4%","90%",5]}, - {label : "送包者签名：", dataIndex : '', fontSize : 11, position : ["880","4%","90%",5]}, - {label : "回收者签名：", dataIndex : '', fontSize : 11, position : ["920","4%","90%",5]} + {label : "取包者签名：", dataIndex : '', fontSize : 11, position : ["800","4%","90%",5]}, + {label : "取包日期及时间：", dataIndex : '', fontSize : 11, position : ["840","4%","90%",5]}, + {label : "联系方式：", dataIndex : '', fontSize : 11, position : ["880","4%","90%",5]}, + {label : "发货人签名：", dataIndex : '', fontSize : 11, position : ["920","4%","90%",5]} ], goodsTable :{ @@ -1227,4 +1227,12 @@ //待回收申请单，是否打印回收汇总单 recyclingInvoiceTotal:recyclingInvoiceTotalConfig_bjdxzlyy +} +var printerNameMapping = { + // 模板-普通小标签 + '模板-普通小标签':'ZD50', + // 模板-新小标签 + '模板-新小标签':'ZD50', + // 模板-外部代理小标签 + '模板-外部代理小标签':'ZD50' }; \ No newline at end of file