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

Tree
Accordion

Stats

Commits this week: 4

Total Committers:	18
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 28775 is being indexed.

Tuesday 18 Aug 2020

2:38 下午

jason

More
28775
changed 1 file
V4.1.0

解决jira问题：SZSDSRMYY-16 深圳市第三人民医院申请单合并以及使用记录转申请单的物品加急的问题

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

1:37 下午

shuyongfu

More
28773
changed 1 file
V4.1.0

处理:DGSDBZXYY-101 外部代理灭菌单部分发货后，待发数量计算不正确

DGSDBZXYY-99 外部代理灭菌的物品部分发货后发货计划数量不减，等全部发完之后发货计划才没有。

代理灭菌单、外部代理灭菌单、自定义器械申请单计算待发数量未减掉已发货部分的数量，所以会有这种问题,其它类型不会有这种情况

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./com/.../InvoicePlanOptimizeManagerImpl.java

Friday 14 Aug 2020

8:05 下午

zc.li

More
28756
changed 1 file
V4.1.0

修复：ZSYY-273。勾选来自一张申请单的多种物品，然后点击终止申请单会因为传了同样的申请单id而提示部分所选申请单可能已被删除的问题;

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoicePlanManagerImpl.java

6:14 下午

jason

More
28753
changed 1 file
V4.1.0

解决jira问题： ZJJSRM-20 05-张家界市人民医院科室申领批量打印发货计划单增加打印预览以及printconfig.js增加打印格式

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

6:11 下午

jason

More
28752
changed 2 files
V4.1.0

解决jira问题： ZJJSRM-20 05-张家界市人民医院科室申领批量打印发货计划单增加打印预览以及printconfig.js增加打印格式

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

Monday 10 Aug 2020

5:43 下午

zc.li

More
28684
changed 5 files
V4.1.0

解决ZSYY-273：消毒供应中心未完成工作功能的优化

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

Wednesday 05 Aug 2020

5:01 下午

shuyongfu

More
28629
changed 4 files
V4.1.0

解决:DGSDBZXYY-32 使用记录转换为申请单时，要支持转换使用记录单中的消毒物品

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

Tuesday 04 Aug 2020

8:54 下午

shuyongfu

More
28620
changed 4 files
V4.1.0

解决:DGSDBZXYY-32 使用记录转换为申请单时，要支持转换使用记录单中的消毒物品

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManager.java
… 2 more files in changeset.

Thursday 30 Jul 2020

6:51 下午

zc.li

More
28566
changed 1 file
V4.1.0

代码容错

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./com/.../InvoicePlanOptimizeManagerImpl.java

Friday 24 Jul 2020

5:33 下午

jason

More
28518
changed 2 files
V4.1.0

解决jira问题：PYQZYY-173 番禺区中医院多手术室器械包流转功能改造

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

Tuesday 21 Jul 2020

8:42 下午

zc.li

More
28489
changed 2 files
V4.1.0

解决：SZNSRMYY-26外来器械包干预管理重新拆包的时候，外来器械包默认类型自动被修改等问题

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

Friday 17 Jul 2020

7:35 下午

shuyongfu

More
28465
changed 6 files
V4.1.0

解决:DGSDBZXYY-31 使用记录转单时，高低温物品自动分单

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManager.java
… 4 more files in changeset.

Wednesday 15 Jul 2020

3:35 下午

jason

More
28448
changed 2 files
V4.1.0

解决jira问题：ZJJSRM-7 张家界市人民医院不能显示申请多套外来器械的申请记录

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

Tuesday 07 Jul 2020

5:45 下午

jason

More
28403
changed 2 files
V4.1.0

解决jira问题：HBSXKYY-2 河北省胸科医院灭菌管理增加打印标签的功能(打印外来器械包标签页面报error)

- ?
./com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationTableManager.java
- ?
./com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationManagerImpl.java

Wednesday 01 Jul 2020

2:01 下午

jason

More
28362
changed 1 file
V4.1.0

解决jira问题：FJSSSYY-10 福建石狮市医院科室申领中的查询条件：开始日期和结束日期精确到时分(当查询申请单时，显示出申请时间符合开始时间和结束时间条件的申请单)

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
- History
- Source
- Diff
./com/forgon/.../ReAppTableSqlHandler.java

Tuesday 30 Jun 2020

3:23 下午

jason

More
28358
changed 1 file
V4.1.0

解决jira问题：FJSSSYY-10 福建石狮市医院科室申领中的查询条件：开始日期和结束日期精确到时分(申领界面上的开始日期和结束日期的输入框，日期时间格式不受config.js配置项timeSearchFmt控制)

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
- History
- Source
- Diff
./com/forgon/.../ReAppTableSqlHandler.java

Saturday 20 Jun 2020

1:15 上午

shuyongfu

