Index: ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/print/printConfig.js =================================================================== diff -u -r31893 -r40322 --- ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/print/printConfig.js (.../printConfig.js) (revision 31893) +++ ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/print/printConfig.js (.../printConfig.js) (revision 40322) @@ -1172,4 +1172,10 @@ //打印器械包明细单 tousseDefinitionMaterials:tousseDefinitionMaterialsConfig_qifuyy +} +var printerNameMapping = { + //模板-110x80大标签 + '模板-110x80大标签': 'ZD100', + //模板-外来器械大标签 + '模板-外来器械大标签': 'ZD100' }; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/menu/menuconfigure.js =================================================================== diff -u -r35830 -r40322 --- ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 35830) +++ ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 40322) @@ -617,7 +617,7 @@ {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}, @@ -634,7 +634,9 @@ {hidden :!sstsConfig.enableNurseWorkload,text:"护理工作质量指标报表",href:WWWROOT+'/disinfectsystem/reportforms/nurseWorkload.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.showSterilizerQualityReport,text:"灭菌物品质量监测统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizerQuality.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.showUnqualifiedPretreatmentReport,text:"预处理不合格报表",href:WWWROOT+'/disinfectsystem/reportforms/unqualifiedPretreatmentReport.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SterilizationOmitReport,text:'灭菌遗漏检查表',href:WWWROOT+'/disinfectsystem/reportforms/sterilizationOmitReport.jsp',hrefTarget:linkTarget,leaf:true} + {hidden :SSTS_SterilizationOmitReport,text:'灭菌遗漏检查表',href:WWWROOT+'/disinfectsystem/reportforms/sterilizationOmitReport.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_BiologicalMonitoringReport,text:"生物监测统计报表",href:WWWROOT+'/disinfectsystem/reportforms/statisticalStatementOfBiologicalMonitoringView.jsp',hrefTarget:linkTarget,leaf:true} + ] },{ text:"财务核算及物品发放报表", @@ -662,7 +664,7 @@ {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_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}, @@ -726,6 +728,7 @@ {hidden :SSTS_RecyclePrint_Menu || (printRecyclingConfigFormVersion!=2),text:"打印发货计划设置",href:WWWROOT+'/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecyclePrint_Menu || !((sstsConfig.hasOwnProperty('printInvoiceVersion')) && sstsConfig.printInvoiceVersion==2),text:"打印发货单设置",href:WWWROOT+'/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"标签模板管理",href:WWWROOT+'/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction,text:"标签输出打印机设置",href:WWWROOT+'/disinfectsystem/computerLabelPrinterSetting/computerLabelPrinterSettingView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecyclePrint_Menu,text:"回收科室分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecyclePrint_Menu,text:"审核科室分组设置",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.jsp?type='+departmentGroupOption_REVIEWE),hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecyclePrint_Menu,text:"物品科室共用配置",href:WWWROOT+'/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigView.jsp',hrefTarget:linkTarget,leaf:true}, @@ -757,7 +760,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}, @@ -782,7 +785,8 @@ {hidden :SSTS_Handover_manager,text:"交接模块管理",href:WWWROOT+'/disinfectsystem/basedatamanager/handover/handoverView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ResponsibilityPart_manager,text:"责任环节",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=responsibilityPart',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DefectiveMessageRegisterType_manager,text:"缺陷信息登记类型分组",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=defectiveMessageRegisterType',hrefTarget:linkTarget,leaf:true}, - {hidden :(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive,text:"职称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=positionalTitle',hrefTarget:linkTarget,leaf:true}, + {hidden :false,text:"设置不合格数来源",href:WWWROOT+'/disinfectsystem/reportforms/js/setUnqualifiedSourceForm.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive,text:"职称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=positionalTitle',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_chargeRecordManage_MENU,text:"收费项目设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=chargeItem&optionName=收费项目设置'),hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"供应室处理器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"供应室服务临床科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/config.js =================================================================== diff -u -r36054 -r40322 --- ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/config.js (.../config.js) (revision 36054) +++ ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/config.js (.../config.js) (revision 40322) @@ -1,4 +1,4 @@ -var sstsConfig = { +var sstsConfig = { // 回收时科室显示结算科室 showSettleAccountsDepartInRecycling : false, // 审核器械包必须入篮筐（一级供应室） @@ -24,9 +24,17 @@ // 自动补全用户名的长度 autoFillUserNameLength:6, //装配界面的配包人是否默认为上一次装配的配包人 - packingPageOperatorDefaultLastOperator : true, + packingPageOperatorDefaultLastOperator : false, //审核界面的审核人是否默认为上一次审核的审核人 - reviewPageReviewerDefaultLastReviewer : true, + reviewPageReviewerDefaultLastReviewer : false, + //装配界面的审核人是否默认为上一次装配的审核人 + packingPageReviewerDefaultLastReviewer : false, + //装配界面的检查人是否默认为上一次装配的检查人 + packingPageInspectorDefaultLastInspector : false, + //装配界面的包装人是否默认为上一次装配的包装人 + //packingPageWrapperDefaultLastWrapper : false, + //装配界面的灭菌人是否默认为上一次装配的灭菌人 + packingPageSterileUserDefaultLastSterileUser : false, // 是否支持部分终止申请单中的物品 enableTerminatePartOfApplication : true, //安卓上,录入灭菌及查看灭菌记录界面,单独添加的器械包组默认展开 @@ -52,7 +60,7 @@ //自定义装配后是否保留灭菌日期 disinfectionDateProcessTypeInDirectPackingView : true, // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个 - useRecordAuditMode : 1, + useRecordAuditMode : 2, hideApplyDepartColumn : false, // 隐藏申请科室 hideSettleDepartColumn : true,// 隐藏结算科室 //回收界面回收人是否强制不能为空 @@ -94,8 +102,10 @@ //对申请单的物品申请数量是否启用干预功能 enableInterfereApplyAmount : true, - //是否是加强版的“消毒供应中心员工工作量统计报表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是 + //是否是加强版的“消毒供应中心工作量统计报表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是 strengthenStatisticalWorkload : true, + //次日下送报表 + enableTousseMorrowSend:true, //是否禁用整筐发货 disableScanBasketInvoice : false, //科室申领中，是否启用打印选中物品 @@ -123,7 +133,7 @@ //禁用基数限制 disableCardinalNumLimit:true, // 禁用标识牌功能 - disableIdCard : true, + disableIdCard : false, //签收模块的版本 signModuleVersion:2, //PDA的签收模式，值为3：支持发货单签收和器械包签收两种模式。点击签收或科室签收模块名称时，弹出菜单让用户选择其中一种后，进入到模块 @@ -175,6 +185,27 @@ desktopShortcutIconsConfig:["外部代理灭菌","外来器械申请"], //加急功能 enableUrgentFunction:true, + //开启护理质量指标统计报表 + enableNurseWorkload : true, + nursingQualityIndexReportConfiguration : true, + nursingQualityIndexReportConfiguration:{ + "compareReportsSettings":{ + "showDescriptionColumnOfDataIndex":true, + "compareColumnsSettingsOfDataIndex":[ + {"columnName":"numeratorOfRatio","columnTitle":"发生数"}, + {"columnName":"denorminatorOfRatio","columnTitle":"总数"}, + {"columnName":"valueOfDataIndex","columnTitle":"指标数值"} + ] + }, + "dataIndexsArray":[ + {"dataIndexNameForDisplay":"无菌物品合格率","dataIndexSource":"复用性灭菌物品合格率"}, + {"dataIndexNameForDisplay":"清洗器械总件数","dataIndexSource":"器械清洗总件数"}, + {"dataIndexNameForDisplay":"清洗器械合格率","dataIndexSource":"器械清洗合格率"}, + {"dataIndexNameForDisplay":"包装合格率","dataIndexSource":"包装合格率"}, + { "dataIndexNameForDisplay": "灭菌装载合格率", "dataIndexSource": "灭菌装载合格率"}, + {"dataIndexNameForDisplay":"湿包发生率","dataIndexSource":"湿包发生率"} + ] + }, //是否显示外来器械申请为原始包定义，true：元素；false：最近一次 isShowForeignTousseAncestorDefinitionForApply:true, //标签打印配包材料，true：打印；false或不配置不打印 @@ -195,14 +226,37 @@ enableBecomeNotAuditedButton:true, //自定义装配，显示申请科室，true:显示。不配置或false，不显示 selectDepartInCustomPacking:true, + //控制PC端签收。没有配置或者值为1：签收模块的第1个版本，即采用原来的版本 + //值为2：签收模块的第2个版本，具有待签收物品列表的版本 + signModuleVersion:2, + //没有配置或者值为1：仅支持发货单签收一种模式，点击签收或科室签收模块名称时，不弹出菜单，直接进入到签收或科室签收模块，扫描发货单条码签收； + //值为2：仅支持器械包签收一种模式，点击签收或科室签收模块名称时，不弹出菜单，直接进入到签收或科室签收模块，扫描器械包（物品）条码签收； + //值为3：支持发货单签收和器械包签收两种模式，点击签收或科室签收模块名称时，弹出菜单让用户选择其中一种后，进入到模块。 + signModeOfPDASignModule:3, + //值为ture或者没有配置：启用扫码登录，启用后，可以扫描用户的身份条码登录系统；控制pc+pda + //值为false：不启用扫码登录。如果用户扫码登录，则提示：不允许扫码登录，请输入用户名和密码登录！控制pc+pda + enableScanBarcodeLogin:true, + //灭菌完成后是否确认，true:是，false:不是 + //sterilizationRecordFinishConfirm:true, //装配界面显示包装人字段 - showWrapperField:true, + //showWrapperField:true, + //添加回收申请单是否加载申领模板 + //isLoadApplyTemplateForAddRecycleRecord:true, + //创建新申请单时，不加载科室申领模板到表单，只显示选择模板的下拉框，需要用户手工去选择模板加载。 + //notLoadApplyTemplateWhenCreateDeptApplication:true, + //配合创建新申请单时，不加载科室申领模板到表单，只显示选择模板的下拉框，需要用户手工去选择模板加载 才生效 + //isOpenLoadTemplateByUnit:true, + //启用打印标签输出打印机设置功能 + enablePrintLabelsOutputPrinterSettingsFunction : true, + //器械包工作量统计报表扩展列配置 + extendedColumnConfigOfTousseWork:["urgentAmount"], //外来器械包大小统计报表统计范围 foreignTousseSizeSetting : [{"sizeName":"单件","minNumber":1,"maxNumber":1},{"sizeName":"小包","minNumber":2,"maxNumber":5},{"sizeName":"中包","minNumber":6,"maxNumber":20},{"sizeName":"大包","minNumber":21,"isInfinite":true}], //启用手术室器械包使用分摊费用报表 enableOperatingRoomInstrumentSetUsageAndApportionmentExpenseReport:true, - //PDA端召回信息功能 - recallRecordViewOfPda:true - - -} \ No newline at end of file + //灭菌炉接口，是否采用灭菌开始时间来匹配接口文件的数据 + sterilizaMatchPatternForDate:true, + enableDetailedDeviceInformation:true, + sterilizerLineChartIsShowTable:true, + printSterileTPLineData:true +}; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/spring/timer.xml =================================================================== diff -u -r31031 -r40322 --- ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/spring/timer.xml (.../timer.xml) (revision 31031) +++ ssts-web/src/main/webapp/disinfectsystem/config/szslhqzxyy/spring/timer.xml (.../timer.xml) (revision 40322) @@ -2,7 +2,30 @@ - + + + + + + + + processDeviceInterfaceData + + + + + + + + + + 0 0/3 * * * ? + + + + @@ -11,4 +34,6 @@ - \ No newline at end of file + + +