forgon-ssts-v4.1.0 / ssts-userecord / src

main

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 13
Last Commit: 14 Feb 16
Commits this week: 0
Total Lines of Code (LoC): 38,535
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
Thursday 17 Sep 2020
4:40 下午

zc.li

修复：SZSDSRMYY-21。在使用记录才开始丢失报损材料的器械包,保存时，无丢失报损信息未保存的问题
Options
    • -4
    • +13
    ./java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java
Wednesday 16 Sep 2020
6:11 下午

zc.li

修复：SZSDSRMYY-21。在使用记录才开始丢失报损材料的器械包,转换成申请单时，无丢失报损信息显示的问题；
Options
    • -0
    • +1
    ./java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java
6:05 下午

zc.li

修复：SZSDSRMYY-21。在使用记录才开始丢失报损材料的器械包,转换成申请单时，无丢失报损信息显示的问题；
Options
    • -0
    • +4
    ./java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java
Monday 14 Sep 2020
7:02 下午

zc.li

解决：SZSDSRMYY-21。器械包登记丢失材料或报损材料后，在装配页面自动备注
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -2
    • +2
    ./java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
    • -6
    • +139
    ./java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java
    • -3
    • +3
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -0
    • +5
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
  6. … 12 more files in changeset.
Friday 11 Sep 2020
4:20 下午

jason

解决jira问题：DGSDBZXYY-67 东莞市东部中心医院 使用记录导出功能
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +9
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
  3. … 6 more files in changeset.
Tuesday 08 Sep 2020
1:57 下午

shuyongfu

解决:SZSDSRMYY-16 申请单合并以及使用记录转申请单的物品加急的问题
Options
    • -2
    • +19
    ./java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java
    • -0
    • +6
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  4. … 14 more files in changeset.
10:42 上午

zc.li

解决：ASSZDWY-64。回收入筐使用的清洗分类类型取了材料实例的清洗分类类型，导致修改材料定义的清洗分类类型之后，入筐仍然提示需要原清洗分类类型的篮筐的问题；
Options
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
  2. … 6 more files in changeset.
Wednesday 02 Sep 2020
8:27 下午

shuyongfu

解决:ZSYKZX-134 pda录入使用记录，保存并转换时出现乐观锁：requestLockById调用异常，当前上下文不存在事务!

处理修改和删除的场景

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
8:01 下午

shuyongfu

解决:ZSYKZX-134 pda录入使用记录，保存并转换时出现乐观锁：requestLockById调用异常，当前上下文不存在事务!
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
7:55 下午

shuyongfu

解决:ZSYKZX-134 pda录入使用记录，保存并转换时出现乐观锁：requestLockById调用异常，当前上下文不存在事务!
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 1 more file in changeset.
5:56 下午

shuyongfu

解决:ZSYKZX-134 pda录入使用记录，保存并转换时出现乐观锁：requestLockById调用异常，当前上下文不存在事务!
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +6
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
  3. … 1 more file in changeset.
Friday 07 Aug 2020
4:46 下午

shuyongfu

解决：DGSDBZXYY-73 器械包录入使用记录的时候报所属科室为null

小袁、南胜反馈的录使用记录时扫描状态为已灭菌的聚合包条码时,未录入到使用记录里但状态改为已发货的问题.扫描包实例状态校验逻辑提前到最前面

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Thursday 06 Aug 2020
2:52 下午

jason

解决jira问题：JMSZXYY-88 江门市中心医院 器械包定义增加【签收后录入使用记录】字段
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 7 more files in changeset.
Wednesday 05 Aug 2020
5:01 下午

shuyongfu

解决:DGSDBZXYY-32 使用记录转换为申请单时，要支持转换使用记录单中的消毒物品
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 3 more files in changeset.
Tuesday 04 Aug 2020
8:55 下午

shuyongfu

相关类增加toString实现便于调试程序,去掉不用的import语句
Options
    • -2
    • +0
    ./java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java
  2. … 2 more files in changeset.
8:54 下午

shuyongfu

解决:DGSDBZXYY-32 使用记录转换为申请单时，要支持转换使用记录单中的消毒物品
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 3 more files in changeset.
Thursday 30 Jul 2020
8:37 下午

shuyongfu

处理:ASSQFYY-14 PDA上录入的使用记录，“病区”、“病人所在科室”字段要被赋值

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java
    • -0
    • +48
    ./java/com/forgon/disinfectsystem/useRecord/util/UseRecordUtil.java
  4. … 5 more files in changeset.
Friday 17 Jul 2020
9:46 下午

shuyongfu

解决:DGSDBZXYY-31 使用记录转单时，高低温物品自动分单 (追加申请项(相同物品的,则数量进行叠加))
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
9:03 下午

shuyongfu

解决:DGSDBZXYY-31 使用记录转单时，高低温物品自动分单
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
7:35 下午

shuyongfu

解决:DGSDBZXYY-31 使用记录转单时，高低温物品自动分单
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 5 more files in changeset.
Saturday 04 Jul 2020
11:49 上午

shuyongfu

解决:ASSFDZLYY-23 高值耗材库存对不上的问题

高值耗材实例录使用记录后暂不调整其库存(一次性物品库存及批次库存),目前对高值耗材料实例的临床科室库存管理支持不是很到位,待完善

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Saturday 13 Jun 2020
7:06 下午

terrykwan

1、增加东莞市东部中心医院的使用记录定时转换申请单的配置文件

2、增加config.js配置项，可设置为定时转换时，只转换已审核状态的使用记录单

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 2 more files in changeset.
Sunday 26 Apr 2020
11:57 下午

terrykwan

解决jira问题：ZSWY-103 中山五院 增加语音提示的类型

一次性物品高值耗材增加type的返回,用于pda端,提交人:舒永福

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
5:21 下午

jason

解决jira问题：ZSWY-103 中山五院 增加语音提示的类型
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:16 上午

jason

解决jira问题：ZSWY-103 中山五院 增加语音提示的类型
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Wednesday 22 Apr 2020
11:39 上午

zc.li

优化:SSTS-139，添加新需求，包定义禁用标识牌的不进行使用次数提示
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Thursday 16 Apr 2020
9:29 上午

zc.li

解决:SSTS-139,使用记录增加标识牌使用次数提示
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Tuesday 14 Apr 2020
6:36 下午

shuyongfu

解决:ASSFDZLYY-17登记使用记录时扫描高值耗材条码后保存使用记录报错
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Wednesday 15 Jan 2020
5:36 下午

zc.li

修复：SZSDSRMYY-5。器械包工作量统计报表中修改器械件数统计方式中，新增的包定义没有材料拆分数量。
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 6 more files in changeset.
9:50 上午

shuyongfu

解决:SZSZLYY-31 使用记录监控回收状态功能优化

Options
    • -6
    • +14
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -1
    • +5
    ./java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  4. … 1 more file in changeset.