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

Tree
Accordion

Stats

Commits this week: 1

Total Committers:	15
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 25687 is being indexed.

Saturday 16 Feb 2019

6:23 下午

zc.li

More
25687
changed 1 file
V4.1.0

修改审核时，会自动修改预定灭菌时间的问题。改为needToModifySterileDate为true时，才会修改预定的灭菌时间。

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

5:46 下午

terrykwan

More
25685
changed 1 file
V4.1.0

解决拆包装配外来器械时，重量字段报错的问题

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

Friday 15 Feb 2019

10:04 上午

zc.li

More
25666
changed 2 files
V4.1.0

程序健壮性增强。对字段weight的值由String转Double时,添加验证，NaN或报错就使用Null.

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

Thursday 14 Feb 2019

8:27 下午

zc.li

More
25661
changed 5 files
V4.1.0

修改数据库TousseInstance表的字段weight类型由varchar变为float；TousseInstance类weight属性类型由String变为Double.

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

Tuesday 29 Jan 2019

5:49 下午

zc.li

More
25574
changed 4 files
V4.1.0

优化培训管理。使用供应室配置的路径存放培训文件。视频放在供应室配置的路径下的trainingVideo\VIDEOVIDEO下，其他在trainingVideo\OTHER下。优化播放方式，不再需要Tomcat填映射路径，直接播放本地视频，图片。

- ?
./com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java
… 3 more files in changeset.

3:23 下午

terrykwan

More
25569
changed 1 file
V4.1.0

自定义装配功能，返回给前端的标签对象信息，增加2个属性：标识牌编号和标识牌描述。XJJQZYY-33

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

2:07 下午

terrykwan

More
25568
changed 2 files
V4.1.0

返回给前端的标签对象信息，增加2个属性：标识牌编号和标识牌描述。XJJQZYY-33

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
… 1 more file 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/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java
… 17 more files in changeset.

Friday 18 Jan 2019

10:45 上午

yanweining

More
25427
changed 2 files
V4.1.0

ASSZDWY-31：

WaitPackingTaskItemVo新增返回属性：器械包定义大小

- ?
./com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
- History
- Source
- Diff
./com/forgon/.../vo/WaitPackingTaskItemVo.java
- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

Thursday 03 Jan 2019

11:50 下午

zc.li

More
25311
changed 1 file
V4.1.0

解决IP绑定科室后，换IP登录后，科室切换了，但科室所属的任务组没有切换的问题。番禺区中医院项目售后问题编号：ASSPYQZYY-16

- ?
./com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
- History
- Source
- Diff
./com/forgon/.../PackingTableManager.java

9:52 上午

jeffli

More
25304
changed 2 files
V4.1.0

深圳市肿瘤医院SZSZLYY-5

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

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

Monday 31 Dec 2018

3:08 下午

shuyongfu

More
25288
changed 3 files
V4.1.0

解决Jira问题:XJJQZYY-34 即将过期的预警提示按照日期判断，不要精确到具体的灭菌时间

灭菌完成后对预警时间重新进行了计算

- ?
./com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
- History
- Source
- Diff
./com/.../TousseInstanceTableManager.java
… 2 more files in changeset.

Sunday 23 Dec 2018

2:21 下午

jeffli

More
25212
changed 1 file
V4.1.0

增加返回json属性：一次性物品是否打印保外标签

- ?
./com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
- History
- Source
- Diff
./com/forgon/.../PackingTableManager.java

Saturday 22 Dec 2018

6:09 下午

shuyongfu

More
25209
changed 2 files
V4.1.0

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

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

Wednesday 19 Dec 2018

1:48 下午

jeffli

More
25173
changed 1 file
V4.1.0

解决装配报错问题

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

Tuesday 18 Dec 2018

1:49 下午

jeffli

More
25162
changed 4 files
V4.1.0

新疆军区总医院XJJQZYY-11

外来器械收费改进

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
- ?
./com/forgon/disinfectsystem/packing/vo/ForeignTousseSplitVo.java
- History
- Source
- Diff
./com/forgon/.../vo/ForeignTousseSplitVo.java
… 2 more files in changeset.

Monday 17 Dec 2018

1:56 下午

jeffli

More
25152
changed 5 files
V4.1.0

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

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

