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

Tree
Accordion

Stats

Commits this week: 4

Total Committers:	17
Last Commit:	14 Feb 16
Commits this week:	4
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 25631 is being indexed.

Wednesday 13 Feb 2019

4:25 下午

zc.li

More
25631
changed 3 files
V4.1.0

解决：SZSZLYY-11。在config.js中提供参数listDisplayOfItemsToBeSterilized进行配置待灭菌物品列表显示方式：默认值1：按今天审核的待灭菌物品显示；值2：按今天待灭菌的物品显示

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java
… 2 more files in changeset.

Monday 11 Feb 2019

1:30 下午

terrykwan

More
25611
changed 20 files
V4.1.0

重构代码，解决了invoicePlanManager、recyclingApplicationManager、imageFileManager等几个spring bean循环依赖的问题

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java
- ?
./com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../ImageFileManagerImpl.java
… 18 more files in changeset.

Thursday 31 Jan 2019

10:36 上午

terrykwan

More
25588
changed 1 file
V4.1.0

返回签收异常的器械包信息到客户端。GZZYYFY-26

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java

Monday 28 Jan 2019

7:40 下午

zc.li

More
25548
changed 1 file
V4.1.0

解决删除视频时，如果在TousseDefinition表的uuid_vedioNames字段中没有找到删除的视频，就会把uuid_vedioNames变成null的问题。

- ?
./com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java
- History
- Source
- Diff
./com/forgon/.../action/VideoFileAction.java

6:22 下午

zc.li

More
25547
changed 5 files
V4.1.0

优化：SZSSKRMYY-20。器械包管理下的器械包包定义管理和聚合包定义管理的配包教学视频新增修改视频名称功能（点击视频名称可编辑修改）。

- ?
./com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java
- History
- Source
- Diff
./com/forgon/.../action/VideoFileAction.java
- ?
./com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../VideoFileManagerImpl.java
- ?
./com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManager.java
- History
- Source
- Diff
./com/forgon/.../service/VideoFileManager.java
… 2 more files in changeset.

Saturday 26 Jan 2019

7:05 下午

zc.li

More
25533
changed 18 files
V4.1.0

解决问题：SZSSKRMYY-20。升级视频功能；1：支持上传多个视频；2：新增或增强视频的上传，排序，删除，播放功能。优化器械包定义，聚合包定义界面。3：视频存储地址改为申领科室配置地址下的packingTeacherVideo文件夹下。

./com/forgon/disinfectsystem/tousse/videomanager/dwr
- History
- Source
./com/forgon/disinfectsystem/.../videomanager/dwr
./com/forgon/disinfectsystem/tousse/videomanager/dwr/table
- History
- Source
./com/forgon/disinfectsystem/.../dwr/table
- ?
./com/forgon/disinfectsystem/tousse/videomanager/dwr/table/VideoFileTableManager.java
- History
- Source
./com/forgon/.../table/VideoFileTableManager.java
- ?
./com/forgon/disinfectsystem/tousse/videomanager/action/VideoFileAction.java
- History
- Source
- Diff
./com/forgon/.../action/VideoFileAction.java
- ?
./com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManagerImpl.java
- History
- Source
./com/forgon/.../service/VideoFileManagerImpl.java
- ?
./com/forgon/disinfectsystem/tousse/videomanager/service/VideoFileManager.java
- History
- Source
- Diff
./com/forgon/.../service/VideoFileManager.java
… 12 more files in changeset.

Tuesday 22 Jan 2019

10:16 下午

terrykwan

More
25482
changed 3 files
V4.1.0

提供拼音码给前台，做过滤检索。GZYKDXFSKQ-30

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
- ?
./com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../TousseItemManagerImpl.java
… 1 more file in changeset.

2:33 下午

jeffli

More
25474
changed 1 file
V4.1.0

广州医科大学附属口腔医院GZYKDXFSKQ-35

消毒物品包定义限制发货bug

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java

Wednesday 16 Jan 2019

9:24 上午

jeffli

More
25409
changed 4 files
V4.1.0

深圳市肿瘤医院SZSZLYY-7

只清点申请单的专科器械包，通用器械包的申请数量只作为发货依据

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
… 3 more files in changeset.

Monday 14 Jan 2019

2:32 下午

yanweining

More
25401
changed 3 files
V4.1.0

SZSZLYY-7：只清点申请单的专科器械包，通用器械包的申请数量只作为发货依据

器械包定义新增字段：

不生成包实例（默认为是）

隐藏回收项（默认为否）

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
… 2 more files in changeset.

Thursday 10 Jan 2019

5:16 下午

shuyongfu

More
25382
changed 4 files
V4.1.0

解决Jira问题:ASSDGSZYY-33 器械包信息，不能导出

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java
- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionAction.java
… 2 more files in changeset.

Thursday 03 Jan 2019

9:52 上午

jeffli

More
25303
changed 3 files
V4.1.0

深圳市肿瘤医院SZSZLYY-5

器械包定义新增属性：发货依据【申请数量】【回收数量】

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
… 2 more files in changeset.

Wednesday 26 Dec 2018

6:08 下午

shuyongfu

More
25246
changed 45 files
V4.1.0

中山眼科hrp接口合同(及集成平台、科研系统等对接的部分)相关的内容提交

- ?
./com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../MaterialEntryManagerImpl.java
… 44 more files in changeset.

Tuesday 25 Dec 2018

