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 15517 is being indexed.

Friday 28 Oct 2016

11:50 上午

adairkang

More
15517
changed 1 file
V4.1.0

PDA用户权限没有继承父角色的权限的问题（SSTS-73）

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

Thursday 27 Oct 2016

3:27 下午

adairkang

More
15500
changed 1 file
V4.1.0

签收扫描条码或者登录名

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

11:59 上午

wangyi

More
15493
changed 20 files
V4.1.0

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

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

11:05 上午

jeffli

More
15489
changed 13 files
V4.1.0

发货增加申请科室编码,结算科室编码,申请单类型等冗余属性，对旧数据处理

重构代码，所有根据发货单引用申请单的代码做改造

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

10:46 上午

adairkang

More
15487
changed 6 files
V4.1.0

pda自定义发货扫描条码获取发货科室

手术预约发货

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

Tuesday 25 Oct 2016

12:01 下午

adairkang

More
15447
changed 8 files
V4.1.0

PYQZYY-102(pda发货时扫描复核员条码改进)

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

Friday 21 Oct 2016

10:33 上午

adairkang

More
15407
changed 2 files
V4.1.0

pda非常规发货

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

Wednesday 19 Oct 2016

8:46 下午

adairkang

More
15396
changed 7 files
V4.1.0

清洗记录跟灭菌记录pda可以扫描位置信息,根据config.js的配置来决定是否显示位置

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

Tuesday 18 Oct 2016

3:23 下午

jeffli

More
15363
changed 8 files
V4.1.0

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

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

Monday 17 Oct 2016

12:49 下午

shuyongfu

More
15334
changed 27 files
V4.1.0

解决jira问题及相关功能,具体如下:

GDSRMYY-187 同名的外部代理灭菌包发货时A科室的包发到B科室也能扫描出来

GDSRMYY-182 使用住院号调取病人信息时报错

广东省医his与物资回写接口及中大附一手术排班相关功能

./java/com/forgon/disinfectsystem/webservice/operationschedule/zsyy
- History
- Source
./java/com/forgon/.../operationschedule/zsyy
- ?
./java/com/forgon/disinfectsystem/webservice/userecord/service/UseRecordWebServiceImpl.java
- History
- Source
- Diff
./java/com/.../UseRecordWebServiceImpl.java
- ?
./java/com/forgon/disinfectsystem/webservice/operationschedule/zsyy/OperationScheduleWebService.java
- History
- Source
./java/com/.../OperationScheduleWebService.java
- ?
./java/com/forgon/disinfectsystem/webservice/operationschedule/zsyy/OperationScheduleWebServiceImpl.java
- History
- Source
./java/com/.../OperationScheduleWebServiceImpl.java
./java/com/forgon/disinfectsystem/webservice/operationschedule
- History
- Source
./java/com/forgon/.../webservice/operationschedule
… 22 more files in changeset.

10:09 上午

wangyi

More
15324
changed 16 files
V4.1.0

清洗区工作量及不合格率月报功能增强

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

9:13 上午

adairkang

More
15318
changed 2 files
V4.1.0

PYQZYY-99(pda)添加查看历史灭菌记录功能,以方便上传图片

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

Sunday 09 Oct 2016

9:28 上午

adairkang

More
15213
changed 5 files
V4.1.0

器械交接获取条码信息的处理,如果包实例为其他病人使用,给出明确提示信息

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

Thursday 29 Sep 2016

5:49 下午

adairkang

More
15182
changed 1 file
V4.1.0

器械交接，未扫描数量默认为0

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

11:59 上午

adairkang

More
15173
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.

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

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

jeffli

adairkang

adairkang

adairkang

adairkang

jeffli

shuyongfu

wangyi

adairkang

adairkang

adairkang

adairkang

adairkang

adairkang

wangyi

wangyi

adairkang

adairkang

wangyi

jeffli

adairkang

adairkang

adairkang

adairkang

adairkang

jeffli

adairkang