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: 6
Total Committers: 14
Last Commit: 24 Feb 16
Commits this week: 6
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 31586 is being indexed.

Monday 05 Jul 2021
6:20 下午

zc.li

SSTS-396 回收时扫描状态为清洗完成的清洗篮筐系统没反应，后台有报错
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:48 下午

zc.li

SSTS-396 回收时扫描状态为清洗完成的清洗篮筐系统没反应，后台有报错
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 2 more files in changeset.
Thursday 24 Jun 2021
5:13 下午

zc.li

注释修改
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:09 下午

zc.li

解决：SZSLHQZXYY-8.开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:39 下午

zc.li

解决：SZSLHQZXYY-8.开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Wednesday 23 Jun 2021
3:18 下午

zc.li

解决：SZSLHQZXYY-8。开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
Wednesday 16 Jun 2021
6:24 下午

zc.li

解决：SZSLHQZXYY-8。开启配置项enableAutoIntoWashBasketWhenScanTousseBarcode后，扫包实例条码回收消毒物品会多出申请项，导致单状态变成部分回收的问题.
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:35 下午

jason

解决jira问题：XKYY-219 启用按照申请材料数量计算外来器械包积分及对所有包定义的“积分系数”进行赋值
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 11 more files in changeset.
Wednesday 09 Jun 2021
5:33 下午

zc.li

解决：SZSZLYY-31 使用记录监控回收状态功能优化
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 2 more files in changeset.
Friday 04 Jun 2021
3:31 下午

zc.li

回收代码整理，删除无用代码，便于后续写测试用例
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Sunday 25 Apr 2021
10:32 上午

jason

解决jira问题：ZSSXLRMYY-198 自动加急和手工加急的物品需要对加急颜色进行区分
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  2. … 6 more files in changeset.
Friday 19 Mar 2021
2:29 下午

zc.li

解决：DGKHYY-28.同一张外来器械申请单里，不同供应商的外来器械在回收清点界面应允许部分回收
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  4. … 3 more files in changeset.
Wednesday 10 Mar 2021
11:11 上午

zc.li

解决：QYSRMYY-28。更新后未发货（已灭菌、已装配、已审核）、已废弃的包无法在回收界面扫描包条码添加进去
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Tuesday 09 Mar 2021
8:08 下午

zc.li

解决：QYSRMYY-28。更新后未发货（已灭菌、已装配、已审核）、已废弃的包无法在回收界面扫描包条码添加进去
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Thursday 04 Mar 2021
3:21 下午

zc.li

解决：GDSRMYY-526.包定义中一次性物品应纳入器械包工作量统计报表和消毒供应中心工作量统计报表统计（件数）。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  3. … 16 more files in changeset.
Thursday 25 Feb 2021
2:17 下午

zc.li

解决：KPSZXYY-56。干预了回收记录的回收时间后，在器械包信息里显示不是干预的时间的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Friday 19 Feb 2021
4:17 下午

zc.li

解决SZSDSRMYY-40：使用记录转换成的申请单中如果有某个器械包有丢失或报损信息，先部分回收没有丢失或报损信息的器械包，点击保存时系统提示“丢失器械未找到相应的器械包”
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Thursday 04 Feb 2021
7:15 下午

zc.li

解决：SZSDSRMYY-42。(不需要回收的器械包排除在外)历史回收记录列表的回收单，单上有物品的回收数量小于申请数量时，该回收单在所在行的背景颜色显示为黄色。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
6:12 下午

zc.li

解决：SZSDSRMYY-42。历史回收记录列表的回收单，单上有物品的回收数量小于申请数量时，该回收单在所在行的背景颜色显示为黄色。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingRecordVo.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Friday 22 Jan 2021
4:23 下午

zc.li

解决：ZSYY-286快速回收后导致原有申请单上所有物品的回收数量变成0
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Wednesday 13 Jan 2021
6:27 下午

zc.li

修复历史回收记录oracle报错的数据显示不全的问题；
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
Tuesday 12 Jan 2021
5:47 下午

zc.li

删除多余代码
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
4:50 下午

zc.li

修复装配后，补充丢失器械不显示装配的材料的问题；
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java
  2. … 1 more file in changeset.
4:16 下午

zc.li

解决:贵港市人民医院GGSRMYY-128.

标识牌回收后还没有装配之前，可以无限回收的问题；

Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  2. … 2 more files in changeset.
Wednesday 06 Jan 2021
11:31 上午

zc.li

修复测试用例，当包定义的祖先id为null时，回收保存报错的问题；正常情况下包定义的祖先id不会为null
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 05 Jan 2021
11:49 上午

zc.li

解决：GDSZYY-53装配完成后补充该包的丢失器械，重新打印的标签上不应有【菱形◆和 】信息。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
Monday 04 Jan 2021
5:59 下午

zc.li

解决：BJ307YY-64.(实际与本问题无关)有两个带标识牌的器械包A、B，回收时扫描器械包A的标识牌条码，器械包B的回收数量改为0，保存。这张单变为部分回收状态，但是在待回收列表点开这张单，发现A、B都没有显示入筐，并且点开这张单的历史回收记录，看到器械包A已经入筐了，看不到器械包B。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Thursday 31 Dec 2020
4:43 下午

zc.li

解决：ZJYY-23。回收不能直接扫标识牌完成回收的问题；
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
10:46 上午

zc.li

解决：GDSZYY-44。打印回收清单的支持新的json配置格式（支持引用【科室分组设置】中定义的科室分组）
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Tuesday 29 Dec 2020
2:34 下午

zc.li

解决：GGSRMYY-142。丢失报损结算科室的优化，和和明细核算月报，核算月报结算科室的改动。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
  3. … 8 more files in changeset.