forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 54
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 54
Total Lines of Code (LoC): 4,802,190
Net change in LoC this week: 764

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 Jun 2018
5:05 下午

jeffli

增加活动管理，限制并发执行的任务，查看当前正在执行的任务
Options
    • -1
    • +2
    /forgon-core/src/main/java/com/forgon/system/activity/service/ActivityAspect.java
    • -66
    • +55
    /forgon-tools/src/main/java/com/forgon/tools/StrutsResponseUtils.java
    • -0
    • +25
    /forgon-tools/src/main/java/com/forgon/tools/util/SpringResponseUtils.java
  4. /forgon-core/src/main/java/com/forgon/system/activity/controller
    • -0
    • +61
    /forgon-tools/src/main/java/com/forgon/tools/util/ResponseUtils.java
    • -0
    • +42
    /forgon-core/src/main/java/com/forgon/system/activity/controller/ActivityController.java
4:39 下午

yanweining

新增合同管理,新增设备参数
Options
    • -0
    • +8
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +94
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/ContractTableManager.java
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
    • -0
    • +64
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManager.java
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/attachfile/model/AttachFile.java
    • -0
    • +428
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/contract/contractView.js
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/log/model/Log.java
    • -0
    • +176
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ContractItem.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
    • -0
    • +214
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/Contract.java
    • -0
    • +112
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/contract/contractView.jsp
    • -0
    • +4
    /forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • -0
    • +718
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/contract/contractFrom.js
    • too large
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +4
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
  16. … 7 more files in changeset.
3:59 下午

simon.bai

解决JIRA问题：GDSRMYY-426 外来器械申请单的改进
Options
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
3:55 下午

shuyongfu

1.中山眼科中心hrp接口

2.GDSRMYY-439 库存对比改进

Options
    • -8
    • +3
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/helper/WebServiceClientHelper.java
    • -0
    • +9
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/Inventory.java
    • -15
    • +2
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/UpdateEntryDao.java
    • -3
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DisposableGoodsStockAction.java
    • -2
    • +9
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/InventoryDaoImpl.java
    • -1
    • +8
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/dgsdhyy/InventoryDaoImpl.java
    • -3
    • +7
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -25
    • +53
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -1
    • +8
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/fsfy/InventoryDaoImpl.java
    • -1
    • +8
    /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/zd5y/dao/InventoryDao.java
    • -1
    • +8
    /ssts-cszxyy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/cszxyy/dao/InventoryDao.java
    • -2
    • +3
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/InventoryDao.java
2:58 下午

shuyongfu

增加jdbcTemplate的bean定义
Options
    • -0
    • +4
    /ssts-web/src/main/resources/spring/applicationContext.xml
2:53 下午

shuyongfu

查询一次性物品库存按仓库进行查询
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
2:51 下午

shuyongfu

解决一次性物品数量较多(超过1000)时,oracle报错的问题
Options
    • -1
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
2:36 下午

shuyongfu

科室干预-修改科室编码、名称等联动更新调整
Options
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
2:31 下午

shuyongfu

中大附一灭菌完成性能优化
Options
    • -0
    • +2
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -2
    • +7
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
11:46 上午

simon.bai

优化：GDSRMYY-437 科室申领模块改进
Options
    • -12
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
Tuesday 19 Jun 2018
9:33 下午

adairkang

GGSRMYY-29 打印回收清单改进
Options
    • -14
    • +190
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/print/printConfig.js
8:58 下午

niutou_ren

基础数据导入时，给器械包定义增加"添加固定条码"的逻辑
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
8:55 下午

niutou_ren

调整getTousseDefinitionFixedBarcode函数名称为getOrCreateTousseDefinitionFixedBarcode。原因是，在get函数中，有新建逻辑。
Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
4:15 下午

simon.bai

解决：广东省人民医院GDSRMYY-437--科室申领模块改进
Options
    • -1
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
11:31 上午

adairkang

需要引入config.js，不然会报错
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.jsp
11:10 上午

adairkang

GZSZYYGZHC-22 PDA使用记录增加高值耗材物品录入
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -0
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
10:57 上午

niutou_ren

RelevancyGoodsAuthorization表中expensiveGoodsIds列的长度，由500调整到4000
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoods/RelevancyGoodsAuthorization.java
    • -1
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.20_4.9.21_oracle.sql
    • -1
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.20_4.9.21_sqlserver.sql
10:48 上午

jeffli

修正代码bug，long类型使用了string类型的查询语法
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
1:00 上午

shuyongfu

解决中大附一某些灭菌记录包数量较大(包数量基本上在六、七百个以上,可能有聚合包及不追溯的包)时,导致灭菌完成不了的问题
Options
    • -7
    • +0
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
Friday 15 Jun 2018
5:32 下午

shuyongfu

解决Jira问题:GZSZYYGZHC-24 高值耗材系统增加明细核算月报和核算月报菜单
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:19 下午

niutou_ren

数据库升级语句，RelevancyGoodsAuthorization表中，expensiveGoodsIds的长度变成500，expensiveGoodsName的长度变成4000
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.20_4.9.21_oracle.sql
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.20_4.9.21_sqlserver.sql
4:51 下午

yanweining

GZSZYYGZHC-23：发票管理和发货单管理打印增加格式和打印功能
Options
    • -1
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
4:04 下午

niutou_ren

高值耗材授权时，由于授权内容过多，导致字符串长度超过默认的255，无法保存。修改存储长度，id集合的长度改为500，名字的集合改为4000
Options
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoods/RelevancyGoodsAuthorization.java
3:38 下午

yanweining

GZSZYYGZHC-23:发票管理和发货单管理打印增加格式和打印功能
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
3:34 下午

alan.lee

解决新增用户失败的bug
Options
    • -4
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/service/SysUserManagerImpl.java
3:25 下午

cherry

优化外来器械回收
Options
    • -1
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -1
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
2:30 下午

shuyongfu

解决Jira问题:GZSZYYGZHC-24 高值耗材系统增加明细核算月报和核算月报菜单
Options
    • -0
    • +16
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -1
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:39 上午

yanweining

GZSZYYGZHC-23:发票管理和发货单管理打印增加格式和打印功能
Options
    • -0
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js
    • -0
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • -11
    • +9
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsBillItem.java
    • -0
    • +66
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoicePrintVo.java
    • -1
    • +25
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -58
    • +69
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js
    • -0
    • +3
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -2
    • +121
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -0
    • +104
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/PrintExpensiveGoodsBillitmeVO.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceForm.js
    • -24
    • +101
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
Thursday 14 Jun 2018
8:43 下午

jeffli

解决装配界面打开报错问题
Options
    • too large
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
12:52 下午

adairkang

GGSRMYY-27 使用回收模板后，在科室申领申请单信息列表里，回收申请单会将没有回收数量的物品也显示出来
Options
    • 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
    • -2
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java