Index: ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
===================================================================
diff -u -r40678 -r40824
--- ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js (.../menuconfigure.js) (revision 40678)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js (.../menuconfigure.js) (revision 40824)
@@ -556,6 +556,7 @@
{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},
@@ -629,6 +630,19 @@
{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}
]
+},{
+ text:"数据实时看板",
+ singleClickExpand:singleClickExpandTree,
+ hidden:SSTS_RealTimeDashboards,
+ children:[
+ {hidden :false,text:"数据实时看板汇总",href:'javascript:void(0);',leaf:true,listeners:{
+ click:function(node, e){
+ var url = WWWROOT+'/disinfectsystem/config/'+profile+'/realTimeDashboards/index.jsp';
+ top.realTimeDashboardsWindow = openFullSizeWindowWithName(url,null,"realTimeDashboardsWindow");
+ return;
+ }
+ }}
+ ]
},
//simon-add
{
@@ -710,7 +724,6 @@
{hidden :SSTS_equipment_manager,text:"清洗方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=washMethod',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_Tousse_Update,text:"器械包重量设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousseWeight&optionName=器械包重量设置'),hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_DiposableGoodsType_manager,text:"一次性物品类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=diposableGoodsType',hrefTarget:linkTarget,leaf:true},
-
{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=expensiveGoodsType',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_Container,text:"容器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/container/containerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_Supplier,text:"供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/supplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
@@ -724,6 +737,7 @@
{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},
{hidden :SSTS_Sterilisation,text:"灭菌程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilisation/sterilisationView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_Bioreader,text:"生物阅读器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/bioreader/bioreaderView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
{hidden :(!sstsConfig.hasOwnProperty('disableDeviceInterface')) || sstsConfig.disableDeviceInterface,text:"设备接口管理",href:WWWROOT+'/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_Expiration,text:"物品失效期管理",href:WWWROOT+'/disinfectsystem/basedatamanager/expirationDateInfo/expirationDateInfoView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_SupplyRoomType_manager,text:"PDA参数设置",href:WWWROOT+'/personalSetting/modifyExitLoginTime.jsp',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgfy/interfaces/mqConfig/SDKConfig.properties
===================================================================
diff -u -r37555 -r40824
--- ssts-web/src/main/webapp/disinfectsystem/config/dgfy/interfaces/mqConfig/SDKConfig.properties (.../SDKConfig.properties) (revision 37555)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgfy/interfaces/mqConfig/SDKConfig.properties (.../SDKConfig.properties) (revision 40824)
@@ -1,11 +1,11 @@
#查询推送的服务地址
-server.ip=http://10.18.11.18:8360
+server.ip=http://10.18.13.27:8360
#推送的服务地址
-push.server.ip=http://10.18.11.18:8380
+push.server.ip=http://10.18.13.27:8380
#订阅的服务地址
-websocket.ip=http://10.18.11.18:8350
+websocket.ip=http://10.18.13.27:8350
#页端的服务地址
-web.ip=http://10.18.11.18:8370
+web.ip=http://10.18.13.27:8370
@@ -18,9 +18,9 @@
#*****客户端配置******
sys.code=S17
-client.key=597a26c36aff45e4a398455336f446df
+client.key=39ee7145c62248f4905e2908f79d5944
#客户端IP
-sys.ipaddr=
+sys.ipaddr=10.18.0.38
#v4.0.2.5 新增
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgfy/spring/HIS.xml
===================================================================
diff -u -r37555 -r40824
--- ssts-web/src/main/webapp/disinfectsystem/config/dgfy/spring/HIS.xml (.../HIS.xml) (revision 37555)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgfy/spring/HIS.xml (.../HIS.xml) (revision 40824)
@@ -52,6 +52,17 @@
+
+
+
+
+
+
+
+
+
+
@@ -95,8 +106,5 @@
class="com.forgon.disinfectsystem.maintain.device.service.SterisAMSCO3052DataManagerImpl">
-
-
-
-
+
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgfy/config.js
===================================================================
diff -u -r39400 -r40824
--- ssts-web/src/main/webapp/disinfectsystem/config/dgfy/config.js (.../config.js) (revision 39400)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgfy/config.js (.../config.js) (revision 40824)
@@ -1,6 +1,6 @@
var sstsConfig = {
// 禁用标识牌功能
- disableIdCard : true,
+ disableIdCard : false,
// 回收时科室显示结算科室
showSettleAccountsDepartInRecycling : true,
// 审核器械包必须入篮筐（一级供应室）
@@ -28,8 +28,9 @@
restrictGodownEntryDiposableGoods : false,
//提交申请单前显示申请的物品清单
showAppliedGoodsBeforeSubmit : false,
- // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
- useRecordAuditMode : 1,
+ // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个 3：保存并审核生成申请单合并一个按钮 4：同时显示保存、保存审核转换按钮;
+
+ useRecordAuditMode : 3,
//是否开启根据科室加载模板
isOpenLoadTemplateByUnit : true,
hideApplyDepartColumn : true, // 隐藏申请科室
@@ -54,8 +55,8 @@
useRecordOperationRoomAllowBlank:false,
//回收和申请终止的时候,是否将绑定的物品一起终止
terminateTousseWithBindingGoods:true,
- //是否启用“外来器械申请”的桌面图标 true为启用，false或者不配置为不启用
- enableForeignTousseApplicationDesktopIcon:true,
+ //是否启用“外来器械申请”的桌面图标 true为启用，false或者不配置为不启用 ,已废弃
+ //enableForeignTousseApplicationDesktopIcon:true,
//是否允许回收数量减小的部分超过待装配数量。如果允许,那装配任务就被删除
//true:允许。同时删除装配任务，这样就会导致装配数量大于回收数量。比如回
//收3个，装配2个，待装配就还有1个。此时修改回收数量为1，数量减少了2，待
@@ -81,15 +82,91 @@
//启用生物阅读器接口
enableBioreaderInterface:true,
//设备接口日志
-//enableDetailedDeviceInformation:true,
+enableDetailedDeviceInformation:false,
//设备接口读20天内数据
interFaceReadLimitDays:60,
//设备接口显示在菜单里
disableDeviceInterface:false,
//设置生物阅读器监测数据的灭菌结束时间与生物监测开始时间的间隔
timeOfMonitoringInterval :90,
- //启用待发货物品汇总的功能
- enableTheAbilityToSummarizeItemsToBeShipped:true,
//禁用基数限制
- disableCardinalNumLimit:true
+ disableCardinalNumLimit:true,
+ //批量修改器械包定义
+tousseDefinitionCanBatchEdit:true,
+//回收录入质量监测
+recycleAddQualityMonitoring:true,
+//用户登录成功后如果检查密码到不符合复杂度要求，则强制用户修改密码
+forceUserChangePwdWhenNotMeetPwdComplexityReq:true,
+//设置密码的复杂度参数
+needBeStrongPwdWhenModifyPwd:{'minPwdLength':8,'containLetter':true,'containNumber':true} ,
+ //是否禁用科室同步
+hiddenOrgunitSyncButton:true,
+ //是否禁用人员同步
+ hiddenUserSyncButton:true,
+ //桌面快捷图标
+ desktopShortcutIconsConfig:["外来器械申请","基数管理","设备维护信息"],
+ doNotCheckPrintStatus:true,
+ //启用数据实时看板功能
+ enableRealTimeDashboardsForDataFunction:true,
+ //生物监测结束时是否需要提示（为true表示要提示,为false或者没有配置,都不提示）
+ biologicalMonitoringWarning : true,
+ //在灭菌视图界面是否显示“生物监测的状态”属性(为true则显示，false或者未配置则不显示)
+ showBiologicalMonitoringStatus: true,
+ //是否启用加急功能。
+ enableUrgentFunction:true,
+ //是否启用器械包自动加急功能,包定义中会显示加急预警值字段。当回收包的数量大于等于该数量时，系统会将等于以及大于预警数量的包进行加急
+ enableTousseVoluntarilyUrgent:true,
+ //明细核算月报表增加可扩展查询项:加急级别
+ enableExtendedQueryItemsOfDetailedAccountingMonthlyReport:["urgentLevel"],
+ //器械包工作量统计报表扩展列配置,tousseGroupName (器械包分组);urgentAmount(加急数量）;packagingAmount(包装数量)
+ extendedColumnConfigOfTousseWork:["urgentAmount"],
+ //是否启用急用物品处理周期统计报表
+ enableUrgentNeedGoodsProcessingCycleReport:true,
+ //是否启用扫描灭菌监测包
+ enableScanSterilizationMonitoringPackage:false,
+ //是否隐藏“一键入炉”按钮
+ isHideBtnBatchAddTousse:false,
+ //部分回收
+ enablePartRecycle:true,
+ //是否启用拍摄功能。
+ showCameraPhoto:true,
+ //是否启用回收拍摄功能
+ showCameraPhotoInRecyclingModule:true,
+ //明细核算月报是否显示材料数量列
+ showMaterialsAmountColumnOfDetailMonthReport:true,
+ //使用记录单是否合并
+ //useRecordConvertRecyclingApplicationMergeRegular : "operationRoom"
+ //核算月报是否统计包内材料
+ monthReportMaterialAmountOfTousse:true,
+ //开始查询时间
+ //startDateOfDepartmentStock："2024-07-01 00:00"
+ //使用记录单的必填项配置
+ notAllowBlankFieldsOnUseRecordPage:["circuitNurse","washHandNurse","operationRoom","hospitalNum"],
+ //是否启用手术间管理界面
+ enableOperationRoomManagerViwe:true,
+ //只允许选择已存在的手术间
+ onlySelectExistedOperationRoom:true,
+ //启用核算月报的图形化模式
+ enableChartModeOfDepartmentMonthlyView:true,
+ //使用记录转换申请单后的合并规则
+ //useRecordConvertRecyclingApplicationMergeRegular : "operationRoom"
+ //启用器械包信息进度条
+ enableTousseStatusProgressBar:true,
+ //加急物品的提示时间间隔（单位秒）。
+ urgentGoodsWarningTimeInterval:300,
+ //是否启用设备维护功能自定义功能
+ isDeviceMaintenanceCus:true,
+ // 功能模块默认查询时间
+ defaultQueryTimeOfTheFunctionModule:[{"functionalModule": "tousseManager","queryPeriod": "100"},
+ {"functionalModule": "reviewView","queryPeriod": "30"},
+ {"functionalModule": "useRecord","queryPeriod": "30"}],
+ //外来器械使用后交接报表指定字段自动取值功能
+ foreignTousseAfterUseDeliveryAutoTakesTheValueOfTheSpecifiedField:["completeness","returnMan","receiveMan"]
+
+
+
+ //调整摄影显示的高度范围
+ //setTheDisplayAreaOfPhotography:{ "recycle":{"left":10,"top":10}}
+
+
}
\ No newline at end of file