Activity forgon-ssts-v4.1.0/ssts-operationmonitor/src/main/java/com

8:40 下午

zc.li

More
28409
changed 21 files
root:

处理ASSZDFY-75(运作监控点击数量查看详情暂不处理);消毒供应中心运作监控与科室运作监控改进为按包名称汇总显示以及增加查询条件

- -27
- +148
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java
- -0
- +64
./forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../StRoomControlHelper.java
- -0
- +157
./forgon/disinfectsystem/supplyroomcontrol/vo/SupplyQueryParamVo.java
- History
- Source
./forgon/.../SupplyQueryParamVo.java
- -8
- +300
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl2.java
- -0
- +46
./forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../PkRoomControlHelper.java
- -0
- +19
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlHelper.java
- -16
- +38
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
- -7
- +14
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManager.java
- -7
- +94
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager2.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManager2.java
- -0
- +39
./forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RvRoomControlHelper.java
- -24
- +216
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
- -0
- +57
./forgon/disinfectsystem/supplyroomcontrol/vo/SupplyRoomVo.java
- History
- Source
- Diff
./forgon/disinfectsystem/.../SupplyRoomVo.java
- -15
- +47
./forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../IpRoomControlHelper.java
- -36
- +435
./forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlAction.java
… 7 more files in changeset.

2:23 下午

zc.li

More
28340
changed 3 files
root:

修复:ASSZDFY-74 运作监控中发货信息的任务组过滤,会把有符合条件的申请物品的申请单内的所有物品都查询出来的问题;

- -9
- +12
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
- -2
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../IpRoomControlHelper.java
… 1 more file in changeset.

4:25 下午

zc.li

More
28333
changed 10 files
root:

解决:ASSZDFY-74运作监控中查询与导出增加器械包任务组过滤

- -7
- +14
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManager.java
- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../IpRoomControlHelper.java
- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java
- -25
- +46
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../StRoomControlHelper.java
- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../PkRoomControlHelper.java
- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RvRoomControlHelper.java
… 2 more files in changeset.

2:31 下午

zc.li

More
28082
changed 3 files
root:

解决：ZSYKZX-124;运作监控查询异常的问题；

- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../StRoomControlHelper.java
- -4
- +4
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl2.java
- -9
- +10
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java

3:44 下午

zc.li

More
28056
changed 2 files
root:

完善dgzyy-166:运作监控模块增加【物品预约单】发货信息

- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../IpRoomControlHelper.java
- -0
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java

2:47 下午

zc.li

More
27994
changed 4 files
root:

解决：ZSSXLRMYY-151。运作监控导出时增加进度条；修复导出的数据和当前查询的数据不一致；

- -152
- +224
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
- -1
- +25
./forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlAction.java
- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
- -8
- +27
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManager.java

6:07 下午

zc.li

More
27895
changed 3 files
root:

解决:ZSWY-112.运作监控模块的谷歌兼容性问题及改进

- -4
- +4
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl2.java
- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
… 1 more file in changeset.

8:14 下午

zc.li

More
27833
changed 2 files
root:

增强：ZSWY-105 运作监控清洗数量增加一些场景的计算；

- -22
- +91
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java
- -5
- +5
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl2.java

8:29 下午

zc.li

More
27824
changed 3 files
root:

解决：ZSWY-104 - 器械清洗不合格率的统计结果不正确；

ZSWY-105 - 清洗区工作量及不合格率月报的消毒物品数量统计有误；

ZSWY-106 - 清洗区工作量及不合格率月报:消毒物品清洗数量和器械包工作量统计报表不一致

- -3
- +3
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java
… 2 more files in changeset.

9:30 下午

zc.li

More
27801
changed 1 file
root:

解决：ZSYKZX-120。消毒供应中心运作监控和消毒供应中心未完成工作列表里需要增加供应室的选项。

- -2
- +14
./forgon/disinfectsystem/supplyroomcontrol/vo/SupplyRoomVo.java
- History
- Source
- Diff
./forgon/disinfectsystem/.../SupplyRoomVo.java

9:30 下午

zc.li

More
27800
changed 10 files
root:

解决：ZSYKZX-120。消毒供应中心运作监控和消毒供应中心未完成工作列表里需要增加供应室的选项。

- -1
- +14
./forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RvRoomControlHelper.java
- -4
- +14
./forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../IpRoomControlHelper.java
- -69
- +137
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
- -22
- +126
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManager.java
- -3
- +27
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
- -2
- +15
./forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../StRoomControlHelper.java
- -4
- +15
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java
- -9
- +12
./forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlAction.java
- -3
- +14
./forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../PkRoomControlHelper.java
… 1 more file in changeset.

2:47 下午

zc.li

More
27331
changed 55 files
root:

解决：ASSZSLY-21。器械件数增加配置项，决定或者最新包定义的材料总数还是当时的材料总数。

- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl2.java
- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java
- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
… 52 more files in changeset.

3:41 下午

shuyongfu

More
26747
changed 2 files
root:

解决:GGSRMYY-101 消毒供应中心运作监控，发货信息列表将一次性物品和器械包分开显示

- -0
- +75
./forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlAction.java
… 1 more file in changeset.

3:48 下午

zc.li

More
26169
changed 2 files
root:

