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
Monday 24 Jul 2017
6:27 下午

adairkang

HZSRMYY-26 科室申领里面查看不到【回收申请单】的数量明细及优化 回收部分处理
Options
    • -0
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • -4
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -0
    • +14
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManager.java
    • -4
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java
    • -1
    • +77
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +45
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
    • -26
    • +40
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationComparator.java
    • -91
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -12
    • +9
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dto/TousseItemDto.java
5:15 下午

cherry

增加js等待
Options
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
3:47 下午

adairkang

注释
Options
    • -37
    • +111
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
12:07 下午

zengjc

修正设备维护报表设备名称和耗材名称调换的问题.
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/deviceMaintenance.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/deviceMaintenance.jasper
Sunday 23 Jul 2017
10:29 下午

terrykwan

捕获JavascriptException，忽略该异常
Options
    • -2
    • +10
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/JSWaiter.java
8:38 上午

terrykwan

findByAwait方法增加等待页面加载的代码，避免页面没加载完，就查找，导致不稳定的问题
Options
    • -0
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
Friday 21 Jul 2017
5:50 下午

cherry

增加回收的判断
Options
    • -3
    • +10
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
5:20 下午

adairkang

重构
Options
    • -8
    • +10
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAProxyTousseGoodsInvoiceManager.java
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • -7
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java
    • -4
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADisinfectGoodsInvoiceManager.java
    • -3
    • +3
    /ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -3
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADiposableGoodsInvoiceManager.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerTests.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java
    • -5
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java
    • -5
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
    • -2
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManager.java
5:03 下午

adairkang

重构
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -16
    • +24
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
    • -2
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManager.java
    • -1
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -6
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
    • -7
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
3:17 下午

adairkang

js依赖
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
1:46 下午

zhonghaowen

修复满意度调查自定义表单脚本报错
Options
    • -1
    • +6
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableWinForm.js
11:42 上午

cherry

误注释的代码

Options
    • -134
    • +67
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
11:39 上午

cherry

登录不稳定 去掉登录判断
Options
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -48
    • +52
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -2
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
11:12 上午

adairkang

注释
Options
    • -1
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
11:02 上午

zengjc

修复导入测试用例通不过的问题.
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataTest.xls
10:35 上午

adairkang

修改颜色
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
10:16 上午

adairkang

中大附一手术预约打印的修改
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
Thursday 20 Jul 2017
10:01 下午

adairkang

CDSWYYY-1 打印发货单（器械包）按包名合并功能，合并不了
Options
    • -12
    • +12
    /ssts-datasync-settlement-gyey-impl/src/main/java/com/forgon/disinfectsystem/settlement/service/SettlementWriteBackManagerImplForGYEY.java
    • -36
    • +36
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -5
    • +17
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
6:16 下午

yanweining

GXZYYFY-18：一次性物品库存页面，搜索不能使用英文搜索物品解决
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
5:59 下午

cherry

1.去掉没有调用的元素定义

2.优化调整代码

Options
    • -92
    • +92
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java
    • -78
    • +98
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • -7
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/JSWaiter.java
    • -41
    • +39
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
    • -3
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/PackingHistory.java
    • -72
    • +62
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
    • -7
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • -7
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Materials_Godown_Entry.java
    • -3
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java
    • -128
    • +132
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -9
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java
    • -260
    • +234
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
    • -35
    • +35
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
4:16 下午

shuyongfu

陈国强发回来的中大附一现场配置文件config.js
Options
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
4:14 下午

shuyongfu

李健平发回来的成都市龙泉驿区第一人民医院现场打印配置
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
4:02 下午

shuyongfu

解决jira问题:CDSWYYY-2 【使用记录】增加洗手护士和主刀医生
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/config.js
    • -2
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -1
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
2:33 下午

chenjiaru

解决jira问题：成都市龙泉驿区第一人民医院CDSLQYQYYY-12 器械包规格大小统计
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/tousseSpecificationSizeStatistics.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseSpecificationSizeStatistics.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:56 上午

zengjc

解决jira问题CDSLQYQYYY-16，器械包导入导出模板‘否打印科室’改为‘打印科室来源’。
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • -2
    • +2
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
11:09 上午

chenjiaru

解决jira问题：成都市龙泉驿区第一人民医院CDSLQYQYYY-12 器械包规格大小统计
Options
    • -20
    • +24
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -10
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.js
  3. /ssts-web/src/main/webapp/disinfectsystem/extStoreHelper
    • -5
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -2
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
    • -0
    • +10
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -1
    • +13
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -6
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.jsp
    • -7
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/reportoption/GoodsOptionManagerImpl.java
    • -0
    • +101
    /ssts-web/src/main/webapp/jasperRtp/tousseSpecificationSizeStatistics.jrxml
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -1
    • +12
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +47
    /ssts-web/src/main/webapp/jasperRtp/tousseSpecificationSizeStatistics_child.jrxml
    • -11
    • +28
    /forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
  16. … 23 more files in changeset.
10:29 上午

adairkang

ZSYKZX-70 回收清点待回收列表增加预回收后的颜色改变。
Options
    • -2
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroup.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Wednesday 19 Jul 2017
4:41 下午

shuyongfu

解决jira问题:ZSSZYY-110 使用记录的快速回收按钮需要隐藏,客户用不上此功能,防止误点 增加新的配置项
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
4:13 下午

jeffli

同步陈国强现场修改，有一定隐患，包名字可能会超出范围（陈国强 16:12:06

现在用小标签的包名字都是字少的，等以后如果有字多的再调整。）

Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
3:50 下午

chenguina

PDA版本更新至4.5.78
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.76_20170711.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.78_20170719.apk