Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/spring/timer.xml =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/spring/timer.xml (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/spring/timer.xml (revision 31558) @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js =================================================================== diff -u -r31486 -r31558 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 31486) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 31558) @@ -149,7 +149,7 @@ disableDeviceInterface:false, //设备接口日记内容添加详细的设备接口连接信息(用于调设备接口) enableDetailedDeviceInformation : true, - //回收界面回收人是否强制不能为空 + //回收界面回收人不强制为空 recyclePageRecyclingUserNotNull : false, //是否显示辅助发货按钮 showAuxiliaryInvoiceBtn : true, @@ -167,8 +167,26 @@ useRecordAuditModeForPDA : 3, //发货界面，启用保存并打印按钮 enableSaveAndPrintWhenInvoice : true, - //按科室合并使用记录 - useRecordConvertRecyclingApplicationMergeRegular : "depart", + //按手术间合并使用记录 + //useRecordConvertRecyclingApplicationMergeRegular : "operationRoom", + //启用：IP对应的默认科室配置的菜单 + enableIPAndOrgUnitMapping : true, + //回收时的拆单方式 + methodOfSplitRecyclingApplication:2, + //使用记录转换申请生成的备注内容的器械包数量计算仅统计要回收的物品 + useRecordToRecycAppTousseAmountOfRemarkOnlyCountNeedRecyclingGoods : true, + //启用生物阅读器接口 + enableBioreaderInterface : true, + //外来器械申请单是否允许申请多套外来器械包 + allowApplyMultipleForeignTousse : true, + //是否启用拍摄功能 + showCameraPhoto : true, + //桌面快捷图标配置：外来器械申领 + desktopShortcutIconsConfig :["外来器械申请"], + //发货时针对有植入物的器械包，是否要提示生物监测的情况 + biologicalMonitoringEnable : true, + //是否启用生物监测结果的提示 + enableBiologicalMonitoringOfAllTousses : true, //是否FTP登录后再设置被动模式，有的ftp服务器需要先登录再设置为被动模式 setPassiveModeAfterLogin:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml =================================================================== diff -u -r31486 -r31558 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml (.../FindPatientInfoByHospitalNumMapper.xml) (revision 31486) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml (.../FindPatientInfoByHospitalNumMapper.xml) (revision 31558) @@ -41,7 +41,7 @@ CIRCUITNURSE, PATIENTSEX, WASHHANDNURSE, - SEARIALNUMBER, + SEARIALNUMBER as HOSPITALNUMBER, HOSPITALNUMBER, OPERATION, PATIENTAGE, @@ -50,7 +50,7 @@ TO_CHAR(h.operationTime,'YYYY-MM-DD HH24:MI:SS') operationTime, REMARK FROM CSSD_HospitalNumber h - WHERE h.hospitalNumber = #{hospitalNum} order by SEARIALNUMBER desc + WHERE (h.hospitalNumber = #{hospitalNum} or SEARIALNUMBER = #{hospitalNum}) order by SEARIALNUMBER desc ]]> Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js =================================================================== diff -u -r31491 -r31558 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 31491) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 31558) @@ -425,7 +425,7 @@ {hidden :SSTS_ForeignTousse_Manage,text:"停用的外来器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包信息",href:WWWROOT+'/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"标识牌信息",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_Tousse,text:"器械包库存",href:WWWROOT+'/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Tousse,text:"器械包库存",href:WWWROOT+'/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true} //{hidden :SSTS_TousseMaintain_Manager,text:"器械包保养",href:WWWROOT+'/disinfectsystem/toussemanager/toussemaintain/tousseMaintainView.jsp',hrefTarget:linkTarget,leaf:true} // {hidden :!sstsConfig.hasOwnProperty('enableComboTousse') || sstsConfig.enableComboTousse == false || SSTS_ComboTousseManager,text:"聚合包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/comboTousse.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, // {hidden :SSTS_DepartMentTousseManager,text:"基数管理",href:WWWROOT+'/disinfectsystem/departmentStock/departmentStockInputView.jsp',hrefTarget:linkTarget,leaf:true}, @@ -637,9 +637,9 @@ {hidden :SSTS_EOGoodsDetailReport,text:"发货物品统计月报(按灭菌程序)",href:WWWROOT+'/disinfectsystem/reportforms/EOGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, //{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/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/godownEntryDetailStatisticView.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_ReturnGoodsDetailReport,text:"签收统计报表",href:WWWROOT+'/disinfectsystem/reportforms/signGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},