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
Tuesday 20 Jun 2017
2:17 下午

zhonghaowen

解决DGZYY-105:借物管理功能中“处理科室”可以对借物单进行“已归还”操作
Options
    • -31
    • +52
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • -0
    • +265
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/result/LoadTousseLeaseItemsResultBuilder.java
    • -5
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/BorrowApplicationTest.java
  8. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/result
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -130
    • +12
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
1:54 下午

shuyongfu

解决添加科室的测试用例不通过的问题
Options
    • -2
    • +5
    /ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java
10:08 上午

jeffli

解决：GDSRMYY-336

装配管理界面的改进

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
Monday 19 Jun 2017
7:39 下午

shuyongfu

解决jira问题:ZSSZYY-105 登记使用记录时两个同名器械包植入物数量无法修改
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/setForeignTousseUseImplantView.js
    • -0
    • +105
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
7:25 下午

shuyongfu

把"匿名用户"封装公共的全局变量,以便于其它地方进行引用
Options
    • -3
    • +4
    /forgon-core/src/main/java/com/forgon/directory/acegi/tools/AcegiHelper.java
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/Constants.java
6:52 下午

zhonghaowen

修改returnCalculateIsDelivered方法
Options
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/DeliverManager.java
5:50 下午

shuyongfu

去掉仓库表的orgunitId字段
Options
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
4:33 下午

liuliben

材料调拨功能及测试用例
Options
    • -1
    • +0
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -17
    • +44
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -11
    • +36
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryItemManager.java
    • -1
    • +151
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java
    • -0
    • +25
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManager.java
    • -2
    • +141
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialEntryAction.java
    • -0
    • +1
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/material/AllTests.xml
    • -2
    • +3
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +65
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialEntryTableManager.java
    • -0
    • +77
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialAppropriationView.jsp
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntryItem.java
    • -21
    • +3
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
    • -1
    • +58
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryItemManagerImpl.java
    • -1
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • -10
    • +323
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -0
    • +806
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialAppropriationView.js
    • -1
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntry.java
4:22 下午

jeffli

解决bug：

装配完成后，没有自动聚焦到扫描篮筐条码处

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

jeffli

解决：GDSRMYY-315

装配界面，点"全选"，光标会闪烁几下再全选。

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

shuyongfu

陈国强发回来的东莞中医院现场配置
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
1:00 下午

liuliben

补上（增加材料是否停用字段）的测试用例代码
Options
    • -0
    • +61
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/DownToRetrieveMterialDefinitionManagerTest.java
11:57 上午

shuyongfu

陈国强发回来的东莞中医院现场配置
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
9:39 上午

chenguina

PDA更新至4.5.72
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.72_20170616.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.72_20170615.apk
9:38 上午

jeffli

解决：DGZYY-109

发货管理列表增加过滤功能

Options
    • -0
    • +19
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
    • -1
    • +106
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp
Saturday 17 Jun 2017
7:35 下午

chenjiaru

优化灭菌时扫描条码加载物品那一块的代码
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
6:07 下午

zengjc

修正测试用例的定义灭菌炉名称.
Options
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java
5:57 下午

zengjc

1.灭菌完全确认在后台判断是否已经确认，并且操作时对灭菌记录加速，防止同事提交事务时，完成确认多次。

2.添加灭菌完成确认库存校验的测试用例.

Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +55
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java
    • -0
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
4:26 下午

adairkang

不需要的引用,测试用的
Options
    • -1
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
4:20 下午

adairkang

陈国强返回的现场发货计划打印的配置
Options
    • -13
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
4:16 下午

adairkang

器械包库存操作，取消同步关键字，采用数据库锁包定义的方式来插入对象(保证插入的唯一)

添加灭菌和发货的综合测试用例

Options
    • -0
    • +16
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • -0
    • +7
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
  3. /ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic
    • -15
    • +41
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -0
    • +367
    /ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/SterileAndInvoiceTests.java
    • -7
    • +23
    /ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/tousseDefinition/TousseDefinitionDataProvider.java
    • -0
    • +1
    /ssts-web/src/test/resources/test/forgon/AllTests.xml
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • -0
    • +20
    /ssts-web/src/test/java/test/forgon/disinfectsystem/ThreadBase.java
    • -0
    • +9
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/synthetic/AllTests.xml
  11. /ssts-web/src/test/resources/test/forgon/disinfectsystem/synthetic
Friday 16 Jun 2017
6:50 下午

chenjiaru

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

cherry

1.一次性物品入库调大入库数量,使正常申请

2.优化调整

Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • -3
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/factory/WaitFactory.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java
4:21 下午

cherry

调整有误的医院名称
Options
    • -15
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/print/printConfig.js
    • -15
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/print/printConfig.js
3:25 下午

chenjiaru

解决jira问题：HZSRMYY-23 灭菌炉-今天审核的待灭菌物品列表优化
Options
    • -0
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManagerImpl.java
    • -9
    • +30
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManager.java
2:31 下午

jeffli

装配扫描带标识牌的篮筐后，选中包，并且显示标识牌条码输入框
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:27 下午

zhonghaowen

解决HZSRMYY-24:申领单预览列表优化
Options
    • -0
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ApplicationItemVO.java
    • -0
    • +40
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/factory/DeliverManagerFactory.java
    • -0
    • +42
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/DeliverTousseManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +21
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/DeliverOtherManagerImpl.java
    • -0
    • +35
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/DeliverManager.java
  8. /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/factory
    • -0
    • +20
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecycleDeliverManagerImpl.java
10:53 上午

jeffli

解决：ZSYY-86

装配任务界面中扫描清洗篮筐后自动默认勾选第一个包信息

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
9:37 上午

chenguina

PDA版本更新至4.5.72
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.72_20170615.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.72_20170613.apk
    • -1
    • +1
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
8:54 上午

shuyongfu

解决使用记录测试用例通不过的问题
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java