Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js =================================================================== diff -u -r38837 -r39362 --- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 38837) +++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 39362) @@ -64,7 +64,7 @@ //回收界面回收人是否强制不能为空 recyclePageRecyclingUserNotNull : false, //清洗篮筐内的物品是否必须装配完成后，篮筐才能在回收时进行入筐 - recycleClassifyBasketAfterPacked : false, + recycleClassifyBasketAfterPacked : true, //是否启用聚合包功能 enableComboTousse: true, //如果配置为不需要在单位前加上最小申请数量时,则用原单位,否则加上最小申请数量与斜杠 @@ -170,7 +170,7 @@ //清洗消毒模块，登记清洗记录时，清洗责任人是否允许为空 washAndDisinfectRecordPersonInChargeAllowBlank: false, //已发货但是未签收的物品是否允许登记使用记录 - notSignedItemsCanRegistUseRecord: false, + //notSignedItemsCanRegistUseRecord: false, //PDA上是否启用借物管理模块 enablePDABorrowModule:true, //控制PDA的回收清点模块的功能是预回收还是器械交接。 @@ -223,7 +223,7 @@ //禁用运作监控 //disableOperationMonitor:true, //是否禁用科室同步 - hiddenOrgunitSyncButton:true, + //hiddenOrgunitSyncButton:true, //是否禁用人员同步 hiddenUserSyncButton:true, //允许部分回收 @@ -267,9 +267,9 @@ //是否启用急用物品处理周期统计报表 enableUrgentNeedGoodsProcessingCycleReport:true, //桌面快捷图标配置 - desktopShortcutIconsConfig:["外来器械申请","手术预约管理"], + desktopShortcutIconsConfig:["外来器械申请","手术预约管理","设备维护信息"], //使用记录表单的必填项配置 - notAllowBlankFieldsOnUseRecordPage : ["operationRoom"], + //notAllowBlankFieldsOnUseRecordPage : ["operationRoom"], //是否限制同一个手术间只能登记一个未审核的使用记录 limitOneOperationRoomCanOnlyRegistOneUnAuditedUseRecord:true, //打印标签同时打印包内清单 @@ -316,10 +316,31 @@ enableDisplayRecyclingTimeOfrecyclingRecordList:true, //允许在回收申请单中修改外来器械包的价格 enableModifyThePriceOfForeignTousseInrecyclingRecord:true, -//启用发货记录的结算科室干预拆分功能 -enableSettleDepartIntervenesInTheSplitOfInvoiceView:true, +//回收是否修改申请单备注，true修改 +modifyRemarkInRecycling:true, +//启用【器械包种类定义】功能。 +enableInstrumentSetTypeSetting : true, +//器械包批量修改 +tousseDefinitionCanBatchEdit : true, +//启用打印标签输出打印机设置功能 +//enablePrintLabelsOutputPrinterSettingsFunction:true +//不检查打印是否成功的状态 +//doNotCheckPrintStatus:true +//IP对应的默认科室配置的菜单 +enableIPAndOrgUnitMapping : true, +//使用记录增加扩展字段 +enableUseRecordFormExtensionFields:["主刀医生核算科室"], +//开启申请数量与回收数量差异提醒，申请单上增加差异情况字段以及将差异消息提醒临床科室 +enableReminderOfTheDifferenceBetweenApplicationAndRecyclingAmount : true, +//器械包信息列表扩展列配置 +"expandColoumnsConfigOfTousseInfoList": [{"fieldName":"urgentLevel","coloumnName":"加急级别"}], +"expandQueryFieldsConfigOfTousseInfoQuery": [{"fieldName":"urgentLevel","QueryName":"加急级别"}], +//待回收的申请单,在回收的时候是否可以修改申请科室 +canChangeDepartInRecyclingForwaitRecycleInvoicePlan : true, +//开启科室使用记录功能 +enableDepartmentUseRecord : true, //是否启用装配管理的加急功能 enableSetUrgentOfPackin:true, -//回收是否修改申请单备注，true修改 -modifyRemarkInRecycling:true +//启用发货记录的结算科室干预拆分功能 +enableSettleDepartIntervenesInTheSplitOfInvoiceView:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/print/printConfig.js =================================================================== diff -u -r37234 -r39362 --- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/print/printConfig.js (.../printConfig.js) (revision 37234) +++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/print/printConfig.js (.../printConfig.js) (revision 39362) @@ -341,7 +341,7 @@ var invoiceComboPrintConfig_2 = { headerFooter : [ // 页眉名称 -// {label : "", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, + // {label : "深圳市第三人民医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, // 标题 {label : "深圳市第三人民医院消毒供应中心无菌物品发放单", dataIndex : '', fontSize : 16, position : ["5","10%","99%",5]}, {label : "科室：", dataIndex : 'depart', fontSize : 11, position : ["37","2%","90%",5]}, @@ -350,14 +350,13 @@ {label : "签收人:", dataIndex : '', fontSize : 11, position : ["340","50%","90%",5]}, {label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["340","2%","90%",5]}, {label : "下送人:", dataIndex : 'personInCharge', fontSize : 11, position : ["340","25%","90%",5]}, - {barcodes : [ - {codeType : "128Auto", dataIndex : 'invoiceSerialNumbers', position : ["3mm","74%","40mm","8mm"], - styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, + {barcodes : [ + {codeType : "128Auto", dataIndex : 'invoiceSerialNumbers', position : ["2mm","74%","40mm","8mm"], + styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, {itemNameID: 0, styleName: 'FontSize', styleValue: 6}, - {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true} - ] + {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}] } - ]} + ]} ], currentPageNumber : {label : "第#页", fontSize : 11, position : ["340","75%","90%",5]}, totalPageAmount : {label : "共&页", fontSize : 11, position : ["340","81%","90%",5]}, Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/img/logo_szsdsrmyy.png =================================================================== diff -u -r32464 -r39362 Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/interfaces/mybatis/SyncOperationReservation_Mapper.xml =================================================================== diff -u -r37162 -r39362 --- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/interfaces/mybatis/SyncOperationReservation_Mapper.xml (.../SyncOperationReservation_Mapper.xml) (revision 37162) +++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/interfaces/mybatis/SyncOperationReservation_Mapper.xml (.../SyncOperationReservation_Mapper.xml) (revision 39362) @@ -29,6 +29,10 @@ SELECT po.*,'' needTranscoding FROM NEUORIS.V_GYS_OPERATION_INFO po WHERE 1=1 + and OPERATING_ROOM_NAME not like '%D%' + and OPERATING_ROOM_NAME not like '%纤%' + and OPERATING_ROOM_NAME not like '%内%' + and OPERATING_ROOM_NAME not like '%门%' ]]> and po.SCHEDULED_DATE_TIME >= #{startDate} Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/menu/menuconfigure.js =================================================================== diff -u -r35830 -r39362 --- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 35830) +++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 39362) @@ -435,6 +435,7 @@ singleClickExpand:singleClickExpandTree, hidden:SSTS_TousseManagerView, children:[ + {hidden :SSTS_TousseInstanceType_list,text:"器械包种类定义",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseType.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Tousse,text:"器械包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Tousse,text:"停用的器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_CustomTousse,text:"自定义器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, @@ -512,8 +513,9 @@ singleClickExpand:singleClickExpandTree, hidden:SSTS_MESSAGE_Menu, children:[ - {hidden :SSTS_MESSAGE_Menu,text:"消息发布管理",href:WWWROOT+'/disinfectsystem/message/message.jsp?editMode=true',hrefTarget:linkTarget,leaf:true} - ] + {hidden :SSTS_MESSAGE_Menu,text:"消息发布管理",href:WWWROOT+'/disinfectsystem/message/message.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :!sstsConfig.enableReminderOfTheDifferenceBetweenApplicationAndRecyclingAmount,text:"申请与回收差异消息",href:WWWROOT+'/disinfectsystem/message/messageView2.jsp?editMode=true',hrefTarget:linkTarget,leaf:true} + ] },{ text:"科室问题反馈", singleClickExpand:singleClickExpandTree, @@ -608,7 +610,7 @@ //{hidden :SSTS_USERECORD_ForGoods,text:"使用记录物品分类汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品分类汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}, - //{hidden :SSTS_WashingMachineStoveUseCountReport,text:"清洗机使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washingMachineStoveUseCountView.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}, @@ -626,11 +628,11 @@ //{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_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.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_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_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}, @@ -645,7 +647,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_SterilizationEffectMonitorReport,text:"灭菌效果监测结果报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationEffectMonitorView.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}, @@ -680,9 +682,9 @@ {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_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} + {hidden :SSTS_TousseApplySummary,text:"各部门器械包申请汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseApplySummary.jsp',hrefTarget:linkTarget,leaf:true} ] }, //simon-add @@ -902,12 +904,13 @@ {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}, {hidden :SSTS_UseRecordConvertConfig_Manager,text:"使用记录转换配置",href:WWWROOT+'/disinfectsystem/basedatamanager/useRecordConvertConfig/useRecordConvertConfigView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecyclePrint_Menu,text:"器械包回收备注设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=recycleItem_remark',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SpecialInfection_manager,text:"特殊感染类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=specialInfection',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_SpecialInfection_manager,text:"特殊感染类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/specialInfection/specialInfectionView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_application_end_cause_manager,text:"申请单终止原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=application_end_cause',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_application_end_cause_manager,text:"器械包废弃原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousse_discard_cause',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_foreignProxyGroup_manager,text:"外部代理灭菌分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignProxyGroup',hrefTarget:linkTarget,leaf:true},