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

3:10 下午

jason

More
30096
changed 4 files
V4.1.0

解决jira问题：GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

- ?
./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
- ?
./com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./com/.../RecyclingApplicationAction.java
… 1 more file in changeset.

10:11 上午

shuyongfu

More
30075
changed 18 files
V4.1.0

解决:GDSZYY-57 科研项目耗材申领（一次性物品申领）功能开发

科研接口底层实现及中山眼科与省中医两个项目的业务层的分离

- ?
./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
… 16 more files in changeset.

8:37 下午

jason

More
30051
changed 1 file
V4.1.0

解决jira问题：SSTS-270 外来器械包二次回收后，点击外来器械申请单中的确认归还和提前归还，系统提示“申请单已经发货，不能进行修改！”

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

11:43 上午

jason

More
30037
changed 1 file
V4.1.0

解决jira问题：BJ307YY-46 申请单提交后，如果申请单未打印、未回收、未装配、未发货，应该允许删除

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

9:33 下午

jason

More
30010
changed 1 file
V4.1.0

解决jira问题：DGSDBZXYY-121 东莞市东部中心医院监测项的器械回收质量的器械包名称和回收科室可以随便更改

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

7:01 下午

jason

More
30002
changed 2 files
V4.1.0

解决jira问题：DGSDBZXYY-121 东莞市东部中心医院监测项的器械回收质量的器械包名称和回收科室可以随便更改

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

5:26 下午

jason

More
29999
changed 1 file
V4.1.0

解决jira问题：DGSDBZXYY-148 东莞市东部中心医院未归还的外来器械包不能再申请的配置项canApplyForForeignTousseNotReturn没有生效

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

3:33 下午

jason

More
29937
changed 5 files
V4.1.0

解决jira问题：SZSDSRMYY-38 深圳市第三人民医院在同步手术预约单页面增加一个导出功能，将同步到的信息导出成excel

- ?
./com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
- History
- Source
- Diff
./com/.../OperationReservationManagerImpl.java
- ?
./com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java
- History
- Source
- Diff
./com/.../OperationReservationManager.java
… 3 more files in changeset.

11:01 下午

jason

More
29909
changed 1 file
V4.1.0

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加打印状态检查)

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

10:50 下午

jason

More
29908
changed 2 files
V4.1.0

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加打印状态检查)

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

10:41 下午

jason

More
29907
changed 1 file
V4.1.0

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加打印状态检查)

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

10:10 下午

jason

More
29906
changed 1 file
V4.1.0

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加回收状态、发货状态检查)

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

9:46 下午

jason

More
29905
changed 3 files
V4.1.0

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(返回修改时做检查)

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

8:42 下午

jason

More
29902
changed 3 files
V4.1.0

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加回收状态、发货状态检查)

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

7:51 下午

jason

More
29896
changed 4 files
V4.1.0

解决jira问题：BJ307YY-47 申请单提交时要进行版本检查，避免出现数据覆盖问题(增加回收状态、发货状态检查)

- ?
./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
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
./com/forgon/.../InvoicePlanManager.java
- ?
./com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationManagerImpl.java

2:58 下午

jason

More
29882
changed 2 files
V4.1.0

解决jira问题：SSTS-260 暂存的申请单，提交时出现undefined

- ?
./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

8:22 下午

jason

More
29861
changed 1 file
V4.1.0

解决jira问题：SSTS-264 开启自动合并申请单功能后，如果该科室已经存在一张做了预回收但是还没回收的申请单，那该科室新提交的单不允许再合并到这张单上

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

7:11 下午

yuandongxiao

More
29824
changed 1 file
V4.1.0

一次性物品的批量打印批次按时间降序排序(代小周提交)

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

10:29 下午

jason

More
29790
changed 1 file
V4.1.0

解决jira问题：DGSDBZXYY-37 东莞市东部中心医院外来器械功能改进

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

7:15 下午

jason

More
29785
changed 1 file
V4.1.0

解决jira问题：DGSDBZXYY-37 东莞市东部中心医院外来器械功能改进

- ?
./com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationAction.java

4:45 下午

jason

More
29774
changed 1 file
V4.1.0

解决jira问题：DGSDBZXYY-37 东莞市东部中心医院外来器械功能改进

- ?
./com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationAction.java

3:23 下午

jason

More
29768
changed 8 files
V4.1.0

解决jira问题：DGSDBZXYY-37 东莞市东部中心医院外来器械功能改进

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

2:58 下午

zc.li

More
29763
changed 17 files
V4.1.0

解决：DGSDBZXYY-37 外来器械功能改进 (后台部分代码)

- ?
./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
- ?
./com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
- History
- Source
- Diff
./com/.../RecyclingApplicationTableManager.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoicePlanManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
- History
- Source
- Diff
./com/forgon/.../ReAppTableSqlHandler.java
- ?
./com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationTableManager.java
… 11 more files in changeset.

11:20 上午

shuyongfu

More
29761
changed 10 files
V4.1.0

解决:GDSZYY-42 PDA新增一键扫描不追溯的复用物品的功能

一键扫描一次性物品按钮改为不带出高值耗材的数量

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./com/.../InvoicePlanOptimizeManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
- History
- Source
- Diff
./com/forgon/.../vo/ApplicationGoodsVo.java
… 8 more files in changeset.

10:45 上午

jason

More
29739
changed 3 files
V4.1.0

解决jira问题：BJ307YY-47 解放军总医院第五医学中心（原307医院申请单提交时要进行版本检查，避免出现数据覆盖问题

- ?
./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
… 1 more file in changeset.

6:57 下午

zc.li

More
29724
changed 1 file
V4.1.0

修复：BJ307YY-41 预回收借物归还报错的问题；

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

6:53 下午

zc.li

More
29723
changed 1 file
V4.1.0

修复：BJ307YY-41 预回收借物归还时，申请数量没有改变的问题；

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

6:23 下午

zc.li

More
29719
changed 1 file
V4.1.0

完善：BJ307YY-41 预回收借物归不同选择的场景

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

5:58 下午

jason

More
29716
changed 1 file
V4.1.0

解决jira问题：GDSZYY-35 广东省中医院增加【批量打印发货计划记录】功能，打印一次性物品汇总单改进为选择打印批次进行汇总

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

5:52 下午

zc.li

More
29715
changed 1 file
V4.1.0

修复：BJ307YY-41 预回收借物归还时，申请数量没有改变的问题；

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

jason

shuyongfu

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

yuandongxiao

jason

jason

jason

jason

zc.li

shuyongfu

jason

zc.li

zc.li

zc.li

jason

zc.li