forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 46
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 46
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 27073 is being indexed.

Friday 18 Oct 2019
2:13 下午

legh

解决jira问题： 广医二院消毒供应项目GYEY-730 视频监控模块开发，解决了接口返回的视频名称中包含英文冒号导致浏览器无法播放视频的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoFile.jsp
Thursday 17 Oct 2019
5:14 下午

shuyongfu

解决:GGSRMYY-111 PDA上预回收确认后，PC端回收清点扫描标识牌无法打开申请单
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
4:19 下午

legh

解决jira问题： 广医二院消毒供应项目GYEY-730 视频监控模块开发，修复了播放地址截取长度的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/service/VideoManagerSynologyImpl.java
4:17 下午

zc.li

修复不开启加急时，灭菌记录今天待审核的待灭菌物品列表里未入筐的物品不显示的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
2:50 下午

shuyongfu

解决:GYEY-730 视频监控模块开发

漏提交了定时器配置文件,补提交

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gyey/timer.xml
2:46 下午

shuyongfu

解决:GYEY-730 视频监控模块开发

1.启动应用服务时,将停止所有的摄像、更新所有未结束的视频的结束时间

2.进入回收时启用录拍、关闭回收窗口时停止录拍.期间产生的装配记录关联所拍的视频。相关的回收页面有待回收列表、打开其中某条待回收或已回收或添加回收、快速回收、快速入筐等

3.进入装配时启用录拍、关闭所有装配窗口(最好是退出系统)时停止录拍.期间产生的装配记录关联所拍的视频。相关的装配页面有各任务组装配页面、自定义装配或外来器械装配页面、聚合包装配页面等

4.后台定时器监制客户端心跳信息,如有心跳超时达到与超过2分钟,将停止该客户端的录拍

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/service/WorkstationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/heartbeat/controller/HeartbeatController.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/heartbeat/timer/HeartbeatTimerManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/heartbeat/timer/HeartbeatTimerManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoManage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoFile.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
  12. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/heartbeat/timer
  13. /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/heartbeat
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
  16. … 22 more files in changeset.
1:44 下午

zengyuan

售后-佛山妇幼ASSFSFY-12 打印器械包明细单，修改为点击后显示打印预览的界面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
11:09 上午

jason

解决jira问题：北京垂杨柳医院BJCYLYY-16 外来器械接收单格式更改及增加部分字段取值(解决通用申请单包含外来器械时报错问题)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:24 上午

shuyongfu

解决:ASSZDWY-54 增加“查看所有科室全部使用记录”的权限设置

增加关总整理的相关的权限与配置项关联的配置(仅第一版的部分)

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
9:36 上午

zengyuan

售后-佛山妇幼ASSFSFY-11 器械包信息的使用记录选项卡增加洗手护士一项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
Wednesday 16 Oct 2019
9:18 下午

legh

解决jira问题： 广医二院消毒供应项目GYEY-730 视频监控模块开发，增加了从监控平台获取视频名称和视频播放地址
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/service/VideoRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecordPlayInfo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/action/VideoRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecordInfo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/service/VideoManagerSynologyImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/service/VideoManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/service/VideoRecordManager.java
7:01 下午

shuyongfu

解决:ASSZDWY-54 增加“查看所有科室全部使用记录”的权限设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menu.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/expensivegoodshomepage/menu.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/controller/UseRecordControllerBase.java
5:54 下午

shuyongfu

解决:ASSZDWY-54 增加“查看所有科室全部使用记录”的权限设置

权限与配置项进行了关联,即未启用某个(或某些)配置项时,配置项对应的权限在权限分配页面也将不会显示

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java
  2. /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/dao
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/dao/OperationDefineDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/bean/OperationDefineBean.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/bean/ModelNameBean.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/bean/SystemNameBean.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/bean/OperationBean.java
4:22 下午

shuyongfu

解决:ASSDGSZYY-69 物品眼科受水器申请后直接点开发货计划无法发货

解决另一种场景:有其它申请单也申请了眼科受水器及其它物品、但眼科受水器已发货、其它物品未全部发货时也会查这个眼科受水器申请时产生的包定义的md5

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
4:08 下午

jason

解决jira问题：GZZYYFY-69 器械包信息导出的EXCEL表格数据“装配人”一列数据显示为空
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
2:53 下午

zengyuan

广东省人民医院GDSRMYY-509 外来器械申请单的优化（申请单回收前可由申请人进行修改）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
2:09 下午

zc.li

解决：ASSKPSZXYY-20。回收时扫描包条码后页面没反应。另删除一些无用的代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
2:03 下午

jason

解决jira问题：ASSZSYK-53 一次性物品库存中不需要显示已经停用的一次性物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
11:38 上午

zengyuan

广医二院消毒供应项目GYEY-730 视频监控模块开发(高级视图--后台监控管理--视频监控) 修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/watchVideo.jsp
11:12 上午

shuyongfu

解决:ASSDGSZYY-69 物品眼科受水器申请后直接点开发货计划无法发货
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:39 上午

jason

解决jira问题：售后-东莞市中医院ASSDGSZYY-68 打印发货计划增加“打印待发货物品”功能按钮(增加注释)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
10:37 上午

jason

解决jira问题：售后-东莞市中医院ASSDGSZYY-68 打印发货计划增加“打印待发货物品”功能按钮(增加注释)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
10:32 上午

zengyuan

广医二院消毒供应项目GYEY-730 视频监控模块开发(高级视图--后台监控管理--视频监控) 修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/watchVideo.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoFile.jsp
10:30 上午

jason

解决jira问题：售后-东莞市中医院ASSDGSZYY-68 打印发货计划增加“打印待发货物品”功能按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
10:14 上午

jason

解决jira问题：广东省人民医院GDSRMYY-513 通过省医集成平台和大成手麻做器械包字典信息接口和消毒包使用信息接口，用webservice方式和大成手麻系统做消毒包信息接口(修改方法名)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
10:10 上午

jason

解决jira问题：广医二院消毒供应项目GYEY-730 视频监控模块开发(器械包信息模块回收、装配视频播放)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/service/VideoRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/service/VideoRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
9:43 上午

zengyuan

广医二院消毒供应项目GYEY-730 视频监控模块开发(高级视图--后台监控管理--视频监控) 视频播放和器械包信息播放
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoManage.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/common.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoFile.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoManage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/watchVideo.jsp
Tuesday 15 Oct 2019
11:19 下午

LW

增加定时结算一次性物品设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/ggsrmyy/timer.xml
11:17 下午

LW

根据现场需求开启显示显示生物阅读器接口设置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js
11:16 下午

LW

根据现场需求，增加配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js