- ?
./com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java
- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
- ?
./com/forgon/disinfectsystem/packing/service/PackingManager.java
- History
- Source
- Diff
./com/forgon/.../service/PackingManager.java
… 2 more files in changeset.

Wednesday 12 Dec 2018

3:54 下午

yanweining

More
25135
changed 21 files
V4.1.0

GZYKDXFSKQ-26：审核打包：待审核列表增加科室和科室分组过滤

- ?
./com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
- History
- Source
- Diff
./com/.../TousseInstanceTableManager.java
… 20 more files in changeset.

Thursday 29 Nov 2018

3:48 下午

jeffli

More
25036
changed 5 files
V4.1.0

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

聚合包功能优化

- ?
./com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java
- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
… 3 more files in changeset.

Wednesday 21 Nov 2018

4:03 下午

shuyongfu

More
24955
changed 1 file
V4.1.0

解决聚合包审核时提示灭菌方式不一致的问题

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java

Friday 09 Nov 2018

2:55 下午

jeffli

More
24833
changed 4 files
V4.1.0

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

器械包定义里面限制发货科室功能改进

- ?
./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../PackingManagerImpl.java
… 3 more files in changeset.

11:27 上午

shuyongfu

More
24827
changed 5 files
V4.1.0

解决Jira问题:GYEY-712 装配管理界面添加图片采集功能

- ?
./com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java
… 4 more files in changeset.

Thursday 08 Nov 2018

2:28 下午

shuyongfu

More
24817
changed 9 files
V4.1.0

解决Jira问题:GYEY-712 装配管理界面添加图片采集功能

器械包信息的申请与装配可以查看拍照的图片、器械包信息导出限制最大不超过65535条

- ?
./com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java
… 8 more files in changeset.

Tuesday 06 Nov 2018

4:58 下午

shuyongfu

More
24791
changed 5 files
V4.1.0

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

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

外来器械申请单的图片关联到新生成的外来器械包定义,装配也能查看申请时拍照图片

- ?
./com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java
… 4 more files in changeset.

11:35 上午

shuyongfu

More
24786
changed 9 files
V4.1.0

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

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

- ?
./com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java
… 8 more files in changeset.

10:18 上午

jeffli

More
24784
changed 2 files
V4.1.0

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

标签模板内置属性增加装配时间、审核时间字段

- ?
./com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
- History
- Source
- Diff
./com/forgon/.../PackingTableManager.java
… 1 more file in changeset.

Monday 05 Nov 2018

5:55 下午

jeffli

More
24779
changed 3 files
V4.1.0

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

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

- ?
./com/forgon/disinfectsystem/packing/action/PackingAction.java
- History
- Source
- Diff
./com/forgon/.../action/PackingAction.java
- ?
./com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
- History
- Source
- Diff
./com/forgon/.../PackingTableManager.java
… 1 more file in changeset.

Friday 26 Oct 2018

5:56 下午

yanweining

More
24711
changed 6 files
V4.1.0

bootstrap：审核页面重构修改

- ?
./com/forgon/disinfectsystem/packing/controller/PackingReviewController.java
- History
- Source
- Diff
./com/forgon/.../PackingReviewController.java
… 5 more files in changeset.

Thursday 25 Oct 2018

9:55 上午

jeffli

More
24688
changed 2 files
V4.1.0

打印代码改造，增加jquery支持

- ?
./com/forgon/disinfectsystem/packing/controller/PackingController.java
- History
- Source
- Diff
./com/forgon/.../PackingController.java
… 1 more file in changeset.

Wednesday 24 Oct 2018

5:44 下午

jeffli

More
24684
changed 3 files
V4.1.0

打印代码改造，增加jquery支持

- ?
./com/forgon/disinfectsystem/packing/controller/PackingController.java
- History
- Source
- Diff
./com/forgon/.../PackingController.java
… 2 more files in changeset.

java

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)

zc.li

terrykwan

zc.li

zc.li

zc.li

terrykwan

terrykwan

zc.li

yanweining

zc.li

jeffli

shuyongfu

jeffli

shuyongfu

jeffli

jeffli

jeffli

yanweining

jeffli

shuyongfu

jeffli

shuyongfu

shuyongfu

shuyongfu

shuyongfu

jeffli

jeffli

yanweining

jeffli

jeffli