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 05 Sep 2016
12:08 上午

wangyi

增加清洗触摸屏功能，地址http://localhost/logon.jsp?logonType=washform
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/table2_bg.gif
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/washformbody_bg.jpg
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -2
    • +63
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -0
    • +153
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -0
    • +135
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp
    • -0
    • +363
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
    • -3
    • +8
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +291
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformstyle.css
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/washformbody_bg.jpg
    • -1
    • +6
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -1
    • +3
    /ssts-web/src/main/webapp/openSystemMainPage.jsp
Sunday 04 Sep 2016
10:57 下午

shuyongfu

解决jira问题:GDSRMYY-133

在灭菌装载界面中的'篮筐明细'和灭菌界面中的灭菌物品列表中增加科室字段(改进)

并已做成可配置

Options
    • -13
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • -4
    • +13
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -3
    • +4
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -102
    • +191
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
10:54 下午

shuyongfu

核算月报与明细核算月报方法注释
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:53 下午

shuyongfu

清洗区工作量及不合格率月报的手术器械数量旧数据处理action请求
Options
    • -0
    • +4
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
3:10 下午

terrykwan

将装配后的条码信息放入变量，用于selenium自动化测试
Options
    • -1
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
2:58 下午

terrykwan

优化页面的代码，避免加载时后台出现页面不规范的警告信息
Options
    • -86
    • +86
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -14
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
2:57 下午

terrykwan

修改msg的信息提示key值为统一后的message
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp
2:53 下午

terrykwan

增加注释信息
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:52 下午

terrykwan

将HttpResponse的响应输出代码改为统一调用StrutsResponseUtils.output()方法，增加设置响应的contentType，解决客户端出现xml解析告警的问题
Options
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -140
    • +47
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -4
    • +21
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Saturday 03 Sep 2016
2:05 下午

jeffli

外部代理灭菌单装配时判断单是否已终止
Options
    • -1
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
1:57 下午

jeffli

外部代理灭菌申请单列表，打印申请单时判断是否已装配
Options
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
11:16 上午

jeffli

优化终止外部代理灭菌申请单代码：

增加并发控制

批量终止时，每个单放到单独的事务终止

判断是否已终止，已发货

返回成功终止的记录数

Options
    • -7
    • +15
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
    • -11
    • +22
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
10:50 上午

jeffli

优化删除外部代理灭菌申请单代码：

增加并发控制

批量删除时，每个单放到单独的事务删除

判断空的发货状态

优化判断是否有灭菌或者发货包实例的代码

返回成功删除的记录数

Options
    • -1
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -33
    • +26
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -12
    • +24
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
10:46 上午

jeffli

去掉某些方法中的表别名as,oracle下会报错
Options
    • -3
    • +3
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
Friday 02 Sep 2016
6:55 下午

chenjiaru

no_comment
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialDamageItemView_subreport.jasper
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/materialDamageTotalView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jasper
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/materialDamageItemView.jrxml
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/materialDamageItemView_subreport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialDamageTotalView.jasper
6:53 下午

wangyi

清洗工作量统计报表增加每个材料类型的不合格率。
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jasper
    • -30
    • +68
    /ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialTypeWorkloadReport.java
6:28 下午

zengjc

解决定期监测 添加一条不合格记录 报错的问题，jira问题中山大学中山眼科中心 ZSYKZX-40.
Options
    • -2
    • +8
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java
6:26 下午

chenjiaru

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialMissTotalView.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jasper
    • -20
    • +33
    /ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
    • -25
    • +25
    /ssts-web/src/main/webapp/jasperRtp/materialMissTotalView.jrxml
5:30 下午

zhonghaowen

修改申请自定义器械包申请时间第一次提交取服务器时间
Options
    • -17
    • +12
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
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