forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

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
Thursday 20 Apr 2017
2:09 下午

adairkang

器械交接的功能，添加合单及加急等级的选择，针对PDA
Options
    • -0
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManager.java
    • -6
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/dwr/TaskGroupTableManager.java
    • -1
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManager.java
    • -4
    • +8
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
  5. /ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service
    • -0
    • +20
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -0
    • +1
    /ssts-web/src/test/resources/test/forgon/AllTests.xml
    • -1
    • +6
    /ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • -9
    • +52
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionItem.java
    • -11
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
    • -1
    • +39
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java
  13. /ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition
    • -0
    • +140
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
  16. … 33 more files in changeset.
1:33 下午

shuyongfu

解决jira问题:ZSYY-56 PC端上使用记录显示列表增加手术间号
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
11:59 上午

shuyongfu

解决jira问题:ZSYY-19 手术预约管理列表内容调整
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
11:36 上午

cherry

一些调整
Options
    • -0
    • +4
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -2
    • +9
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
    • -12
    • +9
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -19
    • +29
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • -2
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
11:05 上午

zhonghaowen

selenium修改获取处理科室的方法,和把查找节点的等待时间改成1秒
Options
    • -1
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyHelper.java
    • -1
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -6
    • +0
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
10:49 上午

zengjc

解决jira问题CSSZXYY-122，年度消毒中心指标工作量统计报表，添加灭菌无菌包数”和“灭菌外来手术器械包数”两个字段.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:13 上午

zhonghaowen

修复selenium省医环境下连续申请外来器械包失败
Options
    • -6
    • +6
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
12:53 上午

shuyongfu

解决灭菌完成单线程和多线程的测试用例在sqlserver和oracle不能全部通过的问题
Options
    • -17
    • +49
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForCompleteSterileRecord.java
Wednesday 19 Apr 2017
9:53 下午

chenjiaru

解决jira问题;HDQRMYY-29 【明细核算月报全部器械】与【器械包工作量统计报表发货列】数据对不上
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:36 下午

shuyongfu

使用记录转换申请单生成预回收申请单及明细数据
Options
    • -11
    • +38
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/BorrowApplicationTest.java
6:04 下午

zhonghaowen

selenium修改判断表单提交后的结果
Options
    • -4
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ApplyHandler.java
    • -1
    • +6
    /ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyHelper.java
    • -4
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/FillFormHandler.java
5:40 下午

zhonghaowen

1.selenium外来器械申请单填写文本框改成用id来获取

2.修改utils的findByAwaitAndSend方法

Options
    • -2
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/BorrowApplyServiceImpl.java
    • -14
    • +13
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
    • -3
    • +5
    /ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyHelper.java
    • -8
    • +8
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
5:38 下午

chenjiaru

解决jira问题：HDQRMYY-29 【明细核算月报全部器械】与【器械包工作量统计报表发货列】数据对不上
Options
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
4:40 下午

wangyi

部分完成：CDSLQYQYYY-7，，回收器械包设置备注信息
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +7
    /forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
4:15 下午

zhonghaowen

修改selenium工具类初始化的等待时间
Options
    • -8
    • +7
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
4:01 下午

zhonghaowen

科室申领自动化测试增加多申请一张外来器械申请单
Options
    • -1
    • +5
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
    • -2
    • +6
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
2:51 下午

zhonghaowen

科室申领自动化测试代码提交
Options
    • -0
    • +51
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/FillFormHandler.java
  2. /ssts-selenium-test/src/test/java/test_4_1/apply/chain
    • -128
    • +5
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -260
    • +76
    /ssts-selenium-test/src/test/java/test_4_1/apply/ApplyTest.java
  5. /ssts-selenium-test/src/test/java/test_4_1/apply/factory
    • -0
    • +45
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ApplyHandler.java
    • -10
    • +65
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -2
    • +4
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboService.java
    • -0
    • +160
    /ssts-selenium-test/src/test/java/test_4_1/apply/GdsyApplyTest.java
    • -0
    • +50
    /ssts-selenium-test/src/test/java/test_4_1/apply/applyConstants/DeskIconEnum.java
    • -3
    • +32
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyService.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • -40
    • +74
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
    • -35
    • +142
    /ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyHelper.java
    • -0
    • +96
    /ssts-selenium-test/src/test/java/test_4_1/apply/factory/ApplyGoodBoFactory.java
  16. … 16 more files in changeset.
2:04 下午

shuyongfu

使用记录转换申请单生成预回收申请单及明细数据
Options
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManagerImpl.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -26
    • +86
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlanItem.java
11:30 上午

zengjc

解决jira问题ZSYY-52,质量监测月报的查询可以根据责任环节查询，责任环节的查询和根据监测项的查询是互斥的关系.
Options
    • -1
    • +8
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManager.java
    • -0
    • +15
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
    • -4
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp
    • -2
    • +3
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
Tuesday 18 Apr 2017
9:39 下午

adairkang

加急等级的PO类及Manager类
Options
  1. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManager.java
  3. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent
  4. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service
    • -0
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/dwr/UrgentLevelTableManager.java
  6. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/dwr
    • -0
    • +40
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
    • -0
    • +62
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java
  9. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent
    • -0
    • +51
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/action/UrgentLevelAction.java
9:32 下午

adairkang

添加器械交接bean的配置
Options
    • -1
    • +52
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
9:08 下午

shuyongfu

解决oracle消毒物品测试用例通不过的问题
Options
    • -14
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java
6:26 下午

chenjiaru

解决jira问题：ZSSZYY-102 发货单Item对应的器械包实例为空bug
Options
    • -5
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +97
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
6:24 下午

cherry

优化代码

Options
    • -2
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
6:23 下午

cherry

优化代码 增加等待页面加载
Options
    • -1
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • -2
    • +7
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -0
    • +8
    /ssts-selenium-test/src/test/java/test_4_1/Apply.java
6:13 下午

jeffli

解决：ZSYY-61

自定义装配的标识牌名称字符长度需要加大否则无法打印标签

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
5:43 下午

wangyi

修复删除清洗记录时，如果篮筐实例并非最新的篮筐实例，这个时候不能回滚篮筐状态
Options
    • -0
    • +17
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
5:37 下午

shuyongfu

测试用例性能优化调整:测试用例的基础数据初始化插入由容器启动时调用一次不需要每个测试方法运行都全删除然后再插入、每运行一个测试用例方法仅删除业务数据表的数据,不删除基础数据

清洗机与清洗程序、灭菌炉与灭菌程序的中间表基础数据不能删除

Options
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
5:33 下午

adairkang

修改注释
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionItem.java
    • -1
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManager.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManager.java
4:34 下午

zengjc

解决jira问题DGDHYY-104，质量监测、定期监测项定义添加排序号，用户可以定义监测项的排序.
Options
    • -0
    • +1
    /ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java
    • -0
    • +1
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinition.java
    • -2
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js