Activity forgon-ssts-v4.1.0/ssts-tousse/src/main/java

6:53 下午

jason

More
31729
changed 19 files
root:

解决jira问题：GDSZYY-86 新增【器械包种类定义】功能

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
./com/forgon/disinfectsystem/tousse/instrumentsettype
- History
- Source
./com/forgon/.../tousse/instrumentsettype
- -0
- +15
./com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
- History
- Source
- Diff
./com/.../TousseDefinitionTableManager.java
- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionAction.java
- -0
- +213
./com/forgon/disinfectsystem/tousse/instrumentsettype/action/InstrumentSetTypeAction.java
- History
- Source
./com/forgon/.../InstrumentSetTypeAction.java
- -0
- +14
./com/forgon/disinfectsystem/tousse/toussedefinition/dto/TousseDefinitionParameterDto.java
- History
- Source
- Diff
./com/.../TousseDefinitionParameterDto.java
./com/forgon/disinfectsystem/tousse/instrumentsettype/service
- History
- Source
./com/forgon/.../instrumentsettype/service
- -0
- +79
./com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManager.java
- History
- Source
./com/forgon/.../InstrumentSetTypeManager.java
- -0
- +370
./com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManagerImpl.java
- History
- Source
./com/forgon/.../InstrumentSetTypeManagerImpl.java
./com/forgon/disinfectsystem/tousse/instrumentsettype/action
- History
- Source
./com/forgon/.../instrumentsettype/action
… 9 more files in changeset.

7:17 下午

zc.li

More
31686
changed 1 file
root:

删除系统中一些没用的代码

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java

7:14 下午

zc.li

More
31684
changed 1 file
root:

删除系统一些无用的代码

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionAction.java

4:13 下午

zc.li

More
31675
changed 2 files
root:

