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
Friday 02 Sep 2016
5:27 下午

jeffli

外部代理灭菌代码改造：

是否装配和是否打印分开2个属性

ForeignProxyItem增加 tousseItemId

装配之后不屏蔽装配并打印和装配并打印申请单按钮，后台自动判断是否需要装配

增加并发控制

保存或者更新申请单时，不创建和更新tousseItem，装配时才生成

保存申请单时，不设置发货状态，装配后生成

Options
    • -0
    • +13
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyItem.java
    • -115
    • +226
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -0
    • +21
    /forgon-tools/src/main/java/com/forgon/tools/StrutsParamUtils.java
    • -14
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -10
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • -1
    • +6
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.2_4.3.3.sql
    • -0
    • +12
    /forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
    • -2
    • +4
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
    • -3
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
    • -2
    • +29
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java
    • -70
    • +107
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
    • -1
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
5:21 下午

zengjc

修正包装去工作量及不合格月报,数量对不上的问题.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:55 下午

jeffli

修改提示信息
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/interfere/diposableGoodsView.js
4:20 下午

chenjiaru

no_comment
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jasper
2:00 下午

wangyi

清洗工作量旧数据更新
Options
    • -12
    • +17
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
11:36 上午

chenjiaru

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
11:18 上午

zengjc

十八项指标报表的优化，主要优化了手术次日下送，处理器械总数量，处理外来手术器械总数量这几项，解决jira问题番禺区中医院

PYQZYY-73

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Thursday 01 Sep 2016
10:30 下午

chenjiaru

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
10:22 下午

chenjiaru

解决：DGDHYY-55 器械包发货统计报表 问题
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jasper
    • -21
    • +21
    /ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml
10:11 下午

chenjiaru

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/jasperreportsView.jsp
10:06 下午

chenjiaru

no_comment
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/security/model/User.java
6:36 下午

zhonghaowen

解决SSTS-61:科室申领模块填写的申请单的申请时间不准确的问题
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:41 下午

zengjc

更新数据库升级脚本.
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -1
    • +0
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.3_oracle.sql
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.4_4.3.4_oracle.sql
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.3_4.3.4_sqlserver.sql
    • -1
    • +0
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.3_sqlserver.sql
5:36 下午

shuyongfu

使用记录快速回收功能增加对所选的一次性物品进行校验并提示
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
5:31 下午

wangyi

待回收列表增加按单类型过滤
Options
    • -1
    • +12
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -2
    • +32
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -1
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
5:08 下午

wangyi

修复整包清洗为null的无法入筐问题
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -17
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
5:01 下午

zengjc

添加升级脚本，表QualityMonitoringAnswer字段answer加长.
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.3_sqlserver.sql
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.3_oracle.sql
4:44 下午

zengjc

修正质量监测记录，录入文本过长保存报错问题.
Options
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringAnswer.java
4:43 下午

zhonghaowen

解决ZSSXLRMYY-63 已发货的申请单可以被终止
Options
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js
3:45 下午

zhonghaowen

修复申请机械包时,物品顺序和模板配置顺序不一致问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
3:35 下午

jeffli

解决bug：

外来器械拆包装配报错

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
3:34 下午

jeffli

解决bug：

外来器械拆包装配报错

Options
    • -3
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
3:20 下午

shuyongfu

解决jira问题:GDSRMYY-134

调整灭菌记录信息里面的'今天审核的待灭菌物品'显示优化(改进)

Options
    • -16
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
2:36 下午

jeffli

增加高值耗材使用记录视图列表

广州复大肿瘤医院GZFDZL-77

Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -25
    • +44
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java
    • -0
    • +64
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsUseRecordView.js
    • -0
    • +61
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsUseRecordView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -2
    • +3
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -0
    • +80
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
2:33 下午

wangyi

外来器械列表增加供应商字段
Options
    • -3
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
    • -1
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.2_4.3.3.sql
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -11
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
    • -2
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
2:31 下午

shuyongfu

解决材料入库单搜索问题、增加入库存的总金额属性。

SSTS-63 点击材料入库单列表的搜索列会页面出错

Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
2:30 下午

shuyongfu

解决材料入库单搜索问题、增加入库存的总金额属性。

SSTS-63 点击材料入库单列表的搜索列会页面出错

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.2_4.3.3.sql
2:29 下午

shuyongfu

解决材料入库单搜索问题、增加入库存的总金额属性。

SSTS-63 点击材料入库单列表的搜索列会页面出错

Options
    • -1
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialmanager/MaterialEntry.java
    • -0
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
2:16 下午

zhonghaowen

修复消毒物品申请单点开查看，下拉框出现重复的物品
Options
    • -1
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
11:37 上午

shuyongfu

解决外部代理灭菌的问题
Options
    • -0
    • +4
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -1
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java