完善：ASSGGSRMYY-25。修正消毒供应中心运作监控回收数量和清洗数量。

- -3
- +3
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
- -2
- +3
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java

9:59 下午

zc.li

More
26152
changed 4 files
root:

解决：ASSGGSRMYY-25。解决消毒供应中心运作监控查到器械包回收和发货数量跟器械包工作量统计报表不一致的问题。

- -1
- +3
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
- -1
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
- -1
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java
… 1 more file in changeset.

4:04 下午

shuyongfu

More
21821
changed 12 files
root:

去掉未使用import语句、纠正import语法

- -8
- +4
./forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlAction.java
… 11 more files in changeset.

4:23 下午

shuyongfu

More
20600
changed 1 file
root:

解决运作监控的灭菌数量显示不正确的问题

- -3
- +3
./forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../StRoomControlHelper.java

3:16 下午

shuyongfu

More
20299
changed 2 files
root:

运作监控调整、回收申请信息列的时间过滤由原来的申请时间过滤改为按申请时间或回收时间过滤,页面也有个别小调整

- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
… 1 more file in changeset.

9:17 上午

shuyongfu

More
20262
changed 1 file
root:

解决jira问题:HZSRMYY-36 运作监控-灭菌信息数量计算不正确

- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../StRoomControlHelper.java

11:38 上午

shuyongfu

More
19517
changed 5 files
root:

解决jira问题:CDSLQYQYYY-19 运作监控报表，科室过滤后，清洗、装配等环节没生效

- -0
- +4
./forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../PkRoomControlHelper.java
- -0
- +4
./forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../StRoomControlHelper.java
- -0
- +4
./forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RvRoomControlHelper.java
- -0
- +5
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java
… 1 more file in changeset.

10:01 下午

adairkang

More
19054
changed 4 files
root:

CDSWYYY-1 打印发货单（器械包）按包名合并功能，合并不了

- -5
- +17
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
… 3 more files in changeset.

2:07 下午

zhonghaowen

More
18775
changed 3 files
root:

修复消毒供应中心运作监控中的回收申请表单打开申请单报错问题

- -2
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
… 2 more files in changeset.

4:46 下午

shuyongfu

More
18757
changed 1 file
root:

解决oracle数据库运作监控模块按科室条件查询后台报错导致申请回收列表没有数据显示的问题

- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java

5:41 下午

shuyongfu

More
18601
changed 3 files
root:

解决运作监控输入名称回收申请列表查不出数据的问题

- -0
- +3
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl2.java
- -0
- +28
./forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlAction.java
… 1 more file in changeset.

10:20 上午

shuyongfu

More
18584
changed 3 files
root:

解决运作监控输入名称回收申请列表查不出数据的问题

- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
- -0
- +15
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
- -0
- +17
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManager.java

2:15 下午

zhonghaowen

More
18216
changed 1 file
root:

ZSSXLRMYY-131:修复数据显示不正确

- -2
- +4
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java

11:32 上午

zhonghaowen

More
18214
changed 1 file
root:

ZSSXLRMYY-131:修复会出现重复的数据和不正确的加急数量

- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java

2:01 下午

zhonghaowen

More
18201
changed 9 files
root:

1.解决ZSYY-78:消毒供应中心运作监控需要将回收记录和自定义发货数据都可以查到

2.解决ZSSXLRMYY-131:在回收清点页面进行的加急操作，在供应室运作监控页面的回收申请信息的加急数量也要显示。

- -3
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../StRoomControlHelper.java
- -24
- +44
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../PkRoomControlHelper.java
- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java
- -3
- +2
./forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RvRoomControlHelper.java
- -11
- +10
./forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../IpRoomControlHelper.java
- -12
- +12
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl2.java
… 2 more files in changeset.

10:35 下午

wangyi

More
17512
changed 113 files
root:

完成：DGZYY-69，装配可以不补充材料，回收时自动关联包实例未补充材料明细

- -1
- +1
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl.java
… 112 more files in changeset.

3:35 下午

zhonghaowen

More
17472
changed 11 files
root:

消毒供应中心运作监控增加物品类型搜索

- -2
- +11
./forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RaRoomControlHelper.java
- -1
- +35
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManagerImpl2.java
- -0
- +10
./forgon/disinfectsystem/supplyroomcontrol/service/PkRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../PkRoomControlHelper.java
- -1
- +10
./forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../RvRoomControlHelper.java
- -1
- +11
./forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../IpRoomControlHelper.java
- -0
- +9
./forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager2.java
- History
- Source
- Diff
./forgon/.../SupplyRoomControlManager2.java
- -0
- +10
./forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../WdRoomControlHelper.java
- -0
- +12
./forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
- History
- Source
- Diff
./forgon/.../StRoomControlHelper.java
- -0
- +26
./forgon/disinfectsystem/supplyroomcontrol/vo/SupplyRoomVo.java
- History
- Source
- Diff
./forgon/disinfectsystem/.../SupplyRoomVo.java
… 2 more files in changeset.

com

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

shuyongfu

zc.li

zc.li

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

adairkang

zhonghaowen

shuyongfu

shuyongfu

shuyongfu

zhonghaowen

zhonghaowen

zhonghaowen

wangyi

zhonghaowen