Activity forgon-ssts-v4.1.0/ssts-recyclingapplication/src/main/java/com/forgon

Tree
Accordion

Stats

Commits this week: 7

Total Committers:	20
Last Commit:	14 Feb 16
Commits this week:	7
Total Lines of Code (LoC):	142,100
Net change in LoC this week:	70

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:

Tuesday 03 Nov 2020

4:11 下午

jason

More
29464
changed 1 file
root:

解决jira问题：GDSZYY-31 广东省中医院提交申请单时要对单上的一次性物品进行是否停用、能否申请以及申请数量是否大于库存数量的检查

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

3:34 下午

jason

More
29461
changed 1 file
root:

解决jira问题：GDSZYY-31 广东省中医院提交申请单时要对单上的一次性物品进行是否停用、能否申请以及申请数量是否大于库存数量的检查

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

Monday 02 Nov 2020

6:25 下午

jason

More
29456
changed 1 file
root:

解决jira问题：GDSZYY-31 广东省中医院提交申请单时要对单上的一次性物品进行是否停用、能否申请以及申请数量是否大于库存数量的检查

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

Thursday 29 Oct 2020

3:20 下午

zc.li

More
29433
changed 1 file
root:

解决：CDSLQYQYYY-70。敷料包新版加急显示的问题。

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

Monday 26 Oct 2020

7:53 下午

jason

More
29389
changed 1 file
root:

解决jira问题：ASSJMSZXYY-37 江门市中心医院包定义新增“风险级别”属性，以及新增《物品风险级别统计报表》(外来器械继承祖先包的“风险级别”)

- -0
- +1
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java

2:15 下午

shuyongfu

More
29376
changed 1 file
root:

解决:打开发货计划列表由于灭菌程序字段别名的错误导致打开列表没有任何数据显示出来的问题

- -13
- +13
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

Saturday 24 Oct 2020

1:17 下午

shuyongfu

More
29356
changed 10 files
root:

解决:BJ307YY-13 预回收功能增加功能改进-允许预回收后发货

科室供应室配置增加器械包发货时间配置及预回收发货功能的整体实现(仅基于优化后的发货版本)

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
- -1
- +1
./disinfectsystem/recyclingapplication/service/DeliverTousseManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../DeliverTousseManagerImpl.java
- -31
- +37
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 6 more files in changeset.

Thursday 22 Oct 2020

7:36 下午

shuyongfu

More
29338
changed 2 files
root:

解决:SSTS-223 同一科室的不同申领模板如果存在相同的物品，在申领的时候选择全部模板该物品会在模板上显示出来多行

- -1
- +2
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java
… 1 more file in changeset.

Wednesday 21 Oct 2020

2:02 下午

shuyongfu

More
29321
changed 1 file
root:

解决:SSTS-223 同一科室的不同申领模板如果存在相同的物品，在申领的时候选择全部模板该物品会在模板上显示出来多行

- -17
- +40
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java

Monday 19 Oct 2020

7:15 下午

terrykwan

More
29296
changed 1 file
root:

治疗包模板类型改为器械包模板类型。GDSZYY-29。

- -2
- +2
./disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
- History
- Source
- Diff
./disinfectsystem/.../DepartmentAppTemplateAction.java

2:11 下午

jason

More
29282
changed 4 files
root:

解决jira问题：GDSZYY-29 广东省中医院参数设置-->科室申领模板的模板类型修改及查找模板定义的优化

- -82
- +33
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java
… 3 more files in changeset.

Friday 16 Oct 2020

1:15 下午

shuyongfu

More
29255
changed 1 file
root:

解决:GDSZYY-27 PDA与PC上无法打开部分发货的申请单的问题

- -1
- +1
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

Thursday 15 Oct 2020

2:41 下午

shuyongfu

More
29237
changed 4 files
root:

解决:DGSDBZXYY-118 使用记录转换成申请单，一些物品自动变为加急物品以及使用记录相关的代码优化

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 3 more files in changeset.

Tuesday 13 Oct 2020

1:47 下午

shuyongfu

More
29206
changed 1 file
root:

解决:GDSZYY-24 PC发货计划以及PDA发货模块的科室待发物品列表，一次性物品的排序要按照一次性物品定义的顺序号

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java

Monday 12 Oct 2020

