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
Wednesday 28 Dec 2016
6:03 下午

terrykwan

中大五院的配置：改为默认显示追溯系统的登录页，退出后回到追溯系统的登录页
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/WEB-INF/web-zd5y.xml
    • -3
    • +6
    /ssts-web/src/main/resources/spring/projects/zd5y/applicationContext-acegi-security.xml
5:45 下午

zengjc

需要灭菌完成确认时，干预灭菌记录由灭菌完成改为灭菌中，清空灭菌确认人、确认时间；灭菌中年改为灭菌完成，包状态改为灭菌待确认，解决jira问题ZSWY-54.
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -1
    • +8
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
5:07 下午

terrykwan

删除调试信息
Options
    • -2
    • +0
    /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas/client/filter/UsernamePasswordAuthenticationForCasFilter.java
5:06 下午

terrykwan

解决了密码验证失败后界面显示不友好的问题
Options
    • -1
    • +5
    /ssts-web/src/main/resources/spring/projects/zd5y/applicationContext-acegi-security.xml
4:42 下午

zhonghaowen

修改科室申领申请科室和结算科室下拉选择框显示顺序
Options
    • -0
    • +18
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -1
    • +10
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -9
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
4:40 下午

shuyongfu

中大五院灭菌管理-外部代理灭菌,申请人与制作者配置为不显示,其它医院沿用之前的逻辑

相关表单元素所占宽度比例调小,以兼容各种不同分辨率的客户端电脑显示

Options
    • -12
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
4:38 下午

zhonghaowen

借物单供应室修改申请数量后修复小计显示不正常和新增重新判断归还状态
Options
    • -52
    • +63
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -3
    • +20
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
4:34 下午

wangyi

非整包申请的器械包回收修改回收数量提示
Options
    • -13
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
3:58 下午

adairkang

获取序列号(条码)查询数据库加锁,主要是中大五院his系统会访问数据库，需要加锁
Options
    • -8
    • +19
    /forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java
3:47 下午

terrykwan

提交web项目的编译文件
Options
    • -0
    • +22
    /ssts-web/build.gradle
3:41 下午

jeffli

优化装配界面，防止某些情况下部分元素被‘装配并打印标签’挡住
Options
    • -7
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
3:08 下午

wangyi

触摸屏回收支持部分回收功能
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • -3
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
2:57 下午

terrykwan

提交与中大五院单点登录服务器整合的相关文件
Options
    • -0
    • +6
    /build.gradle
    • -0
    • +188
    /ssts-web/src/main/resources/spring/projects/zd5y/applicationContext-acegi-security.xml
    • -0
    • +390
    /ssts-web/src/main/webapp/WEB-INF/web-zd5y.xml
    • -0
    • +20
    /ssts-web/src/main/webapp/casfailed.jsp
    • -0
    • +127
    /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas/client/filter/UsernamePasswordAuthenticationForCasFilter.java
  6. /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso
  7. /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas/client
    • -0
    • +52
    /ssts-web/src/main/webapp/casLogon.jsp
    • -0
    • +27
    /ssts-web/src/main/webapp/cas-logout.jsp
  10. /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas/client/filter
  11. /ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas
2:49 下午

wangyi

还原旧代码
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
2:27 下午

jeffli

外部代理灭菌，允许失效期为空
Options
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
2:23 下午

jeffli

解决bug：

删除申请单后，旧的辅料包,消毒物品，普通器械包无法发货

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

shuyongfu

解决jira问题:PYQZYY-137 灭菌情况报表点击查询后结果没显示

因为包实例的灭菌开始时间是文本类型,所以在oracle数据库不能用日期转换函数来处理

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
2:16 下午

shuyongfu

解决添加外部代理灭菌窗口在1600*900分辨率下右边的制做人等下拉框的下拉三角符号显示不全的问题
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
11:52 上午

wangyi

修复修改外来器械属性后页面报错
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
11:13 上午

jeffli

解决bug：

删除申请单后，旧的辅料包无法发货

Options
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Tuesday 27 Dec 2016
7:57 下午

chenjiaru

解决：GDSRMYY-246 器械包信息界面中增加回收时间字段
Options
    • -0
    • +6
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
7:54 下午

wangyi

修复清洗篮筐特殊情况篮筐状态错误bug
Options
    • -11
    • +35
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
7:01 下午

adairkang

手术预约时间为null
Options
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
6:54 下午

zengjc

质量监测重新装配器械包，从器械包的申请单id查申请科室.
Options
    • -0
    • +12
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:36 下午

jeffli

退货校验科室的代码，改为取location属性。
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
6:13 下午

adairkang

同步现场发回来的代码
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
6:07 下午

zengjc

质量监测的重新回收和重新装配，关联要废弃器械包的回收、清洗等信息.
Options
    • -0
    • +73
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +18
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
6:02 下午

chenjiaru

加了null指针的校验
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:52 下午

zhonghaowen

解决ZSSXLRMYY-115:消毒供应中心领用，领用单一次性物品的批次如果是0的就不显示
Options
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js
5:13 下午

wangyi

修复中大五院导出灭菌区工作量及不合格率月报导出报错bug
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/disinfectionFractionDefective.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -6
    • +17
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DisinfectionFractionDefectiveBean.java
    • -54
    • +60
    /ssts-web/src/main/webapp/jasperRtp/disinfectionFractionDefective.jrxml