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
Sunday 14 May 2017
6:00 下午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jasper
    • -0
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp
    • -0
    • +434
    /ssts-web/src/main/webapp/jasperRtp/urgentNeedGoodsProcessingCycle.jrxml
    • -1
    • +12
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -0
    • +184
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UrgentNeedGoodsProcessingCycle.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +158
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +11
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
4:45 下午

adairkang

修复材料入筐的测试用例
Options
    • -10
    • +17
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java
Saturday 13 May 2017
11:03 上午

chenjiaru

规范文件的命名
Options
    • -0
    • +197
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoiceView.js
    • -197
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoice.js
    • -0
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoiceView.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -26
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoice.jsp
Friday 12 May 2017
5:31 下午

zengjc

待清洗篮筐列表，不添加重复的篮筐条码，避免清洗界面的待清洗篮筐列表出现重复的篮筐.
Options
    • -0
    • +8
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
3:44 下午

chenjiaru

解决jira问题：ZSYY-67 发货管理增加手术排班物品发放查询
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:41 下午

cherry

去掉误注释的代码
Options
    • -117
    • +112
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
2:06 下午

adairkang

中山一院默认启用使用记录快速回收
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
1:52 下午

chenjiaru

解决jira问题：ZSYY-67 发货管理增加手术排班物品发放查询
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child.jasper
    • -1
    • +4
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1.jrxml
    • -0
    • +3
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jrxml
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child_child.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child.jasper
1:48 下午

jeffli

解决：HZSRMYY-20

发货管理列表位置调整

Options
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
12:04 下午

zengjc

修正触摸屏清洗，清洗机没有默认清洗程序出现提示的问题.
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
11:42 上午

zengjc

去掉触摸屏清洗页面无效的提示.
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
11:36 上午

chenjiaru

解决jira问题：ZSYY-67 发货管理增加手术排班物品发放查询
Options
    • -3
    • +1
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jasper
    • -3
    • +1
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1.jrxml
    • -3
    • +1
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child.jasper
    • -3
    • +1
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child.jrxml
11:06 上午

zengjc

触摸屏清洗，扫描清洗机条码，带出默认的清洗程序和清洗时间.
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp
    • -0
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
    • -0
    • +2
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
11:00 上午

jeffli

手术预约发货界面，grid增加id，方便selenium测试
Options
    • -0
    • +52
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
10:04 上午

zengjc

扫描清洗机条码，带出默认的清洗程序、清洗时间和清洗参数.
Options
    • -0
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
9:41 上午

chenjiaru

解决jira问题：ZSYY-67 发货管理增加手术排班物品发放查询
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child_child.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child_child.jasper
Thursday 11 May 2017
9:44 下午

adairkang

ZSYY-54 PDA的使用记录录入界面增加快速回收功能
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -1
    • +1
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
6:40 下午

cherry

1.修改初始化数据“雾化器”的任务组为术科组，原来“器械组”不存在无法使用，请注意是否影响单元测试

2.修改初始化数据“Test钳子”的清洗装载上限为80，原来上限60，申请的单多了就没法用一个篮筐装载完，请注意是否影响单元测试

3.修改回收确认以适应中大附一的回收丢失报损自动确认

Options
    • -10
    • +19
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • -34
    • +35
    /ssts-selenium-test/src/test/java/test_4_1/Login.java
    • -5
    • +7
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -111
    • +117
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -1
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/Wash.java
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
6:00 下午

zengjc

解决jira问题HZSRMYY-21，清洗机可以配置默认的清洗程序，在添加清洗记录的界面选择清洗机是，如果有默认清洗程序则显示，也会带出相关的清洗时间和清洗参数.
Options
    • -0
    • +27
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
    • -0
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -1
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
4:34 下午

chenjiaru

调整“手术排班物品查询”报表的默认查询时间
Options
    • -5
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoice.js
3:25 下午

chenjiaru

解决jira问题：ZSYY-67 发货管理增加手术排班物品发放查询
Options
    • -0
    • +38
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/OperationReservationDetail_main.java
    • -0
    • +144
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1.jrxml
    • -0
    • +23
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -1
    • +12
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +76
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/OperationReservationSum_child_child.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child.jasper
    • -0
    • +53
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/OperationReservationSum_child.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child_child.jasper
    • -0
    • +51
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/OperationReservationDetail_child.java
    • -0
    • +58
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1_child.jrxml
    • -0
    • +55
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice1.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
  16. … 12 more files in changeset.
3:13 下午

shuyongfu

解决使用记录选择不用转申请单或不用回收的物品时进行快速回收时报错的问题
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:45 上午

zengjc

修改质量监测扫描责任人方法名，避免跟清洗页面的冲突，导致清洗 页面扫描责任人出错.
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
9:49 上午

jeffli

解决：SZNSRMYY-1

外部代理灭菌打印模板需要打印，增加制作者审核者。

Options
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
Wednesday 10 May 2017
9:12 下午

shuyongfu

解决jira问题:GDSRMYY-312 省医增加单点登录功能
Options
    • -0
    • +1
    /build.gradle
    • -0
    • +96
    /ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-gdsy.xml.back
    • -1
    • +1
    /ssts-web/build.gradle
    • -0
    • +44
    /ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter/RequestHeaderAuthenticationFilter.java
    • -0
    • +41
    /ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/handler/AuthenticationSuccessHandlerForGdsy.java
8:48 下午

adairkang

ZSWY-74 点击待回收单进行回收时允许修改科室,历史回收记录如果是可以修改科室的话需要进行屏蔽
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
8:38 下午

adairkang

ZSWY-74 点击待回收单进行回收时允许修改科室,历史回收记录如果是可以修改科室的话需要进行屏蔽
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:44 下午

zhonghaowen

修改tryToCloseWarningWindow方法
Options
    • -0
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
5:04 下午

zhonghaowen

省医版本3申领物品增加消毒物品
Options
    • -1
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/apply/factory/ApplyGoodBoFactory.java
    • -0
    • +71
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/Gdsy3ApplyServiceImpl.java
    • -2
    • +0
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
    • -7
    • +7
    /ssts-selenium-test/src/test/java/test_4_1/apply/chain/GdsyFillFormHandler3.java
4:55 下午

zhonghaowen

selenium修改登录后关闭弹窗的代码
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -15
    • +8
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java