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

ssts-recyclingrecord

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 14
Last Commit: 24 Feb 16
Commits this week: 1
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 27166 is being indexed.

Wednesday 20 Nov 2019
9:46 上午

zc.li

完善：ASSZDWY-58。注释补充
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 19 Nov 2019
4:00 下午

zc.li

解决：ASSZDWY-58。篮筐已扫物品数量百分比计算错误，导致入筐数量限制不正确；入筐超上限提示优化。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/CustomIntoBasket.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 22 Oct 2019
2:28 下午

zc.li

解决ASSZDWY-50和视频监控设置回收上下文id为回收记录id造成的冲突BUG:二次回收外来器械包申请单，申请单状态不会变为已回收,导致申请单回收后还在待回收列表里。处理方法设置id放在修改申请单状态之后。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Thursday 17 Oct 2019
5:14 下午

shuyongfu

解决:GGSRMYY-111 PDA上预回收确认后，PC端回收清点扫描标识牌无法打开申请单
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
2:46 下午

shuyongfu

解决:GYEY-730 视频监控模块开发

1.启动应用服务时,将停止所有的摄像、更新所有未结束的视频的结束时间

2.进入回收时启用录拍、关闭回收窗口时停止录拍.期间产生的装配记录关联所拍的视频。相关的回收页面有待回收列表、打开其中某条待回收或已回收或添加回收、快速回收、快速入筐等

3.进入装配时启用录拍、关闭所有装配窗口(最好是退出系统)时停止录拍.期间产生的装配记录关联所拍的视频。相关的装配页面有各任务组装配页面、自定义装配或外来器械装配页面、聚合包装配页面等

4.后台定时器监制客户端心跳信息,如有心跳超时达到与超过2分钟,将停止该客户端的录拍

Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  4. … 34 more files in changeset.
Wednesday 16 Oct 2019
2:09 下午

zc.li

解决：ASSKPSZXYY-20。回收时扫描包条码后页面没反应。另删除一些无用的代码
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Thursday 26 Sep 2019
3:04 下午

zc.li

优化：ASSLQYQRZ-25和ASSZDWY-53第2点的代码。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 5 more files in changeset.
Tuesday 24 Sep 2019
3:05 下午

zc.li

解决：ASSLQYQRZ-25。新增disableCardinalNumLimit控制回收和自定义装配时是否禁用基数验证。true:禁用，默认和false,需要验证。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 2 more files in changeset.
Wednesday 18 Sep 2019
3:55 下午

zc.li

完善DGZYY-156.场景5二次清洗;场景7,8,9.修复清洗材料总数没有过滤被终止物品数量的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 8 more files in changeset.
Thursday 12 Sep 2019
3:20 下午

zc.li

DGZYY-156。新增非整包清洗的情况处理。被终止的物品和申请单不能在历史回收记录里修改入筐数量。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 3 more files in changeset.
Wednesday 11 Sep 2019
4:54 下午

zc.li

DGZYY-156。新添加场景3和4.
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  3. … 7 more files in changeset.
Monday 09 Sep 2019
6:31 下午

zc.li

回滚DGZYY-156的代码。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  4. … 4 more files in changeset.
Wednesday 04 Sep 2019
4:49 下午

zc.li

完善：DGZYY-156。修复测试用例。终止申请单和删除装配任务，篮筐里没有其他物品时，状态改为装配完成。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  4. … 4 more files in changeset.
12:04 下午

zc.li

解决：DGZYY-156。装配任务删除和申请单终止物品后,重新回收不能回收的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  4. … 3 more files in changeset.
Wednesday 28 Aug 2019
9:17 上午

zc.li

解决：DGZYY-157。历史回收记录增加物品时，新加的物品回收时间取值第一次回收保存的时间，添加装配任务和器械包的清洗时间。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 2 more files in changeset.
Tuesday 27 Aug 2019
2:50 下午

shuyongfu

处理Jira问题:ASSZDWY-50 外来器械使用记录转换申请单后打开历史同一套外来器械的二次回收申请单点击保存会将原待回收的使用记录申请单保存掉
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Wednesday 07 Aug 2019
4:59 下午

zc.li

修复oracle历史回收记录有时显示不出来的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
Tuesday 06 Aug 2019
10:18 上午

zc.li

XJJQZYY-81。回收清点页面增加科室自送人字段和输入框,修改自送人数据来源。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Friday 02 Aug 2019
11:34 上午

zc.li

XJJQZYY-81.后台添加回收记录自送人的保存读取。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  3. … 1 more file in changeset.
11:27 上午

zc.li

基数管理列表数据速度优化，盘点保存保存修复。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 5 more files in changeset.
Monday 29 Jul 2019
3:13 下午

shuyongfu

处理Jira问题:BJCYLYY-20 回收申请单添加的器械包，包内材料包含一次性物品，且包定义是否扣减包内材料选为是，发货时不能正常发货
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Saturday 20 Jul 2019
6:34 下午

shuyongfu

处理Jira问题:BJCYLYY-20 回收申请单添加的器械包，包内材料包含一次性物品，且包定义是否扣减包内材料选为是，发货时不能正常发货
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 16 Jul 2019
1:44 下午

zc.li

解决：SZSZLYY-30。回收时手工添加的器械包也能进行回收功能，删除器械包时，申请数量不为0也能从申请单中删除器械包。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  3. … 3 more files in changeset.
Thursday 04 Jul 2019
9:44 上午

shuyongfu

规范代码语法
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
Monday 01 Jul 2019
8:42 下午

zc.li

解决：SZSZLYY-26。科室器械包管理功能改造
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 18 more files in changeset.
Thursday 27 Jun 2019
5:28 下午

jason

解决jira问题：广东省中医院 GDSZYY-9 外来器械申请单接口
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 9 more files in changeset.
Wednesday 12 Jun 2019
7:52 下午

jason

解决jira问题：中山大学中山眼科中心 ZSYKZX-114 装配界面增加添加丢失器械功能
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
  2. … 1 more file in changeset.
Saturday 08 Jun 2019
5:59 下午

terrykwan

增加回收模块的的注释
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
  3. … 2 more files in changeset.
Thursday 30 May 2019
7:29 下午

jason

解决jira问题：ZSSXLRMYY-174 丢失、报废增加原因录入
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/MaterialErrorDamageDetailVo.java
  4. … 6 more files in changeset.
Friday 24 May 2019
6:28 下午

zc.li

解决：XJJQZYY-80。有标识牌的物品回收状态根据配置项recyclingStatusOfIdCardBarcode来限制。例如：recyclingStatusOfIdCardBarcode : "已使用,已废弃",则只回收已使用和已废弃的包。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 1 more file in changeset.