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
Sunday 29 Apr 2018
3:49 下午

jeffli

中航LED控制
Options
    • -0
    • +331
    ./java/com/forgon/device/ZHLEDController.java
  2. ./java/com/forgon/device
  3. … 2 more files in changeset.
Wednesday 25 Apr 2018
4:10 下午

jeffli

标签上打印出灭菌日期与失效日期的小时和分钟

贵港市人民医院GGSRMYY-12

Options
    • -0
    • +13
    ./java/com/forgon/servertime/action/ServerTimeAction.java
  2. … 5 more files in changeset.
Wednesday 18 Apr 2018
4:14 下午

chenjiaru

把高值耗材单的年龄字段改成允许输入文本字符
Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 4 more files in changeset.
Monday 16 Apr 2018
2:12 下午

adairkang

GDSRMYY-425 二级供应室增加批量打印发货功能

发货计划设置添加处理科室，同时旧数据进行处理，修改科室名称的同步，两个版本的配置界面修改

Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
    • too large
    ./java/com/forgon/directory/service/OrgUnitManagerImpl.java
  3. … 8 more files in changeset.
9:38 上午

adairkang

CSSZXYY-137 清洗篮筐装配外来器械的限制改进，同一条回收记录，拆包的外来器械不能与其他外来器械入同一个篮筐，整包的外来器械可以多套入同一个篮筐
Options
    • -8
    • +3
    ./java/com/forgon/disinfectsystem/barcodepredicate/BarcodePredicate.java
    • -1
    • +3
    ./java/com/forgon/directory/model/BarcodeDevice.java
    • -0
    • +9
    ./java/com/forgon/disinfectsystem/barcodepredicate/BarcodeAble.java
    • -3
    • +15
    ./java/com/forgon/disinfectsystem/barcodepredicate/BarcodeOperators.java
  5. … 15 more files in changeset.
Friday 13 Apr 2018
11:34 上午

adairkang

移动位置
Options
  1. ./java/com/forgon/disinfectsystem/barcodepredicate
    • -0
    • +27
    ./java/com/forgon/disinfectsystem/barcodepredicate/BarcodePredicate.java
    • -0
    • +29
    ./java/com/forgon/disinfectsystem/barcodepredicate/BarcodeOperators.java
  4. … 3 more files in changeset.
Tuesday 10 Apr 2018
5:49 下午

niutou_ren

GGSRMYY-11（在基础数据导入导出中增加手术名称导入，导出功能）

在基础数据导入导出模块中，添加了对手术名称导入导出的支持

Options
    • too large
    ./java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -2
    • +3
    ./java/com/forgon/directory/service/OrgUnitManager.java
  3. … 6 more files in changeset.
Monday 02 Apr 2018
3:52 下午

adairkang

修改科室名称，同步修改申请科室、结算科室等的拼音码和五笔码
Options
    • too large
    ./java/com/forgon/directory/service/OrgUnitManagerImpl.java
11:20 上午

jeffli

今天本组装配记录页面优化

中山一院消毒供应项目ZSYY-232

Options
    • -1
    • +1
    ./java/com/forgon/databaseadapter/service/DateQueryAdapter.java
  2. … 2 more files in changeset.
Thursday 22 Mar 2018
11:06 上午

shuyongfu

解决Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • too large
    ./java/com/forgon/directory/service/OrgUnitManagerImpl.java
Wednesday 21 Mar 2018
7:00 下午

shuyongfu

解决Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • too large
    ./java/com/forgon/directory/service/OrgUnitManagerImpl.java
  2. … 1 more file in changeset.
5:23 下午

shuyongfu

处理Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • -4
    • +2
    ./java/com/forgon/directory/service/OrgUnitManager.java
    • too large
    ./java/com/forgon/directory/service/OrgUnitManagerImpl.java
  3. … 4 more files in changeset.
2:17 下午

chenjiaru

解决jira问题：GZSZYY-6 填写申请单时处理科室的优化
Options
    • too large
    ./java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -1
    • +3
    ./java/com/forgon/directory/action/OrgUnitAction.java
    • -1
    • +1
    ./java/com/forgon/directory/service/OrgUnitManager.java
  4. … 2 more files in changeset.
11:20 上午

shuyongfu

处理Jira问题:GZSZYY-6 填写申请单时处理科室的优化
Options
    • -0
    • +14
    ./java/com/forgon/directory/model/CssdServiceDepts.java
Monday 19 Mar 2018
9:06 下午

alan.lee

1. 虚拟篮筐初始化从999 增加到 9999.

2. 科室供应室保存时，给虚拟篮筐的供应室名和编码赋值

3. 新增4.9.15版本的sql

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

chenjiaru

对TousseItem的isTraceable属性的维护（升级脚本）
Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 1 more file in changeset.
Friday 16 Mar 2018
11:45 上午

adairkang

获取物品绑定，添加日志记录，以便查找偶尔绑定不成功的问题
Options
    • -0
    • +1
    ./java/com/forgon/log/model/Log.java
Tuesday 13 Mar 2018
11:00 上午

chenjiaru

在tousseItem冗余一个ancestorID（祖先包定义id）属性-升级脚本的提交
Options
    • -1
    • +1
    ./java/com/forgon/Constants.java
  2. … 1 more file in changeset.
Friday 09 Mar 2018
6:12 下午

jeffli

广州市中医院GZSZYY-2

标签模板增加包装人字段属性

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

adairkang

DGSFYBJY-12 申请数量与实际回收数量不一致时，修改后需要有修改痕迹

配置项默认为启用功能，旧项目配置为false，就不启用

Options
    • -9
    • +27
    ./java/com/forgon/security/service/UserManagerImpl.java
  2. … 67 more files in changeset.
Wednesday 07 Mar 2018
7:16 下午

chenjiaru

ExtJs框架的升级（代码的改造-combo设置默认值不成功的问题）
Options
    • -0
    • +7
    ./java/com/forgon/directory/service/OrgUnitManager.java
    • too large
    ./java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -2
    • +16
    ./java/com/forgon/directory/action/OrgUnitAction.java
  4. … 4 more files in changeset.
Saturday 10 Feb 2018
6:45 下午

ZhuangQinLiu

流程定义经测试代码测出的问题，已解决。
Options
    • -4
    • +3
    ./java/com/forgon/workflow/service/WorkFlowManagerImpl.java
    • -1
    • +1
    ./java/com/forgon/workflow/service/NodeDefinitionManagerImpl.java
Friday 09 Feb 2018
10:06 上午

adairkang

灭菌卸载扫描的保存及扫描方法，测试用例未成功运行
Options
    • -1
    • +4
    ./java/com/forgon/directory/model/BarcodeDevice.java
    • -0
    • +1
    ./java/com/forgon/log/model/Log.java
  3. … 6 more files in changeset.
Thursday 08 Feb 2018
8:49 下午

adairkang

由于依赖,移动一下位置
Options
  1. ./java/com/forgon/disinfectsystem/idpredicate
    • -0
    • +26
    ./java/com/forgon/disinfectsystem/idpredicate/IDPredicate.java
    • -0
    • +111
    ./java/com/forgon/disinfectsystem/idpredicate/IDOperators.java
    • -0
    • +10
    ./java/com/forgon/disinfectsystem/idpredicate/IDAble.java
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.