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

main

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 13
Last Commit: 14 Feb 16
Commits this week: 1
Total Lines of Code (LoC): 39,529
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 17 Oct 2016
12:49 下午

shuyongfu

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

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

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

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

Options
  1. ./java/com/forgon/disinfectsystem/operationSchedule/service
  2. ./java/com/forgon/disinfectsystem/operationSchedule
    • -0
    • +19
    ./java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManager.java
    • -0
    • +98
    ./java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
  5. … 23 more files in changeset.
Friday 30 Sep 2016
6:17 下午

wangyi

1：器械包定义里面材料显示是否植入物列

2：是否植入物属性从【器械包材料】里面挪到材料定义里面

3：使用记录根据【是否有植入物】属性判断该器械包是否能填写植入物使用数量

4：支持外来器械包定义修改功能

Options
    • -0
    • +9
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
  2. … 23 more files in changeset.
Tuesday 27 Sep 2016
5:37 下午

shuyongfu

使用记录转申请单传入使用记录id参数
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 2 more files in changeset.
Tuesday 20 Sep 2016
4:38 下午

adairkang

代码重构,统一一次性物品和器械包的浮动价格的计算
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 27 more files in changeset.
Friday 09 Sep 2016
8:18 下午

adairkang

包定义类型判断的代码重构
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 17 more files in changeset.
Thursday 01 Sep 2016
5:36 下午

shuyongfu

使用记录快速回收功能增加对所选的一次性物品进行校验并提示
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
2:36 下午

jeffli

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

广州复大肿瘤医院GZFDZL-77

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 6 more files in changeset.
Friday 19 Aug 2016
9:58 上午

chenjiaru

解决：DGDHYY-29 使用记录模块新增返回状态功能
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -1
    • +7
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -0
    • +6
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
  4. … 2 more files in changeset.
Wednesday 10 Aug 2016
12:00 上午

shuyongfu

1.解决jira问题:

GZFDZL-67 使用记录转换成申请单-住院号之前做成带到备注栏，现需要带到住院号栏

2.使用记录转申请单备注信息的调整

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 2 more files in changeset.
Thursday 04 Aug 2016
3:01 下午

wangyi

外来器械触摸屏回收问题修改
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 4 more files in changeset.
Friday 29 Jul 2016
12:43 下午

adairkang

使用记录加急
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -17
    • +9
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
  3. … 5 more files in changeset.
Thursday 28 Jul 2016
5:00 下午

adairkang

巡回护士与病人之间没有用分号隔开
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
9:38 上午

shuyongfu

解决jira问题:DGDHYY-11 使用记录转化为申请单后单据变成通用申请单
Options
    • -2
    • +6
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -1
    • +3
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  4. … 2 more files in changeset.
Thursday 21 Jul 2016
1:39 下午

shuyongfu

解决jira问题:ZSWY-37 使用记录提示改进
Options
    • -0
    • +2
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
9:44 上午

shuyongfu

解决jira问题:ZSWY-37 使用记录提示改进
Options
    • -30
    • +69
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
Thursday 14 Jul 2016
4:35 下午

adairkang

使用记录报表添加一次性物品的统计(GZFDZL-52),暂时还有过滤没有做好
Options
    • -1
    • +20
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +9
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
  3. … 15 more files in changeset.
Monday 27 Jun 2016
5:44 下午

adairkang

器械包获取失效日期的代码重构
Options
    • -3
    • +2
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java
    • -11
    • +3
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
  3. … 10 more files in changeset.
Friday 24 Jun 2016
11:34 上午

shuyongfu

解决jira问题:广州复大肿瘤医院 GZFDZL-41 器械包及高值耗材可以在不同科室登记使用记录
Options
    • -24
    • +46
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
  2. … 21 more files in changeset.
Friday 17 Jun 2016
9:27 上午

shuyongfu

解决jira问题:广州复大肿瘤医院 GZFDZL-44 登记使用记录后发现住院号输错了（记录状态为未审核），不能修改。
Options
    • -2
    • +62
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -1
    • +5
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
  3. … 1 more file in changeset.
Wednesday 15 Jun 2016
3:21 下午

wangyi

科室供应室配置增加自定义器械包是否整包清洗字段
Options
    • -15
    • +11
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 6 more files in changeset.
Monday 06 Jun 2016
11:35 下午

shuyongfu

4.0代码同步至4.1
Options
    • -1
    • +9
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • -13
    • +463
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  3. … 44 more files in changeset.
11:47 上午

jeffli

同步4.0修改
Options
    • -3
    • +11
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -2
    • +2
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  3. … 37 more files in changeset.
Sunday 05 Jun 2016
3:05 下午

wangyi

申请单代码重构
Options
    • -20
    • +0
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 24 more files in changeset.
Monday 23 May 2016
2:19 下午

shuyongfu

高值耗材的使用记录防止重复扫描与提交的验证,提交后高值耗材的状态与关联使用记录调整
Options
    • -0
    • +8
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • -0
    • +43
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -4
    • +8
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
  4. … 1 more file in changeset.
2:04 上午

shuyongfu

高值耗材相关功能:

1.高值耗材材料发货及使用记录选择

2。使用记录功能调整-增加器械材料使用信息及一次性物品高值耗材的条码扫描

3。高植耗材一次性物品调拨功能

Options
    • -0
    • +17
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • -3
    • +24
    ./java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java
    • -0
    • +51
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -46
    • +180
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
  5. … 20 more files in changeset.
Monday 09 May 2016
9:31 上午

shuyongfu

1.二级供应室发货代码移值到4.1

2.解决用一级供应室root用户填申请单,处理科室二级供应室,回头再用二级供应室用户进来看到的处理科室是一级供应室

3.器械包定义：处理科室改为优先处理科室

4.使用记录转申请单根据器械包处理科室及供应室服务临床科室生成对应的申请单

Options
    • -79
    • +55
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 4 more files in changeset.
Tuesday 22 Mar 2016
6:03 下午

jeffli

调整一次性物品数据库设计，增加多仓库支持
Options
    • -4
    • +3
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
  2. … 79 more files in changeset.
Monday 21 Mar 2016
12:01 下午

adairkang

DateQueryAdapter添加日期区间的sql语句生成

DataSynchronizationManager添加根据住院号或诊疗号查询病人信息，并将相应的代码合并

同步以供应商分类的一次性物品入库报表

材料丢失报表添加科室过滤条件

工作量统计及年度工作量统计添加发货单的核对数量列

pda使用记录添加根据住院号诊疗号查询病人信息的功能

眼科中心使用记录界面，添加使用记录提交后打开新的添加界面

ServiceManager中取消buildErrorMsgJsonResult,调用JSONUtil中的定义

Options
    • -0
    • +80
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java
    • -5
    • +132
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +33
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
  4. … 26 more files in changeset.
Wednesday 16 Mar 2016
6:26 下午

terrykwan

提交从4.0同步的代码
Options
    • -78
    • +85
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -12
    • +122
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
  3. … 18 more files in changeset.
Sunday 13 Mar 2016
11:14 下午

shuyongfu

4.0合并至4.1
Options
    • -9
    • +28
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 36 more files in changeset.