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

Tree
Accordion

Stats

Commits this week: 0

Total Committers:	18
Last Commit:	14 Feb 16
Commits this week:	0
Total Lines of Code (LoC):	99,026
Net change in LoC this week:	0

Commit Activity

last updated a few seconds ago

Constraints

Constraints: committers

Committer:

Log Comment:

Constraints: files

File Extension:

File Name:

Constraints: dates

Start Date:

End Date:

Friday 07 Apr 2017

6:23 下午

chenjiaru

More
17665
changed 2 files
root:

初始化基础数据

- -0
- +8
./test/forgon/constant/Constants.java
- History
- Source
- Diff
./test/forgon/constant/Constants.java
- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

5:44 下午

zengjc

More
17663
changed 1 file
root:

测试数据初始化供应商.

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

4:38 下午

chenjiaru

More
17659
changed 1 file
root:

初始化基础数据

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

4:28 下午

chenjiaru

More
17657
changed 1 file
root:

初始化基础数据

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

4:09 下午

chenjiaru

More
17656
changed 1 file
root:

初始化基础数据

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

3:41 下午

chenjiaru

More
17655
changed 1 file
root:

初始四个标识牌实例

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

2:55 下午

chenjiaru

More
17654
changed 1 file
root:

初始化：一个绑定了标识牌的器械包，和其他的包的处理科室和包装类型

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

12:33 下午

chenjiaru

More
17652
changed 1 file
root:

给“申领员”角色加上使用记录的一些操作权限

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

12:07 下午

zengjc

More
17651
changed 1 file
root:

测试基础数据，包装类型‘纸塑包装’改为'纸塑'，包装类型和物品失效期的包装类型统一.

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

12:05 下午

zengjc

More
17650
changed 1 file
root:

测试基础数据，灭菌炉添加灭菌程序，清洗机添加清洗程序，物品失效期的任务组跟配置的任务组统一.

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

11:21 上午

chenjiaru

More
17649
changed 1 file
root:

初始化“系统管理员”角色

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

10:23 上午

shuyongfu

More
17645
changed 2 files
root:

解决jira问题:

ZSYY-38 使用记录转申请单改成按手术间号合并

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java
… 1 more file in changeset.

10:05 上午

zengjc

More
17640
changed 1 file
root:

修改测试初始化数据清洗程序、清洗机、灭菌程序、灭菌炉的条码为固定的.

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

10:01 上午

chenjiaru

More
17639
changed 1 file
root:

格式化注释代码

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

9:40 上午

chenjiaru

More
17638
changed 5 files
root:

初始化人员、科室、角色、权限等基础数据供测试用例使用

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java
- -2
- +13
./com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../SysUserManagerImpl.java
… 3 more files in changeset.

Thursday 06 Apr 2017

6:53 下午

zengjc

More
17637
changed 1 file
root:

1.添加测试的灭菌炉分组数据、测试的灭菌目的数据。

2.测试的灭菌炉数据设置分组属性。

3.测试的清洗机设置测试手术室和测试供应室都有。

4.容器的所属科室改为测试供应室.

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

6:14 下午

zengjc

More
17635
changed 1 file
root:

测试基础数据，给容器赋科室,用测试供应室.

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

6:08 下午

zengjc

More
17634
changed 1 file
root:

添加初始化测试数据材料类型、任务组、包装类型、清洗程序、清洗机、灭菌程序.

- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
- Diff
./test/forgon/.../AbstractCSSDTest.java

Wednesday 05 Apr 2017

10:10 下午

terrykwan

More
17629
changed 6 files
root:

移动AbstractCSSDTest类到src/main/java包，解决seleniumTest项目引用不到该父类的问题

./test/forgon/constant
- History
- Source
./test/forgon/constant
- too large
./test/forgon/disinfectsystem/AbstractCSSDTest.java
- History
- Source
./test/forgon/.../AbstractCSSDTest.java
- -0
- +53
./test/forgon/constant/Constants.java
- History
- Source
./test/forgon/constant/Constants.java
… 3 more files in changeset.

9:40 下午

terrykwan

More
17628
changed 4 files
root:

解决测试用例中的组织机构根节点处理不正确的问题

- -8
- +21
./com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
- History
- Source
- Diff
./com/.../InitializeDataManagerImpl.java
… 3 more files in changeset.

