Activity forgon-ssts-v4.1/SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord

5:47 下午

zc.li

More
28271
changed 2 files
V4.1.0

完善：ZSSXLRMYY-193；自动加急功能产生的装配任务无加急等级的问题；

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java

4:50 下午

zc.li

More
28246
changed 1 file
V4.1.0

解决：ZSSXLRMYY-193；自动加急的物品没有加急级别，导致该物品没有加急背景色

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

3:57 下午

jason

More
28154
changed 4 files
V4.1.0

解决jira问题： FJSSSYY-2 福建石狮市医院科室申领模块申请单信息页面增加选择模板的功能和排序

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
… 3 more files in changeset.

5:46 下午

zc.li

More
28129
changed 3 files
V4.1.0

解决:FJSSSYY-5;调整科室申领打印回收汇总单的格式与内容;

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java

11:52 上午

zc.li

More
28094
changed 1 file
V4.1.0

修复打开历史回收记录时，有时包定义为空导致报错的问题

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

10:09 上午

zc.li

More
28074
changed 1 file
V4.1.0

解决：FJSSSYY-3回收时如果有新的申请单合并到当前正在回收的申请单后，保存时刷新页面会把已经入筐的物品清除入筐的问题

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java

3:53 下午

zc.li

More
28020
changed 4 files
V4.1.0

解决：DGSFYBJY-12;修改配置项confirmRecyclingAmount的默认值，如果没有配置，默认值设置为false。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
- History
- Source
- Diff
./src/.../RecyclingRecordListSqlGenerator.java
… 3 more files in changeset.

9:59 下午

zc.li

More
28001
changed 3 files
V4.1.0

ZSWY-109:日志信息增强，添加客户端ip地址

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
- History
- Source
- Diff
./src/main/java/.../vo/RecyclingContext.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java

8:22 下午

zc.li

More
27997
changed 3 files
V4.1.0

ZSWY-109:增加回收时对包定义的验证和日志;须配置isVerifyTousseAtRecycling为true才生效

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
… 2 more files in changeset.

2:48 下午

zc.li

More
27925
changed 1 file
V4.1.0

解决：ASSZDWY-21；

回收入筐时，材料数量超过单个篮筐的装载上限，扫描了足够的篮筐后，仍然无法入筐

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

10:17 上午

jason

More
27710
changed 1 file
V4.1.0

解决jira问题：DGZYY-162 东莞中医院装配管理打印回收清单要增加敷料包的统计

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java

1:54 下午

zc.li

More
27701
changed 1 file
V4.1.0

回收记录排序优化

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
- History
- Source
- Diff
./src/.../RecyclingRecordListSqlGenerator.java

10:06 上午

zc.li

More
27699
changed 1 file
V4.1.0

回收记录排序优化

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
- History
- Source
- Diff
./src/.../RecyclingRecordListSqlGenerator.java

1:43 下午

zc.li

More
27543
changed 8 files
V4.1.0

完善：SZSDSRMYY-5。器械包工作量统计报表中修改器械件数统计方式中，不开配置项也会计算拆分数量。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java
… 5 more files in changeset.

11:20 上午

zc.li

More
27539
changed 4 files
V4.1.0

完善：SZSDSRMYY-5。器械包工作量统计报表中修改器械件数统计方式中，新增对拆包清洗数量统计的支持

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
… 3 more files in changeset.

10:21 上午

zc.li

More
27534
changed 4 files
V4.1.0

代码参数优化

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
… 2 more files in changeset.

5:41 下午

zc.li

More
27521
changed 2 files
V4.1.0

注释修正

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
… 1 more file in changeset.

5:12 下午

zc.li

More
27520
changed 29 files
V4.1.0

解决：SZSDSRMYY-5。器械包工作量统计报表中修改器械件数统计方式。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
… 26 more files in changeset.

10:43 上午

zc.li

More
27516
changed 4 files
V4.1.0

修复：ASSZDFY-57。待回收列表申请单双倍的问题，修改数据保存方式。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
… 3 more files in changeset.

6:03 下午

zc.li

More
27509
changed 4 files
V4.1.0

提交：ASSZDFY-57后台代码。待回收列表后台增加科室数量计算和申请单数量计算。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
… 3 more files in changeset.

4:24 下午

shuyongfu

More
27507
changed 3 files
V4.1.0

解决:ASSZDFY-57 待回收列表改进为分页进行加载，加快列表的显示速度

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
… 2 more files in changeset.

5:27 下午

zc.li

More
27497
changed 4 files
V4.1.0

提交：ASSZDFY-57后台代码。待回收列表后台支持分页查询。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
… 3 more files in changeset.

5:02 下午

jason

More
27495
changed 23 files
V4.1.0

解决jira问题：GYEY-727 广医二院消毒供应项目组织机构增加科室停用、启用功能按钮(补充完善部分场景)

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
… 22 more files in changeset.

4:49 下午

zc.li

More
27479
changed 2 files
V4.1.0

CSSZXYY-148。快速回收添加保存失败提示信息。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java

6:37 下午

zc.li

More
27475
changed 1 file
V4.1.0

注释补充

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

6:11 下午

zc.li

More
27474
changed 1 file
V4.1.0

修复disableCardinalNumLimit没设置或设置为false，包的申请科室在基数管理的科室中创建了科室库存，并且基数设置为0，回收保存时，回收的物品可能会被删除的问题。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

4:57 下午

zc.li

More
27473
changed 1 file
V4.1.0

修复disableCardinalNumLimit没设置或设置为false，包的申请科室在基数管理的科室中创建了科室库存，并且基数设置为0，回收保存时，回收的物品可能会被删除的问题。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

2:13 下午

jason

More
27470
changed 2 files
V4.1.0

解决jira问题：ASSZNSRMYY-6 鼠标停留在回收模块的外来器械申请单上，弹出的悬浮表格要能显示更多的信息(sql语句兼容oracle数据库)

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
- History
- Source
- Diff
./src/.../RecyclingRecordListSqlGenerator.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java

6:56 下午

zc.li

More
27465
changed 4 files
V4.1.0

修复：ASSZDFY-48。快速回收列表篮筐报空指针的问题。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
- History
- Source
- Diff
./src/main/.../vo/TousseIntoBasketService.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
- History
- Source
- Diff
./src/.../RecyclingRecordTableManager.java

6:03 下午

zc.li

More
27464
changed 3 files
V4.1.0

修复：ASSZDFY-48。快速回收列表篮筐报空指针的问题。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
- History
- Source
- Diff
./src/.../RecyclingRecordTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

ssts-recyclingrecord

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)

zc.li

zc.li

jason

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

jason

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

shuyongfu

zc.li

jason

zc.li

zc.li

zc.li

zc.li

jason

zc.li

zc.li