More
28315
changed 1 file
V4.1.0

解决:ASSDGSZYY-81 回收界面手工添加回收记录保存后去申领界面点开该单据结算科室为空

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

Monday 15 Jun 2020

12:01 下午

jason

More
28263
changed 1 file
V4.1.0

解决jira问题：ZSSXLRMYY-185 中山市小榄人民医院外部代理灭菌单，在科室申领处批量打印，同一张单会重复打印很多张出来。

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

10:47 上午

jason

More
28262
changed 1 file
V4.1.0

解决jira问题：ZSSXLRMYY-185 中山市小榄人民医院外部代理灭菌单，在科室申领处批量打印，同一张单会重复打印很多张出来。

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

Friday 12 Jun 2020

6:32 下午

shuyongfu

More
28248
changed 13 files
V4.1.0

解决:ASSDGSZYY-77 科室申领按申请单类型过滤增加“物品预约单”类型；PDA发货任务增加按申请单类型类型过滤选项

pda发货的整体优化

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./com/.../InvoicePlanOptimizeManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
./com/forgon/.../InvoicePlanManager.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoicePlanManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
- History
- Source
- Diff
./com/forgon/.../action/InvoicePlanAction.java
… 9 more files in changeset.

3:40 下午

jason

More
28232
changed 1 file
V4.1.0

解决jira问题：SZSDSRMYY-15 深圳市第三人民医院科室互借功能中要允许借用科室归还借去未用的物品

- ?
./com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
- History
- Source
- Diff
./com/forgon/.../BorrowRecordAction.java

Thursday 11 Jun 2020

4:52 下午

jason

More
28155
changed 1 file
V4.1.0

中山小榄，提交借物单的时候提示undefined。

- ?
./com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./com/.../RecyclingApplicationAction.java

3:57 下午

jason

More
28154
changed 4 files
V4.1.0

解决jira问题： FJSSSYY-2 福建石狮市医院科室申领模块申请单信息页面增加选择模板的功能和排序

- ?
./com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./com/.../RecyclingApplicationAction.java
- ?
./com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
- History
- Source
- Diff
./com/.../DepartmentAppTemplateAction.java
- ?
./com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
- History
- Source
- Diff
./com/.../DepartmentAppTemplateManagerImpl.java
… 1 more file in changeset.

10:19 上午

jason

More
28144
changed 1 file
V4.1.0

解决jira问题：ASSDGSZYY-77 售后-东莞市中医院科室申领按申请单类型过滤增加“物品预约单”类型

- ?
./com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
- History
- Source
- Diff
./com/forgon/.../action/InvoicePlanAction.java

Tuesday 09 Jun 2020

3:24 下午

shuyongfu

More
28124
changed 1 file
V4.1.0

代码优化,改为调用公共方法

- ?
./com/forgon/disinfectsystem/recyclingapplication/action/UntracableRecyclingApplicationAction.java
- History
- Source
- Diff
./com/.../UntracableRecyclingApplicationAction.java

3:21 下午

shuyongfu

More
28122
changed 5 files
V4.1.0

解决:BJCYLYY-38 微创手术室的申请单，出现装配数量大于申请数量的问题

(对pda端与pc的业务进行了整合、合到一起)

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManager.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationComparator.java
- History
- Source
- Diff
./com/.../RecyclingApplicationComparator.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./com/.../RecyclingApplicationAction.java
… 1 more file in changeset.

Thursday 04 Jun 2020

6:55 下午

shuyongfu

More
28088
changed 1 file
V4.1.0

解决发货计划-打开科室的发货计划单查询待发货物品时,oracle数据库报错的问题(hql不能用连接符,只能用连接函数)

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./com/.../InvoicePlanOptimizeManagerImpl.java

3:13 下午

shuyongfu

More
28084
changed 1 file
V4.1.0

解决发货计划-打开科室的发货计划单查询待发货物品时,oracle数据库报错的问题

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./com/.../InvoicePlanOptimizeManagerImpl.java

Friday 29 May 2020

10:03 上午

jason

More
28040
changed 1 file
V4.1.0

解决jira问题：DGZYY-166东莞中医院手术室器械包处理流程改造(借物单、物品预约单的申请项“是否回收”属性都设置为“否”)

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

9:56 上午

shuyongfu

More
28039
changed 6 files
V4.1.0

解决:DGZYY-166 手术室器械包处理流程改造

发货计划与发货、科室申请打印等处的处理

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoicePlanManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java
… 4 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)

jason

shuyongfu

zc.li

jason

jason

zc.li

shuyongfu

shuyongfu

zc.li

jason

zc.li

shuyongfu

jason

jason

jason

jason

shuyongfu

jason

jason

shuyongfu

jason

jason

jason

jason

shuyongfu

shuyongfu

shuyongfu

shuyongfu

jason

shuyongfu