Wednesday 29 Mar 2017

3:18 下午

chenjiaru

More
17533
changed 5 files
root:

解决：GDSRMYY-297 权限继承系统管理员用户使用该权限无法灭菌完成及扫描灭菌员

- -1
- +0
./com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../SysUserManagerImpl.java
… 4 more files in changeset.

Monday 27 Mar 2017

10:35 下午

wangyi

More
17512
changed 113 files
root:

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

- -1
- +1
./com/forgon/disinfectsystem/web/service/HomePageModelManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../HomePageModelManagerImpl.java
- -6
- +5
./com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../RecallRecordManagerImpl.java
… 111 more files in changeset.

Monday 20 Mar 2017

4:27 下午

zhonghaowen

More
17439
changed 4 files
root:

修改借物单的数量增加代发货校验，如果该借物单是代发货的，不允许修改借物单数量

- -3
- +2
./com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
- History
- Source
- Diff
./com/forgon/.../BorrowRecordAction.java
- -8
- +9
./com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../BorrowRecordManagerImpl.java
… 2 more files in changeset.

10:40 上午

zhonghaowen

More
17434
changed 2 files
root:

修改借物单审核失败的提示

- -2
- +2
./com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
- History
- Source
- Diff
./com/forgon/.../BorrowRecordAction.java
- -1
- +1
./com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../BorrowRecordManagerImpl.java

Sunday 19 Mar 2017

3:26 下午

shuyongfu

More
17431
changed 9 files
root:

1.修复二级供应室测试用例

2.使用记录转申请单的状态计算调整到设置申请项之后

3.包实例的是否为已发货方法与是否发过货方法重新调整

- -1
- +1
./com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../RecallRecordManagerImpl.java
… 8 more files in changeset.

1:00 上午

shuyongfu

More
17430
changed 1 file
root:

解决jira问题:GDSRMYY-253 召回功能BUG

符合召回搜索条件,状态为已使用、已废弃等的器械包只被搜索出来,保存时只对已发货和已灭菌、已签收的包状态改为待召回

- -1
- +1
./com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../RecallRecordManagerImpl.java

Thursday 16 Mar 2017

11:06 上午

shuyongfu

More
17398
changed 1 file
root:

解决jira问题:GDSRMYY-253 召回功能BUG

符合召回搜索条件,状态为已使用、已废弃等的器械包只被搜索出来,保存时只对已发货和已灭菌、已签收的包状态改为待召回

- -3
- +6
./com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../RecallRecordManagerImpl.java

Wednesday 08 Mar 2017

11:31 上午

chenjiaru

More
17279
changed 3 files
root:

加强器械包告警导出Excel表格的功能，（现：支持只导出用户选择的记录）

- -39
- +53
./com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java
- History
- Source
- Diff
./com/forgon/.../SystemWarningAction.java
… 2 more files in changeset.

Tuesday 07 Mar 2017

11:36 上午

wangyi

More
17253
changed 7 files
root:

完成：GDSRMYY-278，盘点一次性物品增加顺序号列

- -0
- +1
./com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java
- History
- Source
- Diff
./com/forgon/.../InventoryRecordAction.java
- -6
- +12
./com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
- History
- Source
- Diff
./com/.../InventoryRecordManagerImpl.java
… 5 more files in changeset.

Monday 06 Mar 2017

10:37 上午

shuyongfu

More
17241
changed 7 files
root:

解决jira问题:

GDSRMYY-273 组织机构中删除科室后科室申领配置与结算科室配置没有被同步删除

同时优化改进了组织机构的功能,删除增加确认提示,增加拼音码和五笔码的搜索,循环逐条数据处理改成批量处理提升性能，科室干预功能扩充

- -8
- +12
./com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java
- History
- Source
- Diff
./com/forgon/.../OrgUnitTableManager.java
… 6 more files in changeset.

java

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)

chenjiaru

zengjc

chenjiaru

chenjiaru

chenjiaru

chenjiaru

chenjiaru

chenjiaru

zengjc

zengjc

chenjiaru

shuyongfu

zengjc

chenjiaru

chenjiaru

zengjc

zengjc

zengjc

terrykwan

terrykwan

chenjiaru

wangyi

zhonghaowen

zhonghaowen

shuyongfu

shuyongfu

shuyongfu

chenjiaru

wangyi

shuyongfu