forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 43
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 43
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

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
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 16495 is being indexed.

Thursday 29 Dec 2016
3:14 下午

wangyi

格式化代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
3:09 下午

zengjc

解决质量监测月报查询，在1024*768，1280*768下显示不全的问题.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js
3:03 下午

wangyi

装配器械包实例获取清洗信息代码优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
2:44 下午

adairkang

生成序列号死锁的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumUpdateManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumUpdateManagerImpl.java
12:02 上午

adairkang

数值使用常量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java
Wednesday 28 Dec 2016
11:56 下午

adairkang

数值使用常量
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
11:33 下午

terrykwan

提交404错误的处理页面
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/pagenotfound.jsp
11:22 下午

terrykwan

解决本页面通过收藏夹收藏，经过SSO身份验证后跳转过来，页面报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/portalPage.jsp
10:06 下午

adairkang

生成序列号
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java
8:13 下午

terrykwan

修改单点登录服务的URL，改为http协议，避免数字证书安装问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/zd5y/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-zd5y.xml
7:23 下午

chenjiaru

给器械包信息列表的"清洗人"做了联动修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/SqlBuilder.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
6:51 下午

zengjc

基础数据导入导出，添加外来器械的包装类型，解决jira问题ZSSZYY-60.
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
6:32 下午

wangyi

修复回收后干预修改外来器械包名称或供应商后回收记录、装配任务并没有关联修改bug
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
6:15 下午

terrykwan

删除不需要的注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas/client/filter/UsernamePasswordAuthenticationForCasFilter.java
6:03 下午

terrykwan

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

zengjc

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

terrykwan

删除调试信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas/client/filter/UsernamePasswordAuthenticationForCasFilter.java
5:06 下午

terrykwan

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

zhonghaowen

修改科室申领申请科室和结算科室下拉选择框显示顺序
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
4:40 下午

shuyongfu

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

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

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
4:38 下午

zhonghaowen

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

wangyi

非整包申请的器械包回收修改回收数量提示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
3:58 下午

adairkang

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

terrykwan

提交web项目的编译文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
3:41 下午

jeffli

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

wangyi

触摸屏回收支持部分回收功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
2:57 下午

terrykwan

提交与中大五院单点登录服务器整合的相关文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/spring/projects/zd5y/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/casLogon.jsp
  4. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/cas-logout.jsp
  6. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas/client/filter
  7. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas/client
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso/cas/client/filter/UsernamePasswordAuthenticationForCasFilter.java
  9. /SterileSupplySystem/branches/V4.1.0/ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/sso
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/WEB-INF/web-zd5y.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/casfailed.jsp
2:49 下午

wangyi

还原旧代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
2:27 下午

jeffli

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

jeffli

解决bug：

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

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java