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

forgon

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 14
Last Commit: 14 Feb 16
Commits this week: 1
Total Lines of Code (LoC): 101,293
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 14 Nov 2016
4:07 下午

zhonghaowen

修复申请数量大于最大可申请数量会报错问题
Options
    • -2
    • +2
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
Saturday 12 Nov 2016
4:14 下午

jeffli

一次性物品根据申领数量（以前的中包装数量）发货
Options
    • -0
    • +1
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -2
    • +23
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
  4. … 7 more files in changeset.
Monday 07 Nov 2016
7:00 下午

jeffli

一次性物品批次增加是否打印，打印时间，2个属性
Options
    • -80
    • +6
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -13
    • +81
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -0
    • +2
    ./disinfectsystem/diposablegoods/service/GodownEntryManager.java
  5. … 1 more file in changeset.
9:41 上午

adairkang

发货计划打印添加批号，灭菌日期，生产厂家
Options
    • -9
    • +36
    ./disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
    • -1
    • +10
    ./disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java
  3. … 4 more files in changeset.
Sunday 06 Nov 2016
6:33 下午

shuyongfu

省医物资接口处理,增加生产日期(灭菌日期/灭菌批次)字段的处理
Options
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
  2. … 2 more files in changeset.
Friday 04 Nov 2016
3:11 下午

adairkang

金额计算统一为四位精度
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +1
    ./disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
  3. … 12 more files in changeset.
Thursday 03 Nov 2016
11:13 上午

shuyongfu

广东省医物资与回写接口
Options
    • -1
    • +3
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -1
    • +1
    ./disinfectsystem/diposablegoods/service/GodownEntryManager.java
  4. … 11 more files in changeset.
Wednesday 02 Nov 2016
9:43 下午

adairkang

省医添加打印一次性物品的配置invoicePlan_disposableGoods，在打印发货计划设置的合并方式设置中，给打印模板设置值
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +2
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
  3. … 8 more files in changeset.
Tuesday 01 Nov 2016
3:12 下午

zhonghaowen

优化采购计划根据关键字搜索单
Options
    • -43
    • +14
    ./disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
    • -0
    • +39
    ./disinfectsystem/diposablegoods/service/GoodPurchaseTableFilterManagerImpl.java
  3. … 4 more files in changeset.
Thursday 27 Oct 2016
11:05 上午

jeffli

发货增加申请科室编码,结算科室编码,申请单类型等冗余属性，对旧数据处理

重构代码，所有根据发货单引用申请单的代码做改造

Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  2. … 12 more files in changeset.
Tuesday 18 Oct 2016
11:48 下午

shuyongfu

一次性物品参考价查询调整:

查询一次性物品批次库存表的最近一笔单价之前用的一次性物品库存的id字段,改为用一次性物品定义的id字段去查

Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
Monday 17 Oct 2016
12:49 下午

shuyongfu

解决jira问题及相关功能,具体如下:

GDSRMYY-187 同名的外部代理灭菌包发货时A科室的包发到B科室也能扫描出来

GDSRMYY-182 使用住院号调取病人信息时报错

广东省医his与物资回写接口及中大附一手术排班相关功能

Options
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
  2. … 26 more files in changeset.
Friday 14 Oct 2016
4:54 下午

jeffli

器械包出库时自动减去材料或者一次性物品数量，然后费用进到报表

中山市小榄人民医院ZSSXLRMYY-4

Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  2. … 12 more files in changeset.
Sunday 09 Oct 2016
6:30 下午

adairkang

出入库记录添加批次列
Options
    • -8
    • +25
    ./disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
  2. … 1 more file in changeset.
Thursday 22 Sep 2016
12:39 上午

shuyongfu

解决一次性物品入/退库单打印的产地没有数据的问题
Options
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
Tuesday 20 Sep 2016
4:38 下午

adairkang

代码重构,统一一次性物品和器械包的浮动价格的计算
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -2
    • +1
    ./disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
  3. … 26 more files in changeset.
10:30 上午

zhonghaowen

修复中包装单位装换单位系数校验
Options
    • -1
    • +1
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
Wednesday 14 Sep 2016
9:00 上午

jeffli

锁定一次性物品信息时，增加发货自动扣减场景
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  2. … 1 more file in changeset.
Tuesday 13 Sep 2016
3:16 下午

zhonghaowen

解决PYQZYY-70:科室申领，申领一次性物品时，可以采用中包装规格进行申领
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +19
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
  3. … 9 more files in changeset.
Tuesday 06 Sep 2016
4:28 下午

jeffli

一次性物品条码入库

广州复大肿瘤医院GZFDZL-75

Options
    • -0
    • +37
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
  2. … 21 more files in changeset.
Thursday 01 Sep 2016
2:36 下午

jeffli

增加高值耗材使用记录视图列表

广州复大肿瘤医院GZFDZL-77

Options
    • -0
    • +80
    ./disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
  2. … 6 more files in changeset.
Thursday 25 Aug 2016
10:18 上午

jeffli

增加一次性物品退库单干预功能

增加一次性物品领用干预功能

Options
    • -1
    • +1
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
  2. … 8 more files in changeset.
Monday 22 Aug 2016
3:30 下午

adairkang

浮点数的乘法，需要设置精度，不然存数据库会报错
Options
    • -1
    • +1
    ./disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
  3. … 19 more files in changeset.
Friday 19 Aug 2016
10:47 下午

adairkang

数据库类型判断
Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -3
    • +2
    ./disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
  3. … 18 more files in changeset.
11:09 上午

jeffli

发货界面增加一次性物品库存显示

广州复大肿瘤医院GZFDZL-5

Options
    • -0
    • +30
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
  2. … 3 more files in changeset.
Tuesday 16 Aug 2016
10:06 上午

jeffli

一次性物品入库单管理屏蔽修改入库单功能

干预功能新增入库单管理，可以修改入库单

Options
    • -5
    • +42
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
  2. … 5 more files in changeset.
Friday 12 Aug 2016
2:46 下午

jeffli

修改一次性物品定义时，禁止修改物品类型

增加一次性物品干预功能，在一次性物品管理中可以转换物品类型

Options
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +74
    ./disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
  3. … 6 more files in changeset.
Wednesday 10 Aug 2016
5:44 下午

jeffli

解决bug：

修改一次性物品入库单时，新增加一行高值耗材并保存，再次打开该入库单，选择刚才添加的高值耗材并打印，打出来还是批次条码

Options
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
Tuesday 09 Aug 2016
9:54 上午

adairkang

入/退库统计报表（按供应商）添加单类型为全部的过滤条件(GZFDZL-66)
Options
    • -0
    • +17
    ./disinfectsystem/diposablegoods/util/GodownEntryUtil.java
    • -0
    • +18
    ./disinfectsystem/diposablegoods/util/MaterialEntryUtil.java
    • -1
    • +1
    ./disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
  4. … 4 more files in changeset.
Monday 08 Aug 2016
2:51 下午

jeffli

入库单选择打印，高值耗材打实例条码

重构选择打印的代码

重构入库单保存并打印代码

广州复大肿瘤医院GZFDZL-63

Options
    • -50
    • +86
    ./disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • too large
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • too large
    ./disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -1
    • +4
    ./disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
  5. … 3 more files in changeset.