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 10 Aug 2017
10:46 上午

liuliben

材料,器械包,外来器械的停用显示取消添加功能。添加取消停用功能
Options
    • -0
    • +40
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp
    • -0
    • +39
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
    • -0
    • +39
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
    • -1
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • -0
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
9:24 上午

cherry

增加深圳中医院的配置，罗乐要求按广西的配置复制
Options
  1. /ssts-web/src/main/resources/spring/projects/szszyy
    • -0
    • +23
    /ssts-web/src/main/resources/config/szszyy/mybatis/FindPatientInfoByTreatmentNumMapper_xh.xml
  3. /ssts-web/src/main/webapp/disinfectsystem/config/szszyy/print
    • -0
    • +39
    /ssts-web/src/main/resources/config/szszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +22
    /ssts-web/src/main/resources/config/szszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +29
    /ssts-web/src/main/resources/config/szszyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -0
    • +1042
    /ssts-web/src/main/webapp/disinfectsystem/config/szszyy/print/printConfig.js
    • -0
    • +106
    /ssts-web/src/main/resources/spring/projects/szszyy/HIS.xml
  9. /ssts-web/src/main/resources/config/szszyy/mybatis
    • -0
    • +35
    /ssts-web/src/main/resources/config/szszyy/mybatis/FindPatientInfoByHospitalNumMapper_xh.xml
    • -0
    • +106
    /ssts-web/src/main/resources/spring/projects/szszyy/HIS_xh.xml
  12. /ssts-web/src/main/resources/config/szszyy
  13. /ssts-web/src/main/webapp/disinfectsystem/config/szszyy
    • -0
    • +37
    /ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js
    • -0
    • +75
    /ssts-web/src/main/resources/spring/projects/szszyy/timer.xml
  16. … 3 more files in changeset.
Wednesday 09 Aug 2017
8:49 下午

jeffli

解决：ZSSZYY-107

在器械包信息界面看到器械包的任务组不是装配对应时的那个任务组

Options
    • -0
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.8.7_4.8.8.sql
8:49 下午

jeffli

解决：ZSSZYY-107

在器械包信息界面看到器械包的任务组不是装配对应时的那个任务组

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -4
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
3:43 下午

jeffli

修改佛山妇幼标识牌样式
Options
    • -16
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/print/printConfig.js
3:15 下午

jeffli

解决：GDSRMYY-354

外来器械小标签上增加‘植入物’文字标识

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -9
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
3:15 下午

zengjc

解决jira问题DGZYY-112，东莞中医院年度消毒供应中心工作量统计报表调整。
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:11 下午

cherry

增加fluentWaitUntilFind的判断
Options
    • -0
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
2:50 下午

cherry

聚合包下拉选择由点击换成键盘下按
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
11:30 上午

adairkang

外部代理灭菌没有"包"字

添加外来器械拆分小包的类型

问题:如果有外部代理灭菌包申请单，在下一页的时候，会看不到外部代理灭菌包申请单。外来器械申请单有拆包的情况也有这样的问题

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
Tuesday 08 Aug 2017
8:50 下午

adairkang

记住回收人太宽导致清除按钮无法点击
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
8:19 下午

jeffli

修复聚合包装配测试用例
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
3:41 下午

jeffli

聚合包装配，继续装配后，清空器械包列表
Options
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
2:32 下午

liuliben

解决材料管理导出后台报错
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/exportMaterials.jsp
1:45 下午

jeffli

解决：ZSYY-110

聚合包功能优化改进

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
    • -121
    • +218
    /ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
    • -0
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -1
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
Monday 07 Aug 2017
9:01 下午

zengjc

解决jira问题ZSYY-112，一次性物品基础数据导入导出增加“包装规格”字段.
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataTest.xls
5:24 下午

zengjc

材料的导入导出，添加“是否停用”属性.
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataTest.xls
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
4:00 下午

liuliben

4.1添加停用材料功能模块
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp
    • -0
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/dwr/table/MaterialDefinitionTableManager.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -1
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
2:25 下午

zengjc

同步4.0代码，中山六院的年度消毒工作中心统计报表，添加腔镜器械，下收下送次数统计。
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsly/config.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jasper
    • -2
    • +6
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -38
    • +4
    /ssts-web/src/main/webapp/jasperRtp/yearWorkloadReport2.jrxml
12:10 下午

terrykwan

增加删掉32位IE浏览器的语句
Options
    • -1
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
Sunday 06 Aug 2017
10:48 下午

terrykwan

去掉一次性物品测试的一部分休眠延迟的代码
Options
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
10:48 下午

terrykwan

去掉灭菌中的一些休眠的代码
Options
    • -7
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
10:47 下午

terrykwan

代码优化
Options
    • -11
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyActionHelper.java
    • -20
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
10:44 下午

terrykwan

延长超时时间
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/JSWaiter.java
Saturday 05 Aug 2017
11:10 上午

chenjiaru

修改注释代码
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.js
11:02 上午

chenjiaru

修改文件名称，此次提交没有改动代码
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.jsp
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
Friday 04 Aug 2017
9:43 下午

adairkang

ZSYY-114 PC回收页面的科室过滤BUG
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
6:10 下午

zengjc

中大附一工作量持续收集统计报表，总数没有也把发生数统计上来.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:10 下午

zengjc

修复中大附一工作量持续收集统计报表普通器械统计数量不对等问题.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:02 下午

zengjc

中大附一工作量持续收集统计报表的问题修正。
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java