Activity forgon-ssts-v4.1/SterileSupplySystem/branches/V4.1.0/ssts-sterile/src

Tree
Accordion

Stats

Commits this week: 1

Total Committers:	16
Last Commit:	24 Feb 16
Commits this week:	1
Total Lines of Code (LoC):	0
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:

Changeset 15591 is being indexed.

Wednesday 02 Nov 2016

3:39 下午

zengjc

More
15591
changed 7 files
V4.1.0

灭菌记录查看图片，添加缩放、旋转、删除功能,解决jira问题PYQZYY-97

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./main/java/.../SterilizationRecordAction.java
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/servlet
- History
- Source
./main/java/com/.../sterilizationrecord/servlet
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/servlet/UploadServlet.java
- History
- Source
./main/java/com/.../servlet/UploadServlet.java
… 4 more files in changeset.

Tuesday 01 Nov 2016

3:07 下午

jeffli

More
15568
changed 2 files
V4.1.0

解决bug：

装配的外部代理灭菌包装配科室名字为空。

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 1 more file in changeset.

Monday 31 Oct 2016

7:38 下午

jeffli

More
15554
changed 1 file
V4.1.0

解决bug：

已发货的外部代理灭菌申请单无法终止

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java

4:46 下午

jeffli

More
15541
changed 8 files
V4.1.0

外部代理灭菌单的终止增加限制条件

广东省人民医院GDSRMYY-196

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ProxyDisinfectionManagerImpl.java
… 7 more files in changeset.

Thursday 27 Oct 2016

5:53 下午

jeffli

More
15506
changed 2 files
V4.1.0

解决bug：

外部代理灭菌标签打印顺序混乱（BUG）

广东省人民医院GDSRMYY-197

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 1 more file in changeset.

11:59 上午

wangyi

More
15493
changed 20 files
V4.1.0

科室供应室配置页面布局调整、增加手术室使用记录转申请单是否发货配置项

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./main/.../SterilizationRecordManagerImpl.java
… 19 more files in changeset.

Tuesday 25 Oct 2016

11:04 上午

wangyi

More
15439
changed 5 files
V4.1.0

修复外部代理灭菌添加多个物品失效期错误bug

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 3 more files in changeset.

Monday 24 Oct 2016

4:56 下午

wangyi

More
15431
changed 1 file
V4.1.0

修复外部代理灭菌修改灭菌日期后失效期不正确bug

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java

10:11 上午

chenjiaru

More
15424
changed 4 files
V4.1.0

改善：GDSRMYY-184 灭菌情况报表，需要把灭菌中的包也统计进报表里面

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./main/.../SterilizationRecordManagerImpl.java
… 3 more files in changeset.

Friday 21 Oct 2016

10:52 上午

chenjiaru

More
15409
changed 5 files
V4.1.0

解决：GDSRMYY-184 灭菌情况报表，需要把灭菌中的包也统计进报表里面

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./main/.../SterilizationRecordManagerImpl.java
… 4 more files in changeset.

Tuesday 18 Oct 2016

3:23 下午

jeffli

More
15363
changed 8 files
V4.1.0

代码重构，去掉core模块的FileUtils类，里面的方法移到tools下的FileUtils

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./main/java/.../SterilizationRecordAction.java
… 7 more files in changeset.

2:25 下午

jeffli

More
15361
changed 3 files
V4.1.0

解决bug：

外部代理灭菌装配并打印标签，灭菌员为undefined

临床申请的外部代理灭菌单在外部代理灭菌那里保存或者装配后，申请人被清掉

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 2 more files in changeset.

Monday 17 Oct 2016

7:11 下午

jeffli

More
15348
changed 4 files
V4.1.0

外部代理灭菌增加修改灭菌日期功能

广东省人民医院GDSRMYY-186

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 2 more files in changeset.

1:22 上午

chenjiaru

More
15317
changed 4 files
V4.1.0

在灭菌记录中增加了两个新的属性"监测员"和"监测核对员"

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
- History
- Source
- Diff
./main/.../SterilizationRecordTableManager.java
… 3 more files in changeset.

Sunday 16 Oct 2016

4:23 下午

chenjiaru

More
15314
changed 12 files
V4.1.0

1、灭菌记录添加一个新属性"生物监测的结束时间"

2、发货记录添加一个新属性"是否常规",默认是常规发货（解释一下：非常规指的是正在做"生物监测"时发货员就就把这个器械包发货了）

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
- History
- Source
- Diff
./main/.../SterilizationRecordTableManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./main/.../SterilizationRecordManagerImpl.java
… 10 more files in changeset.

Thursday 13 Oct 2016

3:58 下午

wangyi

More
15299
changed 17 files
V4.1.0

装配界面增加扫描灭菌人字段

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./main/java/.../SterilizationRecordAction.java
… 16 more files in changeset.

