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

Tree
Accordion

Stats

Commits this week: 2

Total Committers:	15
Last Commit:	14 Feb 16
Commits this week:	2
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 15035 is being indexed.

Tuesday 20 Sep 2016

4:38 下午

adairkang

More
15035
changed 28 files
V4.1.0

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

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 27 more files in changeset.

Friday 09 Sep 2016

8:18 下午

adairkang

More
14910
changed 18 files
V4.1.0

包定义类型判断的代码重构

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 17 more files in changeset.

Wednesday 07 Sep 2016

2:13 下午

wangyi

More
14830
changed 12 files
V4.1.0

清洗触摸屏增加时间重叠验证；清洗机内是否提供扫描的清洗程序验证

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 11 more files in changeset.

Monday 05 Sep 2016

12:08 上午

wangyi

More
14770
changed 12 files
V4.1.0

增加清洗触摸屏功能，地址http://localhost/logon.jsp?logonType=washform

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 11 more files in changeset.

Monday 22 Aug 2016

3:30 下午

adairkang

More
14604
changed 21 files
V4.1.0

浮点数的乘法，需要设置精度，不然存数据库会报错

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 20 more files in changeset.

Sunday 21 Aug 2016

8:46 上午

adairkang

More
14587
changed 1 file
V4.1.0

DGDHYY-36(pda清洗时间固定为一个小时)

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

Thursday 18 Aug 2016

6:55 下午

wangyi

More
14574
changed 8 files
V4.1.0

回收保存慢优化

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 7 more files in changeset.

Tuesday 16 Aug 2016

9:34 上午

jeffli

More
14547
changed 5 files
V4.1.0

解决bug：

发货固定条码包时，包实例数量可能会小于发货数量。

优化获取固定条码实例的方法

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 4 more files in changeset.

Tuesday 26 Jul 2016

7:57 下午

adairkang

More
14297
changed 31 files
V4.1.0

灭菌装载中，扫描固定条码，器械包入筐的数量为配置的单次扫描的数量.同一个固定条码的不同包可以入不同的灭菌筐(PYQZYY-48)

将扫描条码相应的代码移动到各模块对应的子项目中处理，可以调用对应模块的处理代码，同时简化逻辑处理

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 30 more files in changeset.

Thursday 14 Jul 2016

6:58 下午

adairkang

More
14169
changed 16 files
V4.1.0

手工入库，手工退库、同步入库、同步退库、导入入库及调拨单给新字段赋值

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 15 more files in changeset.

Wednesday 13 Jul 2016

3:55 下午

adairkang

More
14139
changed 1 file
V4.1.0

不追溯的固定条码，可以分篮筐装载

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

Monday 11 Jul 2016

5:20 下午

adairkang

More
14118
changed 1 file
V4.1.0

灭菌装载时，添加的器械包必须是已审核的状态，避免查出很多状态不对的包，之后又对这些状态不对的包进行状态判断，延长了服务器的处理时间

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

Thursday 30 Jun 2016

1:09 下午

adairkang

More
13976
changed 1 file
V4.1.0

发货界面添加下送责任人

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

Friday 24 Jun 2016

3:05 下午

jeffli

More
13906
changed 7 files
V4.1.0

解决bug：

一次性物品某个批次的物品失效了，扫了没失效的批次，提示已经失效的那个批次快到失效期了，请优先发货。

中山五院ZSWY-31

- ?
./java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../WebServiceManagerImpl.java
… 6 more files in changeset.

Monday 13 Jun 2016

12:57 下午

adairkang

More
13756
changed 1 file
V4.1.0

代理灭菌单添加处理科室

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

Monday 06 Jun 2016

11:35 下午

shuyongfu

More
13710
changed 50 files
V4.1.0

4.0代码同步至4.1

./java/com/forgon/disinfectsystem/webservice/userecord
- History
- Source
./java/com/forgon/.../webservice/userecord
./java/com/forgon/disinfectsystem/webservice/userecord/service
- History
- Source
./java/com/forgon/.../webservice/userecord/service
- ?
./java/com/forgon/disinfectsystem/webservice/userecord/service/UseRecordWebServiceImpl.java
- History
- Source
./java/com/.../service/UseRecordWebServiceImpl.java
… 47 more files in changeset.

3:58 下午

adairkang

More
13694
changed 9 files
V4.1.0

灭菌程序添加能否添加器械包进行灭菌（pc、pda、基础数据导入都有修改)（GDSRMYY-20）

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 8 more files in changeset.

Sunday 05 Jun 2016

3:05 下午

wangyi

More
13683
changed 27 files
V4.1.0

申请单代码重构

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 26 more files in changeset.

Thursday 02 Jun 2016

3:48 下午

jeffli

More
13656
changed 9 files
V4.1.0

发货界面新增误差数量显示

重构发货扫描页面代码

重构发货扫描后台代码

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 8 more files in changeset.

Monday 30 May 2016

5:26 下午

adairkang

More
13618
changed 1 file
V4.1.0

pda已装配的器械包不能添加灭菌记录

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

Friday 27 May 2016

1:34 下午

adairkang

More
13592
changed 1 file
V4.1.0

灭菌记录失败后可以重新灭菌

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

Thursday 26 May 2016

5:58 下午

adairkang

More
13590
changed 5 files
V4.1.0

pda灭菌中的灭菌记录可以删除

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 4 more files in changeset.

Wednesday 25 May 2016

2:54 下午

adairkang

More
13568
changed 2 files
V4.1.0

pda已签收的物品可以退货(ZSYKZX-18)

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 1 more file in changeset.

Tuesday 24 May 2016

5:20 下午

adairkang

More
13557
changed 6 files
V4.1.0

同步4.0中灭菌记录只加载灭菌失败的器械包，没有加载新添加的器械包问题(ZSYKZX-12)

灭菌完成灭菌失败上传图片的功能，添加开关配置（ZSSZYY-7）

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 5 more files in changeset.

Monday 23 May 2016

4:23 下午

adairkang

More
13541
changed 1 file
V4.1.0

使用记录扫描高值耗材和一次性物品时，提示不支持

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

Thursday 12 May 2016

11:41 上午

jeffli

More
13424
changed 32 files
V4.1.0

解决bug：

4.1代码在oracle数据库上启动报错

- ?
./java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../WebServiceManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 30 more files in changeset.

Wednesday 11 May 2016

11:15 上午

adairkang

More
13406
changed 1 file
V4.1.0

灭菌程序的灭菌目的为空的处理

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

11:12 上午

adairkang

More
13405
changed 1 file
V4.1.0

灭菌程序的灭菌目的为空的处理

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

Tuesday 10 May 2016

2:53 下午

adairkang

More
13393
changed 1 file
V4.1.0

pda从服务器加载灭菌目的

加载灭菌程序的同时，加载灭菌程序的默认灭菌目的

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java

Tuesday 03 May 2016

10:29 上午

wangyi

More
13300
changed 52 files
V4.1.0

回收改造，去掉篮筐分组功能，增加按材料分类类型入筐功能

- ?
./java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
- History
- Source
- Diff
./java/com/.../service/ServiceManagerImpl.java
… 51 more files in changeset.

main

Line History

Stats

Commits this week: 2

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

adairkang

adairkang

wangyi

wangyi

adairkang

adairkang

wangyi

jeffli

adairkang

adairkang

adairkang

adairkang

adairkang

jeffli

adairkang

shuyongfu

adairkang

wangyi

jeffli

adairkang

adairkang

adairkang

adairkang

adairkang

adairkang

jeffli

adairkang

adairkang

adairkang

wangyi