2:51 下午

jeffli

More
25230
changed 1 file
V4.1.0

解决bug：

包定义修改隐藏装配任务保存不生效

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java

8:59 上午

jeffli

More
25226
changed 4 files
V4.1.0

售后-东莞市中医院ASSDGSZYY-26

辅助发货时未查出数据

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java
- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
- History
- Source
- Diff
./com/forgon/.../TousseInstanceManager.java
… 2 more files in changeset.

Saturday 22 Dec 2018

6:09 下午

shuyongfu

More
25209
changed 2 files
V4.1.0

包定义为不审核的包,生成包实例时审核时间及审核人也为装配时的信息

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java
… 1 more file in changeset.

6:01 下午

shuyongfu

More
25208
changed 1 file
V4.1.0

包定义为不包装、不审核的包,生成包实例的审核时间也为装配时间

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java

Monday 17 Dec 2018

1:56 下午

jeffli

More
25152
changed 5 files
V4.1.0

聚合包过滤（数量为0的不显示）

聚合包里面的器械包过滤（数量为0的不显示）

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionManager.java
… 3 more files in changeset.

Wednesday 05 Dec 2018

5:23 下午

jeffli

More
25091
changed 14 files
V4.1.0

优化一次性物品库存修改

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java
… 13 more files in changeset.

Monday 03 Dec 2018

5:22 下午

simon.bai

More
25068
changed 1 file
V4.1.0

ssts-rebuild : 科室申领更新

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/controller/TousseDefinitionController.java
- History
- Source
- Diff
./com/.../TousseDefinitionController.java

5:10 下午

simon.bai

More
25067
changed 1 file
V4.1.0

ssts-rebuild : 科室申领更新

- ?
./com/forgon/disinfectsystem/tousse/materialdefinition/controller/MaterialDefinitionController.java
- History
- Source
- Diff
./com/.../MaterialDefinitionController.java

1:46 下午

jeffli

More
25056
changed 1 file
V4.1.0

新接口优化

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/controller/TousseDefinitionController.java
- History
- Source
- Diff
./com/.../TousseDefinitionController.java

Thursday 29 Nov 2018

3:48 下午

jeffli

More
25036
changed 5 files
V4.1.0

广州医科大学附属口腔医院GZYKDXFSKQ-21

聚合包功能优化

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionManager.java
- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
- History
- Source
- Diff
./com/forgon/.../TousseDefinitionAction.java
- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java
… 2 more files in changeset.

Tuesday 20 Nov 2018

7:25 下午

shuyongfu

More
24946
changed 1 file
V4.1.0

器械包定义修改日志记录调整

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./com/.../TousseDefinitionManagerImpl.java

Monday 19 Nov 2018

2:04 下午

simon.bai

More
24926
changed 3 files
V4.1.0

ssts-rebuild : 科室申领接口

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/dto/ForeignTousseDefinitionDto.java
- History
- Source
./com/forgon/.../ForeignTousseDefinitionDto.java
./com/forgon/disinfectsystem/tousse/toussedefinition/dto
- History
- Source
./com/forgon/.../toussedefinition/dto
- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/controller/TousseDefinitionController.java
- History
- Source
- Diff
./com/.../TousseDefinitionController.java

Tuesday 06 Nov 2018

2:33 下午

shuyongfu

More
24788
changed 1 file
V4.1.0

解决灭菌装载入筐提示灭菌方式不一致的问题(已入筐的器械包与将要入筐的器械包灭菌方式都是空格导致入不了)

- ?
./com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./com/.../TousseInstanceManagerImpl.java

11:35 上午

shuyongfu

More
24786
changed 9 files
V4.1.0

解决Jira问题:GYEY-711 申请外来器械，装配管理添加图片采集功能

增加外来器械申请单的采集图片功能(拍照与查看)

- ?
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
- History
- Source
- Diff
./com/forgon/.../UploadImageFileAction.java
- ?
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
- History
- Source
- Diff
./com/forgon/.../action/ShowImageAction.java
… 7 more files in changeset.

Monday 05 Nov 2018

7:07 下午

shuyongfu

More
24783
changed 1 file
V4.1.0

解决Jira问题:GYEY-711 申请外来器械，装配管理添加图片采集功能

增加外来器械申请单的采集图片功能(拍照与查看)

- ?
./com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../ImageFileManagerImpl.java

6:27 下午

jeffli

More
24781
changed 1 file
V4.1.0

广医二院消毒供应项目GYEY-711

申请外来器械，装配管理添加图片采集功能

- ?
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
- History
- Source
- Diff
./com/forgon/.../UploadImageFileAction.java

5:55 下午

jeffli

More
24779
changed 3 files
V4.1.0

广医二院消毒供应项目GYEY-711

申请外来器械，装配管理添加图片采集功能

- ?
./com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
- History
- Source
- Diff
./com/forgon/.../UploadImageFileAction.java
… 2 more files in changeset.

java

Line History

Stats

Commits this week: 4

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

zc.li

terrykwan

terrykwan

zc.li

zc.li

zc.li

terrykwan

jeffli

jeffli

yanweining

shuyongfu

jeffli

shuyongfu

jeffli

jeffli

shuyongfu

shuyongfu

jeffli

jeffli

simon.bai

simon.bai

jeffli

jeffli

shuyongfu

simon.bai

shuyongfu

shuyongfu

shuyongfu

jeffli

jeffli