8:06 下午

jason

More
29201
changed 1 file
root:

解决jira问题：GDSZYY-28 广东省中医院科室申领模板新增“另存为”功能以及增加模板类型列

- -0
- +56
./disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
- History
- Source
- Diff
./disinfectsystem/.../DepartmentAppTemplateAction.java

2:36 下午

jason

More
29187
changed 2 files
root:

解决jira问题：ZJJSRM-32 张家界市人民医院科室申领批量打印发货计划单格式优化

- -0
- +64
./disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationTableManager.java
… 1 more file in changeset.

11:42 上午

shuyongfu

More
29185
changed 1 file
root:

解决:HBSXKYY-36 PDA申请的借物单发不了货

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

1:23 上午

terrykwan

More
29180
changed 1 file
root:

科室申领模块打印回收清单功能，申请单的类型增加通用申请单和消毒物品申请单。扩展中大六院的打印回收清单的模式，使之也可以用于河北省胸科医院的通用申请单。

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

Saturday 10 Oct 2020

4:14 下午

shuyongfu

More
29174
changed 1 file
root:

解决:SSTS-217 使用记录转换申请单时提示申请成功，但是使用记录状态并没有变过来，而且也没有生成对应的申请单，后台也有报错

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

Friday 09 Oct 2020

11:07 上午

jason

More
29167
changed 2 files
root:

解决jira问题：GDSZYY-26 广东省中医院打印申请单时，后台返回给前台的物品属性中增加【名称与规格】的属性

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 1 more file in changeset.

Thursday 01 Oct 2020

1:15 上午

jason

More
29156
changed 1 file
root:

解决jira问题：GDSZYY-14 广东省中医院打印3个分院的一次性物品申请数量的汇总单功能开发(科室必须是在申领科室列表的科室，不在列表的科室不进行统计和打印。)

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

Wednesday 30 Sep 2020

9:09 下午

terrykwan

More
29153
changed 1 file
root:

查询的时间改为通过打印时间字段。GDSZYY-14

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

2:14 下午

jason

More
29148
changed 4 files
root:

解决jira问题：GDSZYY-14 广东省中医院打印3个分院的一次性物品申请数量的汇总单功能开发

- -1
- +3
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java
- -1
- +1
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManager.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 1 more file in changeset.

Tuesday 29 Sep 2020

3:07 下午

shuyongfu

More
29137
changed 1 file
root:

处理:SZSDSRMYY-32 器械包返消提交时提示操作失败，后台有报错

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

12:55 上午

terrykwan

More
29128
changed 1 file
root:

表格列头增加规格信息。查询提交增加如下内容：

不查询未提交处于暂存状态以及发货状态为已终止的申请单。GDSZYY-14

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

Sunday 27 Sep 2020

8:15 下午

jason

More
29122
changed 2 files
root:

解决：批量打印发货计划，一次性物品不合并的问题

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 1 more file in changeset.

7:12 下午

jason

More
29121
changed 1 file
root:

解决：批量打印发货计划，一次性物品不会合并的问题

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

6:58 下午

jason

More
29120
changed 1 file
root:

解决jira问题：GDSZYY-14广东省中医院打印3个分院的一次性物品申请数量的汇总单功能开发(物品按照配置项中的物资编码排序)

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

1:45 下午

jason

More
29112
changed 3 files
root:

解决jira问题：GDSZYY-14广东省中医院打印3个分院的一次性物品申请数量的汇总单功能开发

- -0
- +14
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
- -0
- +6
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManager.java

Friday 25 Sep 2020

2:36 下午

shuyongfu

More
29100
changed 5 files
root:

处理:JMSZXYY-89 定义器械包申请单增加是否回收清洗选择(不回收的自定义器械包录使用记录转换申请单的问题)

- -1
- +1
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManager.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 3 more files in changeset.

forgon

Line History

Stats

Commits this week: 7

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

jason

jason

zc.li

jason

shuyongfu

shuyongfu

shuyongfu

shuyongfu

terrykwan

jason

shuyongfu

shuyongfu

shuyongfu

jason

jason

shuyongfu

terrykwan

shuyongfu

jason

jason

terrykwan

jason

shuyongfu

terrykwan

jason

jason

jason

jason

shuyongfu