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 22 Jan 2017
2:43 下午

wangyi

新增装配聚合包功能
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +669
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/ComboToussePackingTests.java
    • -0
    • +3
    /ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
    • -0
    • +940
    /ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
    • -0
    • +64
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -0
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +3
    /ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -0
    • +14
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • -0
    • +3
    /ssts-web/src/main/webapp/ext/fontSize17/styles/common.css
    • -0
    • +18
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
2:33 下午

shuyongfu

解决jira问题:ZSSZYY-83 使用记录扫描条码时，最新扫描的条码在最上方，并记住排序
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:38 上午

shuyongfu

修改中山市中医院的配置项:当外来器械未归还时能否申请改为true,允许其申请
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
10:01 上午

shuyongfu

聚合包功能增加配置项的开关
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
10:00 上午

zhonghaowen

科室申领窗口增加自动滚动
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
Saturday 21 Jan 2017
2:01 下午

terrykwan

完善Grale Test的配置，使之通过命令行也可正确运行
Options
    • -4
    • +48
    /ssts-web/build.gradle
1:58 下午

terrykwan

增加非空断言
Options
    • -0
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDADiposableGoodsInvoiceManager.java
1:55 下午

shuyongfu

解决jira问题:ZSSZYY-83 使用记录扫描条码时，最新扫描的条码在最上方，并记住排序
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
Friday 20 Jan 2017
6:44 下午

jeffli

解决bug：

外部代理灭菌界面查看器械包信息，修改器械包时，灭菌程序下拉列表为空

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js
6:42 下午

wangyi

外来器械拆分支持多选
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
6:07 下午

shuyongfu

应该小周的要求,中山市中医院这个配置要改成false
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
6:03 下午

zhonghaowen

1.增加黑白名单部门非空校验

2.修改黑白名单过滤逻辑

Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/goodFilterConfig/goodFilterTemplateForm.js
    • -3
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/BlackListHandler.java
    • -3
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/WhiteListHandler.java
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManagerImpl.java
5:38 下午

adairkang

材料退库功能
Options
    • -23
    • +137
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.js
    • -0
    • +68
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/model/GoodsStockInfo.java
  3. /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service
    • -3
    • +21
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManager.java
  5. /ssts-web/src/test/java/test/forgon/disinfectsystem/material
    • -0
    • +78
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -0
    • +308
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • -2
    • +18
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialEntryTableManager.java
    • -0
    • +11
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/SqlFunctionsAdapter.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntry.java
  12. /ssts-web/src/test/java/test/forgon/disinfectsystem/material/model
    • -21
    • +130
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -14
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialEntryAction.java
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
  16. … 6 more files in changeset.
4:59 下午

zhonghaowen

科室申领黑白名单查询增加部门编号参数非空判断
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
3:47 下午

zhonghaowen

借物的黑白名单过滤方式改成根据申请科室来过滤
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
    • -3
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
3:36 下午

adairkang

外来器械大标签，手术间改为床位
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
3:32 下午

zhonghaowen

提交聚合包定义相关代码
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -1
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ComboTousseComposite.java
    • -0
    • +318
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js
    • -0
    • +2
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +19
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -0
    • +184
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java
  7. /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse
    • -0
    • +4
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +5
    /ssts-web/src/main/webapp/homepage/menu.jsp
  10. /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service
    • -0
    • +37
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManager.java
    • -0
    • +1196
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
    • -2
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManagerImpl.java
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManager.java
    • -0
    • +25
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -0
    • +122
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp
3:27 下午

adairkang

中山中医院发货计划打印字体还原到调到为跟省医一样的那一次修改之前
Options
    • -11
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
3:24 下午

zhonghaowen

1.修正科室申领1024分辨率弹窗高度

2.黑白名单增加模板的过滤,修改黑白名单过滤的逻辑

Options
    • -11
    • +35
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManagerImpl.java
    • -5
    • +16
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -0
    • +66
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/BlackListHandler.java
    • -0
    • +53
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/BwFilter.java
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/WhiteListHandler.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/WhiteOrBlackHandler.java
    • -2
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
3:07 下午

shuyongfu

灭菌装载采用扫描条码间隔达到一定时间后刷新的方式,之前是每次扫描或载入立即刷新入筐器械包表格的数据
Options
    • -23
    • +66
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
2:52 下午

adairkang

器械包签收界面，弹出提示信息后，必须要手动关闭之后才能进行下一次扫描操作，并且必须手动关闭，不能是按Enter键关闭(ZSSZYY-82)
Options
    • -5
    • +73
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
1:58 下午

adairkang

中山中医院发货计划打印还原为表格的打印，调整字体大小

外来器械大标签的打印，添加病人信息等（ZSSZYY-88）

Options
    • -31
    • +117
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/print/printConfig.js
11:45 上午

jeffli

优化流水号测试用例
Options
    • -9
    • +14
    /ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/SerialNumManagerTests.java
11:44 上午

jeffli

增加聚合包发货功能
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -0
    • +390
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ComboTousseInvoiceTests.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml
11:41 上午

jeffli

增加聚合包发货功能
Options
    • -0
    • +40
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +7
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • -1
    • +10
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • -1
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
9:22 上午

jeffli

删除多余的测试类
Options
    • --49
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestInvoiceManagerForTousse.java
Thursday 19 Jan 2017
7:03 下午

wangyi

外来器械包定义标签纸类型赋值
Options
    • -0
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
5:47 下午

chenjiaru

解决：GDSRMYY-266 器械包进入灭菌篮筐后，在器械包信息界面中没有把篮筐显示出来。
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/ScanBasketInvoiceTests.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java
    • -0
    • +4
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -0
    • +3
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • -2
    • +7
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
5:44 下午

shuyongfu

科室干预功能完善
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -49
    • +84
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
4:38 下午

shuyongfu

解决测试用例基础数据增加一条聚合包数据导致部分测试用例通过不到的问题
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java