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 20 Sep 2017
6:22 下午

cherry

增加二级装配添加质量监测及领用的场景
Options
    • -2
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java
    • -1
    • +14
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -35
    • +38
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • -0
    • +25
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
5:55 下午

adairkang

ZSYY-139 快速回收页面优化 添加快速回收的一键入筐，有配置项，中大附一开启
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -3
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
4:52 下午

jeffli

解决bug：

取消勾选所有装配任务后，标识牌条码未显示出来

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
4:18 下午

adairkang

ZSYY-139 快速回收页面优化 添加器械包分组过滤

科室分组和器械包分组代码重构

Options
    • -1
    • +1
    /ssts-print/src/main/java/com/forgon/disinfectsystem/printRecyclingApplicationConfig/service/PrintConfigManagerImpl.java
    • -4
    • +2
    /ssts-print/src/main/java/com/forgon/disinfectsystem/printinvoiceconfig/service/PrintInvoiceConfigManagerImpl.java
    • -11
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -17
    • +49
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -4
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java
    • -3
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/action/DepartmentGroupAction.java
    • -4
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/service/TousseGroupManager.java
    • -18
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/selectTousseGroup.jsp
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +12
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ExpressRecyclingVo.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -6
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/action/TousseGroupAction.java
3:35 下午

adairkang

还原9月1日修改的bug（19828开始）
Options
    • -2
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
3:31 下午

yanweining

hrp申请单明细修改

Options
    • -24
    • +6
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpTousseItem.java
3:30 下午

jeffli

如果是扫了清洗篮筐装配后，标识牌条码输入框又被隐藏了。

直接扫描标识牌条码进行装配的，扫描条码后，界面没显示使用次数。

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:51 下午

yanweining

hrp申请单vo修改
Options
    • -7
    • +7
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpTousseItem.java
    • -1
    • +2
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java
1:40 下午

adairkang

注释
Options
    • -4
    • +8
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ExpressRecyclingVo.java
11:38 上午

adairkang

重构，invoicePlan是否已读状态的判断
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
11:07 上午

adairkang

重构，添加注释
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -1
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
10:48 上午

adairkang

重构
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
10:45 上午

adairkang

局部变量重命名
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
10:07 上午

jeffli

优化发货状态计算的逻辑

重构发货计划和发货物品过滤的代码

Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoicePlanManagerTest.java
10:06 上午

jeffli

优化发货状态计算的逻辑

重构发货计划和发货物品过滤的代码

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -13
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +65
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemUtils.java
10:05 上午

adairkang

ZJYY-4 回收记录单页面增加保存并打印包内清点按钮
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
Tuesday 19 Sep 2017
9:32 下午

adairkang

局部变量重命名
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
9:24 下午

yanweining

添加hrp申请单vo
Options
    • -0
    • +91
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpTousseItem.java
    • -0
    • +81
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java
7:54 下午

adairkang

ZJYY-4 回收记录单页面增加保存并打印包内清点按钮 修改按钮图片 科室申领修改是否植入物后，打印也修改
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/btn-box.jpg
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
6:39 下午

zengjc

清洗机灭菌炉洁定接口的开发的完成， 目前只有中六进行配置.
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • -0
    • +18
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsly/config.js
    • -0
    • +598
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
    • -0
    • +10
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
    • -0
    • +1
    /ssts-web/src/main/resources/spring/projects/zsly/timer.xml
6:13 下午

adairkang

只有外来器械申请单才有保存并打印。二次回收的合单的，可以不打印，不合单的，也会有打印按钮
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
6:05 下午

adairkang

外来器械名称样式
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
6:03 下午

chenjiaru

解决jira问题：FSFY-4 手术室等离子灭菌炉不能自动完成灭菌
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
5:58 下午

adairkang

ZJYY-4 回收记录单页面增加保存并打印包内清点按钮
Options
    • -40
    • +45
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
3:42 下午

chenjiaru

修改字段名称
Options
    • -7
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
2:58 下午

adairkang

ZJYY-4 回收记录单页面增加保存并打印包内清点按钮
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/action/BeCleanItemAction.java
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
    • -0
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingMaterialsTest.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -0
    • +34
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintItem.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +137
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintData.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +7
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -3
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
  16. … 4 more files in changeset.
2:13 下午

chenjiaru

解决jira问题：FSFY-4 手术室等离子灭菌炉不能自动完成灭菌
Options
    • -15
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
10:26 上午

liuliben

解决器械包定义添加材料重复问题
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -7
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
Monday 18 Sep 2017
6:46 下午

cherry

1.增加退货后发货场景

2.优化登录代码

Options
    • -14
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -64
    • +80
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
5:19 下午

liuliben

解决基础数据导入一次性物品重复问题
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java