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
Wednesday 10 May 2017
10:18 上午

zhonghaowen

1.selenium科室申领调整返回修改，终止，删除功能的顺序

2.部分终止增加判断该下面是否有这个功能

Options
    • -12
    • +11
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -0
    • +186
    /ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyActionHelper.java
    • -16
    • +4
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboServiceImpl.java
    • -1
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ComboFillFormHandler.java
    • -1
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/apply/factory/ApplyGoodBoFactory.java
    • -12
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -167
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyHelper.java
    • -2
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/NormalFillFormHandler.java
    • -12
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
Tuesday 09 May 2017
5:06 下午

cherry

优化辅助发货可以发多条数据
Options
    • -0
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/Review.java
    • -22
    • +26
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java
11:01 上午

zhonghaowen

selenium科室申领新增省医版本3
Options
    • -1
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -13
    • +12
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboServiceImpl.java
    • -0
    • +39
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/GdsyApplyHandler3.java
    • -11
    • +13
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp
    • -0
    • +57
    /ssts-selenium-test/src/test/java/test_4_1/apply/adapter/ApplyServiceAdapter.java
    • -16
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboService.java
    • -25
    • +12
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ComboFillFormHandler.java
    • -0
    • +70
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/GdsyFillFormHandler3.java
    • -1
    • +4
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ChainConsumer.java
    • -5
    • +5
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/GdsyApplyHandler.java
    • -21
    • +11
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/NormalFillFormHandler.java
    • -15
    • +10
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
    • -18
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyService.java
    • -0
    • +5
    /ssts-selenium-test/src/test/java/test_4_1/apply/applyConstants/DeskIconEnum.java
  16. … 6 more files in changeset.
12:06 上午

shuyongfu

解决使用记录转换申请单合并及预回收合并后导致的申请项数据多出来的问题
Options
    • -1
    • +32
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
Monday 08 May 2017
11:58 下午

shuyongfu

解决jira问题:PYQZYY-154 系统里面显示的条码号和打印出来的条码号位数不一致
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
6:38 下午

cherry

1.all中增加辅助发货、器械包、消毒物品、敷料包、外来器械单独条码发货

2.all中增加灭菌装载删除已入框的条码，方便单独条码发货

3.回收及审核代码调整优化

Options
    • -33
    • +42
    /ssts-selenium-test/src/test/java/test_4_1/Disinfection.java
    • -2
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -3
    • +14
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -41
    • +42
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • -152
    • +190
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java
    • -60
    • +75
    /ssts-selenium-test/src/test/java/test_4_1/Review.java
6:22 下午

jeffli

解决：ZSYY-71

自定义装配打印标签后再从装配记录打印标签时包名称前面多出()

Options
    • -6
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
6:10 下午

shuyongfu

解决东莞中医院小标签2打印器械包时包名前面出现有两个科室名称的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
3:02 下午

zhonghaowen

selenium新增返回修改场景
Options
    • -51
    • +49
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ComboFillFormHandler.java
    • -0
    • +8
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
    • -29
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/OtherApplyHandler.java
    • -0
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/applyConstants/ApplyBtnEnum.java
    • -0
    • +11
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboServiceImpl.java
    • -0
    • +7
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
    • -24
    • +5
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ApplyHandler.java
    • -41
    • +5
    /ssts-selenium-test/src/test/java/test_4_1/apply/GdsyApplyTest.java
    • -19
    • +4
    /ssts-selenium-test/src/test/java/test_4_1/apply/ApplyTest.java
    • -49
    • +47
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/NormalFillFormHandler.java
    • -51
    • +4
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ChainConsumer.java
    • -11
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -20
    • +67
    /ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyHelper.java
    • -22
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/GdsyApplyHandler.java
    • -0
    • +14
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyService.java
  16. … 4 more files in changeset.
2:30 下午

shuyongfu

测试用例初始化基础数据时给聚合包配上处理科室
Options
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
Saturday 06 May 2017
1:50 下午

jeffli

自动化测试，辅助发货
Options
    • -0
    • +33
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java
Friday 05 May 2017
6:14 下午

zengjc