Tuesday 11 Oct 2016

7:05 下午

zhonghaowen

More
15259
changed 3 files
V4.1.0

解决GDSRMYY-183:外部代理灭菌界面增加物品简要列

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionTableManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 1 more file in changeset.

5:08 下午

zengjc

More
15253
changed 8 files
V4.1.0

灭菌记录添加位置，目前只有东莞市中医院配置.

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./main/.../SterilizationRecordManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./main/java/.../SterilizationRecordAction.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./main/.../SterilizationRecordManager.java
… 5 more files in changeset.

4:00 下午

adairkang

More
15249
changed 17 files
V4.1.0

外来器械添加查看器械包说明书功能(GDSRMYY-155)

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./main/java/.../SterilizationRecordAction.java
… 16 more files in changeset.

Saturday 08 Oct 2016

4:47 下午

adairkang

More
15207
changed 6 files
V4.1.0

灭菌完成和灭菌失败,灭菌记录的完成时间如果在开始时间之前,提示并不能提交记录

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./main/.../SterilizationRecordManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./main/.../SterilizationRecordManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./main/java/.../SterilizationRecordAction.java
… 3 more files in changeset.

Friday 30 Sep 2016

6:17 下午

wangyi

More
15198
changed 24 files
V4.1.0

1：器械包定义里面材料显示是否植入物列

2：是否植入物属性从【器械包材料】里面挪到材料定义里面

3：使用记录根据【是否有植入物】属性判断该器械包是否能填写植入物使用数量

4：支持外来器械包定义修改功能

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 23 more files in changeset.

Wednesday 28 Sep 2016

9:53 上午

jeffli

More
15157
changed 4 files
V4.1.0

“灭菌员列”后面显示 “申请部门”列，“数量列”（该单的器械包数量） “是否打印” 列，“状态”列

番禺区中医院PYQZYY-83

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 3 more files in changeset.

Friday 23 Sep 2016

8:54 下午

adairkang

More
15104
changed 4 files
V4.1.0

同步4.0对完成灭菌时，二级供应室入部门库存的速度优化

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./main/.../SterilizationRecordManagerImpl.java
… 3 more files in changeset.

Thursday 22 Sep 2016

10:34 上午

shuyongfu

More
15061
changed 1 file
V4.1.0

外部代理灭菌单删除后,创建时所生成的包实例由原来的删除改为更新包实例的状态及废弃的处理

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java

Tuesday 20 Sep 2016

4:38 下午

adairkang

More
15035
changed 28 files
V4.1.0

代码重构,统一一次性物品和器械包的浮动价格的计算

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ProxyDisinfectionManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 26 more files in changeset.

Monday 19 Sep 2016

4:59 下午

shuyongfu

More
15026
changed 2 files
V4.1.0

解决省医jira问题:

GDSRMYY-149 灭菌装载界面中使用篮筐状态为"灭菌"能继续装载器械包(BUG)

GDSRMYY-150 灭菌装载界面增加刷新按钮

GDSRMYY-152 灭菌装载使用的灭菌篮筐筐内如果有器械包未发货,弹出提示框(改进)

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
- History
- Source
- Diff
./main/.../SterileLoadingTableManager.java
… 1 more file in changeset.

Sunday 18 Sep 2016

4:40 下午

adairkang

More
15003
changed 9 files
V4.1.0

代理灭菌单干预管理

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
- History
- Source
- Diff
./main/java/.../ProxyDisinfectionAction.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManager.java
- History
- Source
./main/java/.../ProxyDisinfectionManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ProxyDisinfectionManagerImpl.java
… 6 more files in changeset.

12:08 上午

adairkang

More
14996
changed 3 files
V4.1.0

申请单发货状态判断代码重构

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ProxyDisinfectionManagerImpl.java
… 2 more files in changeset.

Monday 12 Sep 2016

11:26 上午

adairkang

More
14935
changed 5 files
V4.1.0

灭菌完成代码改造

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./main/.../SterilizationRecordManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./main/.../SterilizationRecordManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./main/java/.../SterilizationRecordAction.java
… 2 more files in changeset.

Saturday 10 Sep 2016

9:56 上午

adairkang

More
14913
changed 19 files
V4.1.0

质量监测灭菌失败时，添加整炉回收和整炉重装

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./main/.../SterilizationRecordManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./main/.../SterilizationRecordManager.java
… 17 more files in changeset.

src

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)

zengjc

jeffli

jeffli

jeffli

jeffli

wangyi

wangyi

wangyi

chenjiaru

chenjiaru

jeffli

jeffli

jeffli

chenjiaru

chenjiaru

wangyi

zhonghaowen

zengjc

adairkang

adairkang

wangyi

jeffli

adairkang

shuyongfu

adairkang

shuyongfu

adairkang

adairkang

adairkang

adairkang