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

5:00 下午

jason

More
40037
changed 3 files
V4.1.0

解决jira问题：ZSYY-417【外来器械申请】功能进行多项改进(增加器械包条码，篮筐条码快捷查询申请记录、增加发货后就可以再次翻包申请、外来器械包状态细化)

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

1:36 下午

jason

More
40012
changed 1 file
V4.1.0

解决jira问题：ZSYY-418【手术预约管理】视图接口数据同步时手术预约信息更新逻辑改进

- ?
./java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
- History
- Source
- Diff
./java/.../OperationReservationManagerImpl.java

3:01 下午

jason

More
39995
changed 1 file
V4.1.0

解决jira问题：QHRSGZZYY-2 【小程序】新增小程序平台以及外来申请单厂商下单功能

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

10:26 上午

jason

More
39981
changed 5 files
V4.1.0

解决jira问题：XJJQZYY-136【手术预约管理】新增可扩展字段(手术诊断)和扩展列功能

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

11:39 上午

jason

More
39972
changed 1 file
V4.1.0

解决jira问题：QHRSGZZYY-2 【小程序】新增小程序平台以及外来申请单厂商下单功能 (如果用户变更了供应商信息，则只能看到最新所属的供应商的记录，此前的不能再查看了)

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

6:45 下午

jason

More
39955
changed 2 files
V4.1.0

解决jira问题：ZSYY-415 【手术预约管理】使用视图方式新增同步更新和删除业务(修改手术名称后，物品追加；删除手术预约单异常)

- ?
./java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
- History
- Source
- Diff
./java/com/.../OperationReservationAction.java
- ?
./java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
- History
- Source
- Diff
./java/.../OperationReservationManagerImpl.java

5:29 下午

jason

More
39954
changed 2 files
V4.1.0

解决jira问题：ZSYY-415 【手术预约管理】使用视图方式新增同步更新和删除业务(mysql中文乱码)

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

3:31 下午

jason

More
39950
changed 3 files
V4.1.0

解决jira问题：ZSYY-415 【手术预约管理】使用视图方式新增同步更新和删除业务

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

5:37 下午

shuyongfu

More
39937
changed 1 file
V4.1.0

处理:FSEYEQ-12 【发货计划】待发货物品变色规则设置了已灭菌（含已消毒）物品变色功能，科室所在行单元格未变色

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

10:55 上午

jason

More
39924
changed 1 file
V4.1.0

解决jira问题：DGSFYBJY-96 需要优化语句执行效率

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

4:10 下午

jason

More
39906
changed 2 files
V4.1.0

解决jira问题：DGSFYBJY-96 需要优化语句执行效率

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

10:55 上午

zc.li

More
39902
changed 1 file
V4.1.0

解决 ZJYY-162 待回收列表除了加急的单优先显示，其它的单根据最后修改时间倒序显示

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

5:49 下午

jason

More
39897
changed 6 files
V4.1.0

解决jira问题：DGSFYBJY-96 需要优化语句执行效率

- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./java/.../ForeignTousseApplicationManager.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./java/.../ForeignTousseApplicationManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
- History
- Source
- Diff
./java/.../ForeignTousseApplicationTableManager.java
… 3 more files in changeset.

10:35 上午

zc.li

More
39893
changed 1 file
V4.1.0

解决 GZSDBRMYY-38 【回收清点】新增允许二次回收仅包含植入物材料且材料数量为0的外来器械包

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

6:22 下午

zc.li

More
39888
changed 1 file
V4.1.0

解决 GZSDBRMYY-38 【回收清点】新增允许二次回收仅包含植入物材料且材料数量为0的外来器械包

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

5:41 下午

zc.li

More
39780
changed 1 file
V4.1.0

增加c3p0日志输出到log4j文件启动时需配置jvm参数 -Dcom.mchange.v2.log.MLog=com.mchange.v2.log.log4j.Log4jMLog；增加获取连接池信息接口；修复一些连接可能泄露的地方

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

5:29 下午

zc.li

More
39778
changed 1 file
V4.1.0

完善 SSTS-609 终止申请物品或申请单时，检验所在篮筐内的是否全部终止，如果是，则修改篮筐状态

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

6:15 下午

jason

More
39758
changed 33 files
V4.1.0

解决jira问题：QHRSGZZYY-2【小程序】新增小程序平台以及外来申请单厂商下单功能

- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./java/.../ForeignTousseApplicationManager.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./java/.../ForeignTousseApplicationAction.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/vo/WeChatMiniProgForeignTousseApplicationVo.java
- History
- Source
./java/.../WeChatMiniProgForeignTousseApplicationVo.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/vo/WeChatMiniProgForeignTousseMaterialVo.java
- History
- Source
./java/.../WeChatMiniProgForeignTousseMaterialVo.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./java/.../ForeignTousseApplicationManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/controller/ForeignTousseApplicationWeChatMiniProgramController.java
- History
- Source
./java/.../ForeignTousseApplicationWeChatMiniProgramController.java
./java/com/forgon/disinfectsystem/foreigntousseapplication/vo
- History
- Source
./java/com/forgon/.../foreigntousseapplication/vo
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/vo/ForeignTousseSaveVo.java
- History
- Source
./java/com/forgon/.../vo/ForeignTousseSaveVo.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseMaterialDto.java
- History
- Source
./java/.../WeChatMiniProgForeignTousseMaterialDto.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseApplicationDto.java
- History
- Source
./java/.../WeChatMiniProgForeignTousseApplicationDto.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/vo/ForeignTousseMaterialSaveVo.java
- History
- Source
./java/com/.../vo/ForeignTousseMaterialSaveVo.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/vo/WeChatMiniProgForeignTousseVo.java
- History
- Source
./java/com/.../WeChatMiniProgForeignTousseVo.java
- ?
./java/com/forgon/disinfectsystem/foreigntousseapplication/dto/WeChatMiniProgForeignTousseDto.java
- History
- Source
./java/com/.../WeChatMiniProgForeignTousseDto.java
… 20 more files in changeset.

11:54 上午

jason

More
39704
changed 1 file
V4.1.0

解决jira问题：ZJYY-157 【借物管理】自动还物功能支持消毒物品

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

6:11 下午

jason

More
39696
changed 2 files
V4.1.0

解决jira问题：ZJYY-157 【借物管理】自动还物功能支持消毒物品

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

3:57 下午

shuyongfu

More
39653
changed 1 file
V4.1.0

处理:SSTS-734 关于发货计划搜索申请科室无法过滤，选择科室分组无法过滤的BUG

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

4:26 下午

jason

More
39636
changed 9 files
V4.1.0

解决jira问题：DGSDBZXYY-251【加急告警】enableTousseVoluntarilyUrgent配置项新增加急提醒详细模式

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

2:38 下午

shuyongfu

More
39633
changed 2 files
V4.1.0

处理:HNSETYY-11 【外来器械申请单】申请多套一模一样的器械包，多套器械包一起入同一个篮筐再进行装配后，发货计划的待发货任务就会变成一套器械包

针对一张外来器械申请单申请多条同一个外来器械包定义的物品但只部分装配时显示的待发货数量为已装配的包数量的问题(应该显示已装配的包数量+未装配的包数量之和)

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

3:25 下午

jason

More
39621
changed 8 files
V4.1.0

调用OrgUnit类的public String getBarcode()方法时，报错的问题(Caused by: java.sql.SQLRecoverableException: 无法从套接字读取更多的数据)(广东省中医药)

- ?
./java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./java/com/.../InvoicePlanManagerImpl.java
- ?
./java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
- History
- Source
- Diff
./java/.../RecyclingApplicationTableManager.java
- ?
./java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./java/.../RecyclingApplicationManagerImpl.java
… 5 more files in changeset.

2:13 下午

zc.li

More
39620
changed 1 file
V4.1.0

SSTS-731 关于回收保存时，归还物品，会卡住的BUG

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

6:16 下午

shuyongfu

More
39609
changed 1 file
V4.1.0

处理:HNSETYY-11 【外来器械申请单】申请多套一模一样的器械包，多套器械包一起入同一个篮筐再进行装配后，发货计划的待发货任务就会变成一套器械包补充注释

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

6:13 下午

shuyongfu

More
39608
changed 1 file
V4.1.0

处理:HNSETYY-11 【外来器械申请单】申请多套一模一样的器械包，多套器械包一起入同一个篮筐再进行装配后，发货计划的待发货任务就会变成一套器械包

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

11:33 上午

zc.li

More
39602
changed 1 file
V4.1.0

解决 SSTS-719 回收清点界面的最后修改时间的排序方式的取值不对的问题

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

5:35 下午

jason

More
39596
changed 3 files
V4.1.0

解决jira问题：ZJYY-157【借物管理】自动还物功能支持消毒物品

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

11:22 上午

zc.li

More
39561
changed 2 files
V4.1.0

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。

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

main

Line History

Stats

Commits this week: 1

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

jason

jason

jason

jason

jason

jason

jason

shuyongfu

jason

jason

zc.li

jason

zc.li

zc.li

zc.li

zc.li

jason

jason

jason

shuyongfu

jason

shuyongfu

jason

zc.li

shuyongfu

shuyongfu

zc.li

jason

zc.li