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

main

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 4
Total Committers: 18
Last Commit: 14 Feb 16
Commits this week: 4
Total Lines of Code (LoC): 70,142
Net change in LoC this week: 105

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 08 Feb 2018
8:48 下午

adairkang

no_comment
Options
  1. ./java/com/forgon/disinfectsystem
1:51 下午

niutou_ren

中山一院消毒供应项目ZSYY-220(器械包信息改进)

1、灭菌开始日期、灭菌结束日期：过滤范围增加时间过滤;

2、器械包信息页面增加字段列：可以做成config配置项显示。

签收人、签收时间：读包实例数据；显示位置在发货时间后面(配置为：showSignedItems）(以前由配置项notSignedItemsCanRegistUseRecord控制)

使用病人、使用医生、使用时间：读包实例数据；显示位置在签收时间的后面(配置为：showUseRecordItems)

灭菌交接人、灭菌接收人、灭菌交接时间：读包实例的灭菌交接时间；显示位置在包装类型的后面。注意：并且要在点击打开的”器械包追溯信息“中增加”灭菌交接记录“栏目，包含这3个字段数据。(配置为：enableSterilizationTransition)

3、过滤条件增加：发货开始时间、发货结束时间、灭菌交接开始时间、灭菌交接结束时间。按照选择的时间对包实例的数据进行过滤显示。开始时间的分钟默认为0点，结束时间的分钟默认为23：59：00

4、器械包信息页面的：灭菌完成时间、发货时间、灭菌交接时间、签收时间、使用时间；这些包含时间格式的列名都需要可以按照正序或倒序进行排序。目前是没有的。

5、器械包信息的“灭菌炉”下拉选择数据源：要所有登录科室的人员查询时都可以下拉选择，目前只能是灭菌炉所属的科室登录才能有下拉选择。查询时要所有科室都可以下拉查询，业务操作时才分开过滤显示。

Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 9 more files in changeset.
9:56 上午

ZhuangQinLiu

系统设置 权限配置菜单下，给角色配置2000以上个用户后，出现配置的用户显示不出来，问题解决
Options
    • -4
    • +34
    ./java/com/forgon/directory/service/DirectoryManagerImpl.java
    • -1
    • +38
    ./java/com/forgon/directory/action/DirectoryAction.java
    • -0
    • +9
    ./java/com/forgon/directory/service/DirectoryManager.java
  4. … 2 more files in changeset.
Wednesday 07 Feb 2018
6:28 下午

chenjiaru

修复终止申请单后，没有联动删除代办任务的缺陷
Options
    • -4
    • +3
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -4
    • +3
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java
  3. … 2 more files in changeset.
5:15 下午

ZhuangQinLiu

待办任务回退出现任务名称为空
Options
    • -1
    • +1
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
Monday 05 Feb 2018
9:51 上午

ZhuangQinLiu

高值耗材申请单、待办任务 窗口置顶
Options
    • -1
    • +2
    ./java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java
  2. … 6 more files in changeset.
Friday 02 Feb 2018
2:52 下午

jeffli

装配记录改变列类型
Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 1 more file in changeset.
9:27 上午

ZhuangQinLiu

待办任务去除iframe，规范代码
Options
    • -14
    • +23
    ./java/com/forgon/workflow/service/WorkFlowManagerImpl.java
    • -14
    • +24
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -1
    • +2
    ./java/com/forgon/workflow/service/NodeDefinitionManagerImpl.java
  4. … 4 more files in changeset.
Thursday 01 Feb 2018
7:59 下午

chenjiaru

高值耗材增加终止功能
Options
    • -1
    • +1
    ./java/com/forgon/systemsetting/service/HttpOptionManager.java
    • -1
    • +1
    ./java/com/forgon/systemsetting/action/HttpOptionAction.java
4:08 下午

chenjiaru

高值耗材增加终止功能
Options
    • -0
    • +14
    ./java/com/forgon/systemsetting/action/HttpOptionAction.java
  2. … 5 more files in changeset.
Wednesday 31 Jan 2018
2:17 下午

chenjiaru

高值耗材申请单的改造
Options
    • -0
    • +1
    ./java/com/forgon/directory/action/OrgUnitAction.java
  2. … 1 more file in changeset.
2:13 上午

chenjiaru

高值耗材申请单的改造
Options
    • -0
    • +3
    ./java/com/forgon/workflow/service/WorkFlowManagerImpl.java
    • -0
    • +17
    ./java/com/forgon/workflow/action/WorkFlowAction.java
  3. … 13 more files in changeset.
Tuesday 30 Jan 2018
4:56 下午

ZhuangQinLiu

待办任务加上权限控制，流程定义和待办任务前端提示优化
Options
    • -7
    • +23
    ./java/com/forgon/workflow/service/WorkFlowManagerImpl.java
  2. … 8 more files in changeset.
Monday 29 Jan 2018
11:19 下午

chenjiaru

ExtJs框架的升级（代码的改造）
Options
    • -0
    • +21
    ./java/com/forgon/workflow/action/WorkFlowAction.java
    • -1
    • +1
    ./java/com/forgon/workflow/service/WorkFlowManager.java
  3. … 4 more files in changeset.
8:59 下午

ZhuangQinLiu

JMSZXYY-20 密码安全性问题优化 代码优化
Options
    • -1
    • +1
    ./java/com/forgon/security/action/UserAction.java
    • -0
    • +13
    ./java/com/forgon/security/model/ModifyPwdRecord.java
    • -1
    • +1
    ./java/com/forgon/directory/action/PersonalSettingAction.java
    • -1
    • +1
    ./java/com/forgon/security/model/User.java
    • -2
    • +3
    ./java/com/forgon/security/service/UserManagerImpl.java
  6. … 1 more file in changeset.
6:28 下午

ZhuangQinLiu

去掉是否已经修改属性，默认值false。这样升级脚本才适应
Options
    • -1
    • +1
    ./java/com/forgon/security/model/User.java
4:50 下午

ZhuangQinLiu

修改用户密码表并加上日志
Options
    • -3
    • +37
    ./java/com/forgon/security/service/UserManagerImpl.java
    • -1
    • +3
    ./java/com/forgon/log/model/Log.java
    • -0
    • +7
    ./java/com/forgon/security/service/UserManager.java
    • -0
    • +97
    ./java/com/forgon/security/model/ModifyPwdRecord.java
  5. … 4 more files in changeset.
3:12 下午

ZhuangQinLiu

流程定义加上序列号不能为0的前后台判断
Options
    • -0
    • +3
    ./java/com/forgon/workflow/service/WorkFlowManagerImpl.java
  2. … 1 more file in changeset.
1:54 下午

ZhuangQinLiu

JMSZXYY-20 密码安全性问题优化， 代码优化以及流程定义等模块a标签样式修改
Options
    • -9
    • +3
    ./java/com/forgon/security/action/UserAction.java
    • -8
    • +8
    ./java/com/forgon/security/model/User.java
    • -1
    • +0
    ./java/com/forgon/security/service/UserManagerImpl.java
    • -15
    • +14
    ./java/com/forgon/directory/action/PersonalSettingAction.java
    • -1
    • +1
    ./java/com/forgon/Constants.java
  6. … 9 more files in changeset.
9:52 上午

ZhuangQinLiu

JMSZXYY-20 密码安全性问题优化 代码补提交
Options
    • -1
    • +16
    ./java/com/forgon/security/model/User.java
Sunday 28 Jan 2018
11:43 下午

ZhuangQinLiu

JMSZXYY-20 密码安全性问题优化 问题解决
Options
    • -0
    • +21
    ./java/com/forgon/security/action/UserAction.java
    • -17
    • +24
    ./java/com/forgon/directory/action/PersonalSettingAction.java
    • -0
    • +6
    ./java/com/forgon/security/service/UserManager.java
    • -1
    • +10
    ./java/com/forgon/security/service/UserManagerImpl.java
    • -2
    • +1
    ./java/com/forgon/directory/action/UserAction.java
  6. … 7 more files in changeset.
Friday 26 Jan 2018
10:36 上午

ZhuangQinLiu

注释调整和代码优化

Options
    • -1
    • +1
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -1
    • +1
    ./java/com/forgon/workflow/service/NodeDefinitionManager.java
Thursday 25 Jan 2018
7:49 下午

adairkang

注释
Options
    • -2
    • +4
    ./java/com/forgon/directory/model/BarcodeDevice.java
2:59 下午

ZhuangQinLiu

申请单提交表单可选择流程第一个节点执行人；我的已办任务模块；申请单可查看审批日志
Options
    • -0
    • +26
    ./java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java
    • -1
    • +11
    ./java/com/forgon/workflow/service/WorkFlowManagerImpl.java
    • -11
    • +98
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -0
    • +13
    ./java/com/forgon/workflow/service/NodeDefinitionManagerImpl.java
    • -1
    • +6
    ./java/com/forgon/workflow/service/WorkFlowManager.java
    • -0
    • +7
    ./java/com/forgon/workflow/service/NodeDefinitionManager.java
    • -0
    • +16
    ./java/com/forgon/workflow/action/WorkFlowAction.java
    • -0
    • +16
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java
  9. … 12 more files in changeset.
Wednesday 24 Jan 2018
8:09 下午

adairkang

签收记录添加签收人编码字段及旧数据升级
Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 5 more files in changeset.
Tuesday 23 Jan 2018
4:09 下午

chenjiaru

jira问题：ZSYY-214 PC端灭菌交接记录优化
Options
    • -0
    • +19
    ./java/com/forgon/servertime/action/ServerTimeAction.java
  2. … 7 more files in changeset.
11:52 上午

adairkang

灭菌交接打印
Options
    • -2
    • +3
    ./java/com/forgon/log/model/Log.java
    • -0
    • +3
    ./java/com/forgon/Constants.java
  3. … 12 more files in changeset.
Monday 22 Jan 2018
10:12 上午

ZhuangQinLiu

待办任务的处理科室未显示问题解决
Options
    • -1
    • +1
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
9:56 上午

ZhuangQinLiu

待办任务和流程定义这一模块，演示后需求修改后的部分代码提交
Options
    • -0
    • +13
    ./java/com/forgon/workflow/model/WorkFlowApprovalTask.java
    • -79
    • +151
    ./java/com/forgon/workflow/service/WorkFlowManagerImpl.java
    • -15
    • +26
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java
    • -54
    • +57
    ./java/com/forgon/workflow/action/WorkFlowAction.java
    • -10
    • +21
    ./java/com/forgon/workflow/service/WorkFlowManager.java
    • -20
    • +26
    ./java/com/forgon/workflow/service/NodeDefinitionManagerImpl.java
    • -152
    • +174
    ./java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -36
    • +29
    ./java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java
  9. … 12 more files in changeset.
Sunday 21 Jan 2018
10:50 下午

chenjiaru

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）
Options
    • -19
    • +22
    ./java/com/forgon/security/action/UserAction.java
    • -28
    • +0
    ./java/com/forgon/directory/action/UserAction.java
    • -25
    • +0
    ./java/com/forgon/security/service/UserManagerImpl.java
    • -6
    • +0
    ./java/com/forgon/security/service/UserManager.java
  5. … 19 more files in changeset.