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 18 Jan 2018
10:31 下午

shuyongfu

功能调整:原功能"包含有高值耗材实例的状态为已结算的使用记录不能删除,为未结算才能删除"调整为"包含有高值耗材实例的结算状态为“已结算”的使用记录不能删除,为未结算才能删除"
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Wednesday 17 Jan 2018
7:08 下午

shuyongfu

1.增加对高值耗材的快速回收时的提示消息

2.德阳的定时转换功能调整为对未审核和已审核的使用记录进行定时转换申请单(之前只对已审核的使用记录进行定时转换)

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

adairkang

高值耗材打印，不打印非植入物的高值耗材
Options
    • -1
    • +26
    ./java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintData.java
    • -0
    • +10
    ./java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintItem.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  4. … 3 more files in changeset.
Tuesday 16 Jan 2018
8:00 下午

jeffli

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

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

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

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

shuyongfu

使用记录html5页面保存后登记人为空
Options
    • -3
    • +28
    ./java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
6:02 下午

shuyongfu

解决新高值耗材两个问题

1.添加或修改时使用记录,没有更新高值实例对应的申请单的havaUseRecord值

2.在使用记录管理页面删除有录入了高值耗材的使用记录时,没有按高值耗材实例的状态进行校验导致状态为已结算的高值耗材的使用记录也能删除

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +1
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java
    • -1
    • +6
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
Monday 15 Jan 2018
10:39 下午

adairkang

高值耗材使用记录的打印
Options
    • -0
    • +87
    ./java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintData.java
    • -0
    • +50
    ./java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintItem.java
    • -0
    • +7
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • -0
    • +34
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  6. ./java/com/forgon/disinfectsystem/useRecord/vo
  7. … 4 more files in changeset.
Thursday 11 Jan 2018
3:02 下午

shuyongfu

根据申请单id集合计算各申请单是否有录入高值耗材的使用记录

如果申请单关联的高值耗材实例有录入使用记录的话则更新申请单的haveUseRecord字段(只在使用记录新增保存、修改、删除时检查使用记录的高值耗材实例所关的申请单id)

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 2 more files in changeset.
Saturday 06 Jan 2018
3:21 下午

shuyongfu

去掉测试用例类未使用import语句、纠正import语法
Options
    • -1
    • +0
    ./java/com/forgon/disinfectsystem/useRecord/service/gyey/PatientAdmissionInfoManager.java
    • -4
    • +0
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -2
    • +0
    ./java/com/forgon/disinfectsystem/useRecord/service/gyey/PatientAdmissionInfoManagerImpl.java
    • -35
    • +0
    ./java/com/forgon/disinfectsystem/useRecord/hrepPath/zsly/HerpPathManagerImpl.java
    • -1
    • +0
    ./java/com/forgon/disinfectsystem/useRecord/hrepPath/ljsrmyy/HerpPathManagerImpl.java
  6. … 1 more file in changeset.
Friday 05 Jan 2018
6:04 下午

shuyongfu

解决jira问题:DYSYY-40 PDA使用记录(html5)登记优化
Options
    • -0
    • +42
    ./java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
  2. … 2 more files in changeset.
Wednesday 03 Jan 2018
11:38 上午

jeffli

一次性物品价格浮动系数功能改进
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 2 more files in changeset.
Thursday 21 Dec 2017
11:37 上午

shuyongfu

解决jira问题:GZFDZL-112 高值耗材在使用记录单内点【审核并生成申请单】失败

以及删除包含一次性物品高值耗材的未审核的使用记录删除报错的问题

Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 1 more file in changeset.
Friday 08 Dec 2017
5:41 下午

alan.lee

代码优化~
Options
    • -1
    • +1
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -4
    • +6
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
2:12 下午

alan.lee

代码优化
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 1 more file in changeset.
Thursday 07 Dec 2017
7:20 下午

alan.lee

使用记录 生成申请单按钮 添加判断
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 2 more files in changeset.
4:49 下午

adairkang

解决jira问题：QYSRMYY-16 器械交接记录
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
4:24 下午

adairkang

解决jira问题：QYSRMYY-16 移动校验的位置
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 1 more file in changeset.
2:02 下午

adairkang

解决jira问题：QYSRMYY-16 器械交接记录
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 2 more files in changeset.
11:36 上午

chenjiaru

解决jira问题：QYSRMYY-16 器械交接记录
Options
    • -6
    • +0
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -1
    • +9
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
  4. … 13 more files in changeset.
Tuesday 05 Dec 2017
4:38 下午

alan.lee

QYSRMYY-16

器械交接记录

使用记录页面增加 ”批量设置已回收“按钮

增加回收状态字段

Options
    • -0
    • +3
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • -0
    • +25
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  4. … 3 more files in changeset.
Monday 04 Dec 2017
8:46 下午

chenjiaru

解决jira问题：QYSRMYY-16 器械交接记录
Options
    • -0
    • +6
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  3. … 1 more file in changeset.
Tuesday 28 Nov 2017
2:05 下午

chenjiaru

“使用记录录入统计报表”和“使用记录录入明细统计报表”两个报表增加高值耗材的统计
Options
    • -0
    • +9
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  3. … 10 more files in changeset.
Monday 27 Nov 2017
7:12 下午

shuyongfu

扫描高值耗材条码录入使用记录时增加对高值耗材位置的判断
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
5:57 下午

shuyongfu

解决PC端高值耗材录入使用记录的问题
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -3
    • +27
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -3
    • +34
    ./java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java
  4. … 8 more files in changeset.
Thursday 23 Nov 2017
9:19 下午

chenjiaru

“使用记录录入统计报表”和“使用记录录入明细统计报表”两个报表增加高值耗材的统计
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -5
    • +5
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
  3. … 2 more files in changeset.
Monday 20 Nov 2017
11:38 上午

chenjiaru

去掉多余的参数
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  2. … 8 more files in changeset.
Thursday 09 Nov 2017
6:39 下午

shuyongfu

暂时修复使用记录不能录入一次性物品的问题
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
2:14 下午

shuyongfu

增加注释说明
Options
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:56 上午

shuyongfu

解决jira问题:DYSYY-8 临床科室使用记录转化为申请单后的单据合并
Options
    • -0
    • +6
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • too large
    ./java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
  3. … 25 more files in changeset.
Tuesday 07 Nov 2017
11:01 上午

shuyongfu

解决jira问题:DYSYY-37 PDA使用记录登录科室和我系统的当前登录科室不同的问题处理
Options
    • -5
    • +10
    ./java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
  2. … 2 more files in changeset.