解决：FSDERMYY-5。修复在sqlserver下，科室申领器械包名称控件部分场景过滤[查询不到数据的问题。

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
… 1 more file in changeset.

11:25 上午

zc.li

More
31672
changed 3 files
root:

解决：FSDERMYY-5。修复在sqlserver下，今天本组装配记录器械包名称控件和科室申领器械包名称控件部分场景过滤[查询不到数据的问题。（暂不处理所有的场景，因为改动比较大）

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionAction.java
- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
… 1 more file in changeset.

11:09 上午

jason

More
31617
changed 2 files
root:

解决jira问题：SSTS-401 开启配置项enableCheckUploadPhotoBeforePackingForeignTousse，外来器械在装配前上传了照片，但是装配时依然提示没有上传照片

- -2
- +21
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
- History
- Source
- Diff
./com/forgon/.../action/ShowImageAction.java
… 1 more file in changeset.

6:50 下午

jason

More
31609
changed 1 file
root:

解决jira问题：SSTS-400 灭菌装载模块加载速度优化

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java

11:56 上午

zc.li

More
31580
changed 1 file
root:

解决：XKYY-211。本月库存和本月运作数据异常的问题。

- -1
- +3
./com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../MaterialCheckManagerImpl.java

6:43 下午

jason

More
31579
changed 5 files
root:

解决jira问题：XKYY-211 广州胸科升级前后对比-升级前有"器械材料月盘点记录"模块，升级后没有

- -0
- +133
./com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../MaterialCheckManagerImpl.java
- -4
- +3
./com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialCheckAction.java
- History
- Source
- Diff
./com/forgon/.../MaterialCheckAction.java
- -0
- +2
./com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManager.java
- History
- Source
- Diff
./com/forgon/.../MaterialCheckManager.java
… 2 more files in changeset.

3:56 下午

jason

More
31560
changed 3 files
root:

解决jira问题：SSTS-380：视频播放功能改进为不需要使用Flash插件，新版本的浏览器能直接通过HTML5.0技术进行播放

- -0
- +181
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageAndVideoAction.java
- History
- Source
- Diff
./com/.../UploadImageAndVideoAction.java
- -0
- +4
./com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../VideoFileManagerImpl.java
- -0
- +6
./com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManager.java
- History
- Source
- Diff
./com/forgon/.../service/VideoFileManager.java

1:47 下午

jason

More
31524
changed 1 file
root:

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值(消毒物品的积分系数默认取祖先包定义的积分系数)

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java

12:01 下午

jason

More
31517
changed 1 file
root:

解决jira问题：SZYK-5 待灭菌物品增加灭菌方式的过滤条件

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java

3:45 下午

jason

More
31515
changed 3 files
root:

解决jira问题：SZYK-5 待灭菌物品增加灭菌方式的过滤条件

- -5
- +9
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
- History
- Source
- Diff
./com/forgon/.../TousseInstanceManager.java
- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java
… 1 more file in changeset.

5:52 下午

jason

More
31513
changed 1 file
root:

解决jira问题：SZYK-38 查看清洗、灭菌记录图片功能的优化以及在视图列表中增加查看清洗、灭菌记录图片的快捷图标(查看保存到数据库的图片)

- -0
- +6
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
- History
- Source
- Diff
./com/forgon/.../action/ShowImageAction.java

5:35 下午

jason

More
31499
changed 12 files
root:

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
… 11 more files in changeset.

4:02 下午

jason

More
31497
changed 1 file
root:

解决：聚合包保存报错

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java

5:10 下午

jason

More
31464
changed 1 file
root:

解决jira问题：ZSSXLRMYY-200 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面

- -2
- +12
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
- History
- Source
- Diff
./com/forgon/.../action/ShowImageAction.java

4:34 下午

jason

More
31462
changed 1 file
root:

解决jira问题：ZSSXLRMYY-200 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面

- -1
- +9
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
- History
- Source
- Diff
./com/forgon/.../action/ShowImageAction.java

1:42 下午

jason

More
31456
changed 4 files
root:

解决jira问题：ZSSXLRMYY-200 质量监测记录图片预览界面改进为采用与清洗记录图片查看界面相同的界面

- -2
- +323
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
- History
- Source
- Diff
./com/forgon/.../action/ShowImageAction.java
… 3 more files in changeset.

6:36 下午

jason

More
31448
changed 5 files
root:

解决jira问题：XKYY-190 PC端的退货功能增加对外部代理灭菌包的支持

- -2
- +4
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionManager.java
- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionAction.java
- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
- -1
- +1
./com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
- History
- Source
- Diff
./com/forgon/.../MaterialDefinitionAction.java
… 1 more file in changeset.

5:41 下午

jason

More
31431
changed 3 files
root:

解决jira问题：XKYY-190 PC端的退货功能增加对外部代理灭菌包的支持

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionAction.java
… 2 more files in changeset.

5:02 下午

jason

More
31422
changed 2 files
root:

解决jira问题：XKYY-211 广州胸科升级前后对比-升级前有"器械材料月盘点记录"模块，升级后没有

- -1
- +15
./com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialCheckAction.java
- History
- Source
- Diff
./com/forgon/.../MaterialCheckAction.java
- -0
- +1
./com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../MaterialCheckManagerImpl.java

11:50 上午

jason

More
31381
changed 1 file
root:

解决jira问题：CSSDDEMO-6 装配第1个包时拍摄了照片，在装配第2个同名的包时，点击拍摄按钮，会看到装配第一个包时拍摄的照片的问题

- -3
- +3
./com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../ImageFileManagerImpl.java

5:08 下午

jason

More
31368
changed 8 files
root:

解决jira问题：CSSDDEMO-6 装配第1个包时拍摄了照片，在装配第2个同名的包时，点击拍摄按钮，会看到装配第一个包时拍摄的照片的问题

- -1
- +2
./com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManager.java
- History
- Source
- Diff
./com/forgon/.../service/ImageFileManager.java
- -4
- +21
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageAndVideoAction.java
- History
- Source
- Diff
./com/.../UploadImageAndVideoAction.java
- -1
- +9
./com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../ImageFileManagerImpl.java
… 5 more files in changeset.

4:47 下午

zc.li

More
31358
changed 5 files
root:

解决：DGSDBZXYY-171新增需求：聚合包只显示大包的包数和材料数，聚合包内部的小包不要显示出来。

- -4
- +4
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionManager.java
- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
… 3 more files in changeset.

3:08 下午

zc.li

More
31356
changed 7 files
root:

解决：DGSDBZXYY-171新增需求：聚合包只显示大包的包数和材料数，聚合包内部的小包不要显示出来。

- -0
- +12
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionManager.java
- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
… 5 more files in changeset.

4:53 下午

jason

More
31352
changed 1 file
root:

解决jira问题：GDSRMYZHYY-35 状态为灭菌中或者已审核的器械包被废弃时，如果已经入筐，要从灭菌篮筐中移除。

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java

1:34 下午

jason

More
31350
changed 1 file
root:

解决jira问题：GDSRMYZHYY-35 状态为灭菌中的器械包被废弃时，如果已经入筐，要从灭菌篮筐中移除。

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java

10:27 上午

jason

More
31349
changed 1 file
root:

解决jira问题：GDSRMYZHYY-35 状态为灭菌中的器械包被废弃时，如果已经入筐，要从灭菌篮筐中移除。

- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java

5:08 下午

shuyongfu

More
31319
changed 2 files
root:

解决:SSTS-372 自定义发货时，一套外来器械所有的拆分小包都已经扫进了发货列表，但是发货时系统还是提示缺少拆分小包，发货不成功

- -1
- +8
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
- History
- Source
- Diff
./com/forgon/.../TousseInstanceManager.java
- too large
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java

java

Line History

Stats

Commits this week: 1

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

zc.li

zc.li

zc.li

zc.li

jason

jason

zc.li

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

zc.li

zc.li

jason

jason

jason

shuyongfu