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 27095 is being indexed.

Thursday 24 Oct 2019
10:10 上午

shuyongfu

解决:ASSGYEY-23 单点登录接口取参修改。接口返回的xml由USER_LOGIN_NAME改为USER_CODE
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForGyey.jsp
Wednesday 23 Oct 2019
5:46 下午

zengyuan

广医二院消毒供应项目GYEY-730 视频监控模块开发(高级视图--后台监控管理--视频监控) 器械包信息当视频正在录制时，提示不能播放
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
5:38 下午

zengyuan

广医二院消毒供应项目GYEY-730 视频监控模块开发(高级视图--后台监控管理--视频监控) 当视频正在录制时，提示不能播放
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoManage.js
4:00 下午

jason

解决jira问题：广医二院消毒供应项目GYEY-730 视频监控模块开发(级联删除)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/videomonitor/PackingRecordVideo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/videomonitor/CameraDefinition.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/videomonitor/VideoRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/videomonitor/RecyclingRecordVideo.java
3:42 下午

jason

解决jira问题：广医二院消毒供应项目GYEY-730 视频监控模块开发(videoManager改为非事务的bean)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/gyey/video-monitor.xml
1:57 下午

zc.li

完善：JMSZXYY-83。发货单物品器械包退货退2次发货的器械包时，科室不对，退货不成功的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
11:22 上午

shuyongfu

暂时屏蔽外来器械回收测试用例类
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/AllTests.java
10:20 上午

zc.li

完善：JMSZXYY-83。发货单物品器械包退货物品列表不显示2次发货的器械包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
9:55 上午

shuyongfu

处理消毒物品发货测试用例不通过的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerTests.java
Tuesday 22 Oct 2019
8:36 下午

shuyongfu

解决:GDSRMYY-515 针对测试环境科室、人员同步接口重新发一个发布包

需要在部署的服务器电脑上的hosts文件配置ip映射.别名为JianXun,ip地址为健讯服务器ip地址(端口用80,不要用其它端口),如:

JianXun 172.16.100.8

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/helper/WebServiceClientHelper.java
7:58 下午

zc.li

解决：JMSZXYY-83。发货单物品列表不显示2次发货，不打印二次发货的器械包的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
5:34 下午

zc.li

完善：GDSRMYZHYY-5。发货物品统计月报表标题修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
4:11 下午

zc.li

解决：GDSRMYZHYY-5。发货物品统计月报灭菌程序改为多选
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/EOGoodsDetailView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/EOGoodsDetailView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
2:28 下午

zc.li

解决ASSZDWY-50和视频监控设置回收上下文id为回收记录id造成的冲突BUG:二次回收外来器械包申请单，申请单状态不会变为已回收,导致申请单回收后还在待回收列表里。处理方法设置id放在修改申请单状态之后。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
10:56 上午

shuyongfu

解决:ASSLQYQRZ-26 监测核对员未录入，生物监测状态变成已确认
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
Monday 21 Oct 2019
3:35 下午

zc.li

解决：ASSZSYK-59。器械报损明细统计报表增加搜索条件，修复报损人查询数据重复的问题。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/materialDamageItemView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
1:39 下午

shuyongfu

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

处理测试用例由于此配置而导致通不过的问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
10:03 上午

zc.li

解决：ASSZSYK-58。器械报损汇总统计报表查询结果按材料名称排序。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
9:43 上午

zc.li

解决：GGSRMYY-107。核算月报导出excel后，去除隐藏的合并单元格，并根据客户要求调整表格格式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jasper
Friday 18 Oct 2019
3:55 下午

zc.li

解决：ASSZSYK-55。器械丢失明细统计报表增加搜索条件。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/action/UserAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissItemView.js
2:58 下午

legh

解决jira问题： 广医二院消毒供应项目GYEY-730 视频监控模块开发，修改了gyey项目配置文件，将视频监控平台IP地址修改为客户预分配的IP地址
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/config/gyey/videoServerConfig.json
2:25 下午

zengyuan

小袁测试发现，中大五院外来器械在科室申领打开申请单不能打印和打印预览
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
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