forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 58
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 58
Total Lines of Code (LoC): 4,712,442
Net change in LoC this week: 1,934

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

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 25 Oct 2017
8:58 下午

adairkang

清洗篮筐状态的处理及测试用例

在清洗完成的时候，如果篮筐为空，则状态变成空闲。

如果清洗失败，即使篮筐为空，状态也会回滚到清洗装载，在重新清洗完成后变成空闲

在删除装配任务的时候(手动删除装配任务或者终止申请单、终止申请单中的物品），如果篮筐为空并且是清洗完成状态，则状态变为装配完成。

Options
    • -20
    • +23
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -1
    • +13
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
    • -0
    • +347
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManager.java
    • -0
    • +48
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerManagerTests.java
    • -2
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • -1
    • +2
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/recyclingrecord/AllTests.xml
    • -0
    • +7
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -11
    • +8
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -0
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
6:05 下午

cherry

1.增加回收终止的场景

2.all中的after方法统一用afterMethod方法

Options
    • -9
    • +14
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -0
    • +42
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
4:24 下午

chenjiaru

把科室申领模板的“排序”属性改成“序号”
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js
3:14 下午

adairkang

删除装配任务，同时重新设置未装配数量。否则在装配完成以后，父结点删除不了
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:01 下午

adairkang

过滤的选择筐调整字体大小
Options
    • -10
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
1:58 下午

cherry

针对材料退货的优化
Options
    • -19
    • +41
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java
11:50 上午

shuyongfu

解决清远市人民医院使用记录按住院号同步病人返回多条数据未成功显示的问题
Options
    • -5
    • +13
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/FindPatientInfoByHospitalNumDaoImpl.java
11:06 上午

adairkang

装配的代码修改，测试用例需要调整
Options
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketsRecyclingSequenceTests.java
10:26 上午

adairkang

注释掉不用的代码
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
10:25 上午

adairkang

装配拆包总数的判断
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
8:51 上午

jeffli

解决bug：

外来器械拆包装配，没有篮筐序号时总数计算会有问题

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Tuesday 24 Oct 2017
10:18 下午

chenjiaru

解决jira问题：ZSYY-154 科室申领模板定义优化
Options
    • -2
    • +10
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -10
    • +16
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateForm.js
    • -0
    • +1
    /ssts-web/src/main/resources/strtus_oa.xml
6:39 下午

shuyongfu

聚合包是否可以录使用记录的判断调整,已使用状态的聚合包也可以录入
Options
    • -1
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
6:38 下午

alan.lee

权限分配页面， 选中/反选 小big修复~
Options
    • -2
    • +7
    /ssts-web/src/main/webapp/systemmanage/operationFormByExt.jsp
6:11 下午

alan.lee

1. 权限分配页面，如果子权限全部选中，那么就将父模块复选框勾选

2. 权限分配页面，如果有任何一个子权限取消了勾选，那么就将父模块复选框取消勾选

Options
    • -1
    • +35
    /ssts-web/src/main/webapp/systemmanage/operationFormByExt.jsp
5:54 下午

adairkang

重构清洗记录Manager类的根据id查找的方法
Options
    • -1
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -12
    • +5
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -2
    • +0
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java
    • -1
    • +1
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • -1
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
5:18 下午

shuyongfu

解决jira问题:JMKQYY-5 聚合包录入使用记录的功能细化,增加对录入使用数量的子包进行转换申请单的申请项
Options
    • -51
    • +201
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
5:12 下午

cherry

优化中大附一在装配屏蔽[拆包]按钮
Options
    • -46
    • +75
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
4:52 下午

adairkang

外来器械装配，已扫描篮筐条码传递到后台

外来器械拆包，前台传入的拆包，只会在一个装配任务上。所以循环遍历装配任务使用拆包信息后，将拆包内容置空，避免重复装配

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
3:58 下午

alan.lee

JMKQYY-6 权限管理优化 ，解决在IE下失效的问题
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/systemmanage/operationFormByExt.jsp
3:15 下午

adairkang

检查非空，防止js报错
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
3:08 下午

shuyongfu

广东省医库存对比功能优化调整
Options
    • -4
    • +4
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
3:07 下午

shuyongfu

解决jira问题:JMKQYY-5 聚合包录入使用记录的功能细化
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -61
    • +92
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordActionBase.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +1
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
    • -5
    • +30
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -0
    • +123
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/SubComboTousseUseRecord.java
    • -1
    • +11
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • -0
    • +58
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/jmkqyy/config.js
    • -85
    • +173
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
3:07 下午

adairkang

根据科室供应室获取装配任务，不处理外来器械和自定义器械

外来器械拆包部分装配，只针对拆包的情况，没有拆包的，还是全部装配

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
12:55 下午

shuyongfu

解决所同步的平台该用户与组织关系数据与我们系统一致,但用户基本信息发生改变的时同步未修改的问题
Options
    • -2
    • +6
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
10:33 上午

chenjiaru

HDQRMYY-36 质量监测管理，外部代理灭菌器械类型的也要可以登记
Options
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/RecyclingApplicationManagerTests.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
10:24 上午

chenjiaru

删掉没用的方法
Options
    • -5
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
10:17 上午

alan.lee

权限管理优化，在所有的功能权限的最前面，加一个全选、反选的按钮
Options
    • -3
    • +27
    /ssts-web/src/main/webapp/systemmanage/operationFormByExt.jsp
8:56 上午

shuyongfu

解决所同步的平台该用户与组织关系数据与我们系统一致,但用户基本信息发生改变的时同步未修改的问题
Options
    • -2
    • +9
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
Monday 23 Oct 2017
9:19 下午

adairkang

装配任务是否入多个清洗篮筐的判断

外来器械只有入了多个篮筐才会有自动拆分的功能

外来器械自定义入筐，换筐的处理

Options
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java