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
Thursday 18 Jan 2018
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.
5:50 下午

yanweining

高值耗材：高值耗材实例添加结算状态字段
Options
    • -3
    • +6
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  2. … 2 more files in changeset.
3:20 下午

yanweining

高值耗材：高值耗材入库修改
Options
    • -1
    • +3
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -2
    • +1
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
  3. … 2 more files in changeset.
1:59 下午

yanweining

高值耗材：高值耗材入库，发票修改
Options
    • -25
    • +48
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -8
    • +8
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
1:50 下午

liuliben

修改高值耗材保存验证
Options
    • -1
    • +1
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
    • -7
    • +13
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • -1
    • +5
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
Monday 15 Jan 2018
9:27 下午

yanweining

高值耗材：高值耗材入库对物品相关证件做验证
Options
    • -0
    • +16
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -0
    • +13
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
    • -1
    • +190
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  4. … 2 more files in changeset.
9:05 下午

liuliben

修改高值耗材授权保存方法验证
Options
    • -57
    • +155
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
  2. … 1 more file in changeset.
8:56 下午

niutou_ren

修改高值耗材导入模板（只进行生产厂家与注册证的查询，查询不到就不导入）
Options
    • -10
    • +10
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
  2. … 1 more file in changeset.
9:24 上午

niutou_ren

1、修复“修改高值耗材定义”时，无法选择注册证的bug（选择生产厂家之后才能修改注册证->如果有生产厂家，则不需要重新选择就可以修改注册证）

2、导入高值耗材中，增加生产厂家、注册证、注册证有效期等列。

Options
    • -1
    • +2
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • -2
    • +2
    ./disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
    • -3
    • +1
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
    • -0
    • +2291
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -7
    • +7
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsImportController.java
    • -6
    • +6
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsStockAction.java
  7. … 2 more files in changeset.
Saturday 13 Jan 2018
6:23 下午

liuliben

修复高值耗材授权方面问题
Options
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -9
    • +2
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
    • -33
    • +37
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
  4. … 2 more files in changeset.
Friday 12 Jan 2018
4:24 下午

niutou_ren

修改高值耗材页面由于没有关联注册证id导致的提交数据丢失的bug
Options
    • too large
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -5
    • +6
    ./disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • -1
    • +1
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
  4. … 1 more file in changeset.
2:36 下午

yanweining

高值耗材：高值耗材入库代码修改
Options
    • -2
    • +2
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -8
    • +8
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
    • -52
    • +39
    ./disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
  4. … 6 more files in changeset.