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 27 Jun 2016
5:44 下午

adairkang

器械包获取失效日期的代码重构
Options
    • -11
    • +3
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -15
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -3
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java
    • -5
    • +2
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/action/DepartmentStockAction.java
    • -8
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -6
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
    • -2
    • +14
    /forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java
    • -2
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • -6
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -1
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:30 下午

adairkang

发货计划物品类型过滤出错的问题
Options
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
4:41 下午

adairkang

进入界面报js错误的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp
3:43 下午

jeffli

发货计划拼接备注时分隔符改为换行符

重构拼接发货计划备注的代码

Options
    • -3
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
3:40 下午

wangyi

启用标识牌的器械包 回收过后，再次扫描包外纸质标签不能定位到历史回收单。扫描无任何反应提示。
Options
    • -1
    • +12
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
    • -0
    • +3
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
2:07 下午

jeffli

恢复打开发货计划时自动填写备注的代码
Options
    • -15
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
2:06 下午

jeffli

标识牌小标签 打印格式调整

中山市小榄人民医院ZSSXLRMYY-9

Options
    • -15
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/print/printConfig.js
12:03 下午

wangyi

修复装配任务篮筐状态为装配完成的也可以扫描出来
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
10:58 上午

adairkang

签收没有失效日期的包，会报空指针异常
Options
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
10:37 上午

shuyongfu

高值耗材科室互借功能改进
Options
    • -2
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/borrowrecord/BorrowRecord.java
    • -0
    • +7
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
10:30 上午

jeffli

高值耗材发货时改为不合并

高值耗材发货项显示高值耗材的条码

一次性物品发货单代码重构

Options
    • -1
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.2.2_4.2.3.sql
    • -0
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • -26
    • +16
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
9:45 上午

adairkang

出入库记录汇总行名称显示
Options
    • -0
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
9:41 上午

shuyongfu

高值耗材科室互借功能改进
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js
9:26 上午

shuyongfu

器械包工作量统计数据查询对日期进行处理
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
9:25 上午

shuyongfu

科室申领的物品选择下拉增加进度条提示
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
9:24 上午

shuyongfu

中大五院二级供应室回收不默认其科室
Options
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
9:24 上午

shuyongfu

高值耗材科室互借功能改进
Options
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java
    • -11
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js
    • -0
    • +35
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/borrowrecord/BorrowRecord.java
    • -0
    • +4
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
    • -0
    • +8
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
9:21 上午

adairkang

明细核算月报导出excel有很多隐藏行的问题
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper
    • -10
    • +10
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
Sunday 26 Jun 2016
10:13 下午

adairkang

数量和金额列显示为#####的问题,原因是列宽太短了
Options
    • -18
    • +18
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper
    • -8
    • +8
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jasper
5:40 下午

wangyi

盘点增加导出功能
Options
    • -0
    • +110
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
    • -0
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManager.java
    • -0
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/exportInventoryRecord.jsp
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
    • -0
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryrecordView.js
    • -0
    • +28
    /forgon-core/src/main/java/com/forgon/excel/service/ExcelUtils.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/emptyExcelDemo.xls
Saturday 25 Jun 2016
5:41 下午

adairkang

发货单界面异常及发货单的打印
Options
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js
    • -5
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
5:37 下午

wangyi

番禺区中医院打印外来器械bug修复
Options
    • -4
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
Friday 24 Jun 2016
4:22 下午

jeffli

解决bug：

发货invoiceItem记的一次性批次库存id记错了，记成了高值耗材的id

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:01 下午

adairkang

一次性物品出入库记录，添加汇总
Options
    • -0
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
3:50 下午

adairkang

重构
Options
    • -10
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
3:43 下午

adairkang

一次性物品出入库记录，添加汇总
Options
    • -1
    • +18
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
3:05 下午

jeffli

解决bug：

一次性物品某个批次的物品失效了，扫了没失效的批次，提示已经失效的那个批次快到失效期了，请优先发货。

中山五院ZSWY-31

Options
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsBatch.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -5
    • +13
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
    • -271
    • +0
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • -19
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -94
    • +0
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
2:59 下午

adairkang

消毒物品打印失效日期
Options
    • -1
    • +1
    /ssts-expiration/src/main/java/com/forgon/disinfectsystem/expirationdateinfo/dwr/table/ExpirationDateInfoTableManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
2:43 下午

shuyongfu

解决jira问题:广州复大肿瘤医院 GZFDZL-41 器械包及高值耗材可以在不同科室登记使用记录
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js
    • -1
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
    • -1
    • +78
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.jsp
1:06 下午

adairkang

申请单打印,材料信息应该是申请时生成的器械包定义的材料
Options
    • -1
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java