清洗记录干预，在干预信息提交前获取清洗记录的信息，准确地把干预前后信息写日志。
Options
    • -2
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • -1
    • +9
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -1
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
5:36 下午

chenjiaru

增加修改科室名称时联动修改手术间相对应的字段
Options
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -0
    • +8
    /ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java
4:56 下午

chenjiaru

处理空异常
Options
    • -2
    • +5
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomView.js
    • -41
    • +33
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationroom/service/OperationRoomManagerImpl.java
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
4:26 下午

zhonghaowen

修复xpIE8科室申领报错
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:13 下午

shuyongfu

陈国强发回来的东莞中医院现场打印配置文件
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
2:36 下午

zengjc

去掉无效的调试信息.
Options
    • -3
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
2:02 下午

zengjc

1.把能否修改清洗记录的判断放到提交保存之前,避免装配时间比清洗时间早时，选择提交缺还校验不通过的情况.

2.干预清洗记录信息(不是干预状态)添加日志.

Options
    • -0
    • +11
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -18
    • +13
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -1
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -1
    • +4
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -3
    • +22
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
1:55 下午

zengjc

修改干预清洗记录title的显示.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
1:51 下午

zhonghaowen

selenium科室申领增加终止场景
Options
    • -0
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/applyConstants/ApplyBtnEnum.java
    • -1
    • +12
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ComboFillFormHandler.java
    • -3
    • +22
    /ssts-selenium-test/src/test/java/test_4_1/apply/GdsyApplyTest.java
    • -1
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/apply/applyConstants/ActionEnum.java
    • -0
    • +4
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ApplyHandler.java
    • -1
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
    • -3
    • +9
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -18
    • +10
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/GdsyFillFormHandler.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectEndCause.jsp
    • -1
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
    • -10
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/GdsyApplyHandler.java
    • -0
    • +21
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -4
    • +26
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/ChainConsumer.java
    • -4
    • +18
    /ssts-selenium-test/src/test/java/test_4_1/apply/ApplyTest.java
    • -8
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/FillFormHandler.java
  16. … 5 more files in changeset.
11:43 上午

jeffli

自动化测试，自定义发货,等待仓库加载完成后开始扫描发货条码
Options
    • -0
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java
    • -0
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
11:26 上午

jeffli

自动化测试，自定义发货
Options
    • -0
    • +46
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java
11:09 上午

zhonghaowen

修改科室申领页面让该页面可以嵌入到iframe里
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
10:07 上午

adairkang

GDSRMYY-310 启用自定义入筐界面材料的清洗分类类型入筐配置
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
10:02 上午

adairkang

GDSRMYY-310 回收清点，自定义入筐界面中增加一键入筐按钮 添加材料按清洗分类类型及篮筐上限入筐
Options
    • -29
    • +152
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -0
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +9
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -0
    • +38
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Thursday 04 May 2017
8:11 下午

chenjiaru

增加注释
Options
    • -16
    • +38
    /forgon-core/src/main/java/com/forgon/treenode/ext/model/OperationRoomTreeNode.java
8:02 下午

zengjc

解决jira问题PYQZYY-153，当 前时间在清洗结束时间之后，则不允许再修改该清洗记录，增加清洗干预功能，在清洗记录篮筐的物品没有装配的情况下， 可以干预清洗记录，包括清洗记录的状态、添加和删除清洗篮筐，清洗时间、责任人等信息.
Options
    • -1
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +75
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +1584
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +270
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
    • -8
    • +61
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -0
    • +149
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -1
    • +15
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +14
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -3
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
    • -0
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
6:32 下午

shuyongfu

pda端手术预约发货数据过滤改为显示要发货的手术间的手术预约记录
Options
    • -0
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
5:28 下午

chenjiaru

解决jira问题：ZSYY-64 按照手术预约单手术间号建立基础数据
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomView.js
4:41 下午

jeffli

自动化测试，消毒物品固定条码发货，改为动态查询条码
Options
    • -1
    • +16
    /ssts-selenium-test/src/test/java/test_4_1/tools/SeleniumRuntimeData.java
    • -1
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java