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

10:36 上午

shuyongfu

More
32192
changed 5 files
root:

解决:SSTS-435 PDA预回收消毒物品（非整包）申请的物品时，修改材料数量，保存的时候程序会崩溃

FSSZYY-28 pda预回收改了消毒物品的材料数量，发货后发货单及明细核算月报等报表统计的单价不正确

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

1:59 下午

jason

More
32176
changed 1 file
root:

解决jira问题：ZJYY-62 科室申领中的申请单打印后允许通过干预申请数量功能修改物品申请数量

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

11:09 上午

jason

More
32175
changed 3 files
root:

解决jira问题：ZJYY-62 科室申领中的申请单打印后允许通过干预申请数量功能修改物品申请数量

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
- -1
- +2
./disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManager.java

2:34 下午

zc.li

More
32123
changed 1 file
root:

解决：FSSDERMYY-13 增加【回收拍摄】功能。

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

10:06 上午

zc.li

More
32119
changed 11 files
root:

解决：FSSDERMYY-13 增加【回收拍摄】功能。

- -2
- +127
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java
… 10 more files in changeset.

10:55 上午

zc.li

More
32090
changed 1 file
root:

解决：DGSETYY-12。装配模块所有个性化打印回收清单改造。

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

2:33 下午

zc.li

More
32082
changed 4 files
root:

解决：DGSETYY-12。装配模块所有个性化打印回收清单改造。

- -1
- +1
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManager.java
- -1
- +4
./disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationTableManager.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 1 more file in changeset.

2:45 下午

jason

More
32044
changed 1 file
root:

解决jira问题：GZZYYFY-89 器械包灭菌完成后，发货提示：不属于该科室，不能发货

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

6:12 下午

jason

More
31916
changed 1 file
root:

解决jira问题：SSTS-421 旧版发货发放借物单上的不追溯的消毒物品时，提示“物品[测试]库存不足”(借物单申请消毒物品时创建的申请项时没有创建新的消毒物品包定义)

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

6:31 下午

jason

More
31865
changed 5 files
root:

解决jira问题：KPSZXYY-48 过了特定时间后，只允许特定权限用户录入外来器械包申请单，其他用户不允许录入

- -0
- +6
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManager.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
- -0
- +13
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java
… 2 more files in changeset.

1:58 下午

jason

More
31818
changed 1 file
root:

解决jira问题：SSTS-151 自定义器械包默认装配组没有设置会导致自定义器械包申请单提交报错(申请已经存在的包定义)

- -12
- +3
./disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../CustomRecyclingApplicationAction.java

6:06 下午

zc.li

More
31796
changed 2 files
root:

解决：XKYY-224。广州胸科升级前后对比-4.1版本中历史装配记录需增加【转换病人】功能。

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

6:05 下午

zc.li

More
31795
changed 7 files
root:

解决：XKYY-224。广州胸科升级前后对比-4.1版本中历史装配记录需增加【转换病人】功能。

- -1
- +1
./disinfectsystem/foreigntousseapplication/controller/ForeignTousseApplicationController.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationController.java
- -1
- +2
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManager.java
- -11
- +81
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
- -1
- +5
./disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationAction.java
… 3 more files in changeset.

3:51 下午

shuyongfu

More
31706
changed 1 file
root:

解决:SZSDSRMYY-46 添加外来器械申请单后，要根据科室供应室设置里的器械包发货时间来决定该发货计划的显示(之前根据外来器械包实例的判断的部分业务逻辑还是需要,已恢复)

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

3:18 下午

shuyongfu

More
31705
changed 1 file
root:

解决:SZSDSRMYY-46 添加外来器械申请单后，要根据科室供应室设置里的器械包发货时间来决定该发货计划的显示(之前根据外来器械包实例的判断的部分业务逻辑已去掉不再使用)

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

4:51 下午

shuyongfu

More
31698
changed 2 files
root:

解决:SZSDSRMYY-46 添加外来器械申请单后，要根据科室供应室设置里的器械包发货时间来决定该发货计划的显示(之前根据外来器械包实例的判断的部分业务逻辑已去掉不再使用)

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

6:18 下午

jason

More
31537
changed 1 file
root:

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值(外来器械包的积分系数默认取祖先包定义的积分系数)

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

2:51 下午

zc.li

More
31521
changed 1 file
root:

解决：ZJJSRM-46。包定义是否装配为否的物品灭菌方式为空的问题.

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

5:35 下午

jason

More
31499
changed 12 files
root:

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值

- -0
- +7
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
… 11 more files in changeset.

5:33 下午

zc.li

More
31476
changed 3 files
root:

解决：SZSZLYY-31 使用记录监控回收状态功能优化

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

1:53 下午

shuyongfu

More
31438
changed 1 file
root:

解决:BJ307YY-95 更新后，PDA预回收把包数量改成0提交后，电脑端上数量还是显示1的缺陷

- -4
- +21
./disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../PrepareRecycleTousseManagerImpl.java

3:43 下午

jason

More
31399
changed 1 file
root:

解决jira问题：ZSSXLRMYY-156 全部申请单列表数据加载慢

- -1
- +2
./disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationTableManager.java

4:38 下午

zc.li

More
31374
changed 2 files
root:

解决：GDSZYY-94。一张申请单中有不同厂家的外来器械，装配后重新打印标签，标签上的厂家信息显示不正确。

- -9
- +17
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
… 1 more file in changeset.

4:45 下午

jason

More
31367
changed 1 file
root:

解决：科室申领模板操作人取用户的中文姓名，而不是工号

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

8:46 下午

jason

More
31335
changed 1 file
root:

解决jira问题：ZSSXLRMYY-201 外部代理灭菌单用批量打印发货计划打印出来单价显示为0.

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

7:03 下午

jason

More
31334
changed 1 file
root:

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息

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

6:13 下午

jason

More
31333
changed 2 files
root:

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息

- -13
- +43
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

3:40 下午

jason

More
31331
changed 1 file
root:

解决jira问题：ZSSXLRMYY-201 外部代理灭菌单用批量打印发货计划打印出来单价显示为0.

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

10:03 上午

jason

More
31329
changed 2 files
root:

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(加急、拆分小包发货)

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
- -3
- +41
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java

5:14 下午

jason

More
31328
changed 2 files
root:

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(部分回收拆单后，申请单包状态不正常；多余回收记录)

- -1
- +6
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java

forgon

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

shuyongfu

jason

jason

zc.li

zc.li

zc.li

zc.li

jason

jason

jason

jason

zc.li

zc.li

shuyongfu

shuyongfu

shuyongfu

jason

zc.li

jason

zc.li

shuyongfu

jason

zc.li

jason

jason

jason

jason

jason

jason

jason