forgon-ssts-v4.1.0 / ssts-expensivegoods / src / main / java / com

forgon

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 10
Last Commit: 09 Nov 17
Commits this week: 0
Total Lines of Code (LoC): 16,776
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
Monday 29 Jan 2018
8:44 下午

yanweining

高值耗材：高值耗材发票警告
Options
    • -39
    • +48
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -37
    • +12
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -4
    • +3
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
  4. … 12 more files in changeset.
2:13 下午

yanweining

高值耗材：高值耗材代码优化
Options
    • -40
    • +40
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
  2. … 2 more files in changeset.
11:38 上午

liuliben

修改方法注释和删除不用的方法
Options
    • -5
    • +1
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
  2. … 1 more file in changeset.
11:04 上午

liuliben

还原授权证添加验证方法
Options
    • -30
    • +45
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • -6
    • +0
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
Friday 26 Jan 2018
7:14 下午

niutou_ren

暂时注释掉由于嵌套引用manager导致的tomcat无法启动的代码
Options
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
3:34 下午

niutou_ren

高值耗材定义修改，添加供应商列表（此次提交，只有只后台实现）
Options
    • -12
    • +13
    ./disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
    • -9
    • +55
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -46
    • +30
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • -0
    • +9
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
    • -0
    • +8
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
  7. … 2 more files in changeset.
10:19 上午

yanweining

高值耗材：高值耗材入库，发票修改
Options
    • -3
    • +5
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -11
    • +9
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -2
    • +27
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
    • -3
    • +2
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -0
    • +18
    ./disinfectsystem/expensiveGoods/util/ExpensiveGoodsGodownEntryUtil.java
  7. … 12 more files in changeset.
Monday 22 Jan 2018
9:42 下午

liuliben

修改高值耗材授权同级别代理一件物品不能给多个下级代理授权
Options
    • -21
    • +46
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
Saturday 20 Jan 2018
2:46 下午

jeffli

一键退库功能调整
Options
    • -1
    • +1
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
    • -1
    • +2
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  4. … 3 more files in changeset.
Friday 19 Jan 2018
10:25 上午

yanweining

高值耗材：高值耗材发票优化
Options
    • -20
    • +6
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
Thursday 18 Jan 2018
10:28 下午

shuyongfu

解决问题:高值耗材录使用记录，录两个一样高值耗材定义的物品，库存只扣减1，删掉两个物品后，库存也只增加1
Options
    • -1
    • +1
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsStockManagerImpl.java
9:52 下午

niutou_ren

修改ExpensiveGoodsManager类中的函数名（getDisposableGoodsTypeTreeJson() -> getExpensiveGoodsTypeTreeJson()）
Options
    • -1
    • +1
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsStockAction.java
9:29 下午

niutou_ren

1、修改错误的函数名

2、调整高值耗材定义界面

Options
    • -1
    • +1
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • -1
    • +1
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  4. … 1 more file in changeset.
6:06 下午

yanweining

高值耗材：高值耗材入库修改
Options
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -11
    • +14
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -57
    • +63
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -1
    • +2
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
  5. … 3 more files in changeset.
5:49 下午

jeffli

优化提示信息
Options
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
5:37 下午

jeffli

已退库的高值耗材不允许再次退库
Options
    • -0
    • +10
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
2:33 下午

jeffli

解决bug，退库后库存没有减少
Options
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
11:38 上午

chenjiaru

高值耗材申请单功能部分代码的提交(预入库之后产生外来器械包申请单)
Options
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -0
    • +6
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
Wednesday 17 Jan 2018
9:47 下午

jeffli

修改一键退库bug
Options
    • -2
    • +2
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
9:35 下午

chenjiaru

高值耗材申请单功能部分代码的提交(预入库之后产生外来器械包申请单)
Options
    • -1
    • +1
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
9:19 下午

jeffli

一键退库改为未使用的都可以退
Options
    • -2
    • +28
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
9:17 下午

niutou_ren

修改高值耗材定义bug

1、删除入库的高值耗材型号时报错，添加判断，如果该高值耗材型号已入库，则不允许删除

2、高值耗材定义界面中，添加多个型号时，判断逻辑修复

Options
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
  2. … 1 more file in changeset.
8:44 下午

chenjiaru

高值耗材申请单功能部分代码的提交(预入库之后产生外来器械包申请单)
Options
    • -0
    • +223
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  2. … 2 more files in changeset.
5:25 下午

jeffli

优化保存高值耗材定义的代码
Options
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
5:05 下午

yanweining

高值耗材：高值耗材发票
Options
    • -108
    • +124
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -50
    • +51
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -6
    • +5
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
  4. … 3 more files in changeset.
4:49 下午

yanweining

高值耗材：高值耗材入库
Options
    • -2
    • +2
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  2. … 1 more file in changeset.
4:42 下午

niutou_ren

在高值耗材定义（页面）中，添加型号
Options
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -1
    • +16
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • -0
    • +4
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
  4. … 3 more files in changeset.
Tuesday 16 Jan 2018
8:51 下午

jeffli

高值耗材退库增加型号的处理

自购入库，目前不需要做退库

预入库，退库时，库存直接减掉（未发货之前，从设备科扣减。发货后，从临床扣减）

Options
    • -8
    • +19
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -3
    • +3
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -2
    • +2
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java
  4. … 3 more files in changeset.
7:52 下午

jeffli

高值耗材退库增加型号的处理

自购入库，目前不需要做退库

预入库，退库时，库存直接减掉（未发货之前，从设备科扣减。发货后，从临床扣减）

Options
    • -2
    • +3
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -13
    • +30
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  3. … 2 more files in changeset.
7:30 下午

niutou_ren

修改在显示库存时，判断当前登录用户是否为高值耗材处理科室用户
Options
    • -1
    • +15
    ./disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
  2. … 3 more files in changeset.