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

10:55 上午

zc.li

More
32090
changed 1 file
V4.1.0

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

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

2:33 下午

zc.li

More
32082
changed 4 files
V4.1.0

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

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

2:45 下午

jason

More
32044
changed 1 file
V4.1.0

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

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

6:12 下午

jason

More
31916
changed 1 file
V4.1.0

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

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

6:31 下午

jason

More
31865
changed 5 files
V4.1.0

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

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

1:58 下午

jason

More
31818
changed 1 file
V4.1.0

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

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

6:06 下午

zc.li

More
31796
changed 2 files
V4.1.0

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

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

6:05 下午

zc.li

More
31795
changed 7 files
V4.1.0

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

- ?
./com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationManager.java
- ?
./com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationAction.java
- ?
./com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationManagerImpl.java
- ?
./com/forgon/disinfectsystem/foreigntousseapplication/controller/ForeignTousseApplicationController.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationController.java
… 3 more files in changeset.

3:51 下午

shuyongfu

More
31706
changed 1 file
V4.1.0

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

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

3:18 下午

shuyongfu

More
31705
changed 1 file
V4.1.0

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

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

4:51 下午

shuyongfu

More
31698
changed 2 files
V4.1.0

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

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

6:18 下午

jason

More
31537
changed 1 file
V4.1.0

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

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

2:51 下午

zc.li

More
31521
changed 1 file
V4.1.0

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

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

5:35 下午

jason

More
31499
changed 12 files
V4.1.0

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

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

5:33 下午

zc.li

More
31476
changed 3 files
V4.1.0

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

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

1:53 下午

shuyongfu

More
31438
changed 1 file
V4.1.0

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

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

3:43 下午

jason

More
31399
changed 1 file
V4.1.0

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

- ?
./com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
- History
- Source
- Diff
./com/.../RecyclingApplicationTableManager.java

4:38 下午

zc.li

More
31374
changed 2 files
V4.1.0

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

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

4:45 下午

jason

More
31367
changed 1 file
V4.1.0

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

- ?
./com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java
- History
- Source
- Diff
./com/.../DepartmentAppTemplateAction.java

8:46 下午

jason

More
31335
changed 1 file
V4.1.0

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

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

7:03 下午

jason

More
31334
changed 1 file
V4.1.0

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

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

6:13 下午

jason

More
31333
changed 2 files
V4.1.0

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

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

3:40 下午

jason

More
31331
changed 1 file
V4.1.0

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

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

10:03 上午

jason

More
31329
changed 2 files
V4.1.0

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

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

5:14 下午

jason

More
31328
changed 2 files
V4.1.0

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

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

11:11 上午

jason

More
31324
changed 1 file
V4.1.0

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

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

10:44 上午

jason

More
31323
changed 1 file
V4.1.0

解决jira问题：GDSZYY-91 一张外来器械申请单中有多套外来器械包时，可以支持每套外来器械包分别更改病人信息(拆单新产生的回收记录回收时间取旧回收记录的回收时间)

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

7:38 下午

jason

More
31322
changed 1 file
V4.1.0

解决jira问题：SSTS-373 已经做了拆包装配的外来器械申请单在外来器械干预管理中修改申请科室保存会报错

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

6:58 下午

jason

More
31321
changed 2 files
V4.1.0

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

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

10:27 下午

jason

More
31308
changed 1 file
V4.1.0

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

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

java

Line History

Stats

Commits this week: 5

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

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

jason

jason

jason

jason

jason