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
Tuesday 30 Jan 2018
5:03 下午

adairkang

ZSYY-219 PC端灭菌管理增加打印灭菌记录明细功能
Options
    • -0
    • +82
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/vo/SterilizationRecordPrintTousseItem.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
    • -0
    • +7
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • -0
    • +72
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
  5. /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/vo
    • -0
    • +76
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • -5
    • +28
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -0
    • +40
    /forgon-tools/src/main/java/com/forgon/tools/json/SimpleTypeJsonPropertyFilter.java
    • -0
    • +12
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManagerImpl.java
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • -0
    • +7
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManager.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
5:00 下午

yanweining

高值耗材：添加高值耗材发票权限
Options
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
    • -4
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
    • -0
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +5
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -19
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js
4:56 下午

ZhuangQinLiu

待办任务加上权限控制，流程定义和待办任务前端提示优化
Options
    • -7
    • +23
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java
    • -1
    • +5
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js
    • -0
    • +5
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +12
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -12
    • +30
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
    • -0
    • +10
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -4
    • +10
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskChooseNextOneForm.js
4:24 下午

niutou_ren

高值耗材定义bug修改

1、厂家宽度可以调大一些，保存后打开，厂家没显示出来 （bug已修改，宽度也进行了调整）

2、高值耗材列表界面的名称、注册证宽度可以调大一些，名字长的显示不全 （进行了调整）

3、点保存时间太久了 （还没有进行）

4、供应商、经营许可证、授权方等，宽度不够 （这个等下问一下周经理，位置不够……）

5、供应商的营业执照有效期显示不对，显示的是经营许可证的有效期。 （已解决）

6、生产厂家的颜色预警也加上了 （已解决）

Options
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -0
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • -51
    • +89
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsDefinition.js
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js
3:25 下午

liuliben

高值耗材导入
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsDemo.xls
    • -120
    • +605
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importexpensivegoods/service/ImportExpensiveGoodsManagerImpl.java
3:17 下午

yanweining

高值耗材：高值耗材入库，发票页面修改
Options
    • -2
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js
    • -15
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
    • -80
    • +47
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
3:12 下午

liuliben

高值耗材授权界面调整
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/common/selectExpensiveGoodsByExt.jsp
    • -1
    • +13
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
    • -0
    • +49
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
    • -0
    • +43
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • -0
    • +4
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
    • -55
    • +123
    /ssts-web/src/main/webapp/js/forExpensiveGoods.js
    • -36
    • +181
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js
2:44 下午

jeffli

高值耗材实例列表权限修改
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
1:39 下午

jeffli

增加外部代理灭菌单的部分物品终止功能

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

Options
    • -1
    • +17
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyItem.java
    • -5
    • +66
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -0
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +84
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
11:39 上午

adairkang

签收单上签收数量的计算，根据签收单绑定的实例进行计算，而不是用传入的条码的数量
Options
    • -1
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
10:52 上午

yanweining

高值耗材：高值耗材获取型号定义方法修改
Options
    • -7
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
    • -1
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
10:02 上午

adairkang

巫劲封发回来的现场配置
Options
    • -6
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/config.js
9:59 上午

niutou_ren

修改在高值耗材定义界面，生产厂家一开始不显示的bug
Options
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java
9:15 上午

niutou_ren

高值耗材定义与库存修改

1、定义界面添加了供应商信息，对需要显示的列进行了调整，对定义界面的布局进行了调整；

2、库存界面添加了一些字段（哪些字段需要显示，哪些不要显示还需要推敲），同时增加了具体型号的库存显示。

Options
    • -2
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificationManagerImpl.java
    • -1
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.jsp
    • -3
    • +41
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • -3
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.jsp
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -1011
    • +63
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js
    • -0
    • +826
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsDefinition.js
    • -801
    • +289
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.js
    • -0
    • +7
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
Monday 29 Jan 2018
11:19 下午

chenjiaru

ExtJs框架的升级（代码的改造）
Options
    • -0
    • +21
    /forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowAction.java
    • -2
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java
    • -0
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ReturnGoodVo.java
    • -39
    • +60
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java
    • -1
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
8:59 下午

ZhuangQinLiu

JMSZXYY-20 密码安全性问题优化 代码优化
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/security/action/UserAction.java
    • -0
    • +13
    /forgon-core/src/main/java/com/forgon/security/model/ModifyPwdRecord.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/directory/action/PersonalSettingAction.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/security/model/User.java
    • -0
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • -2
    • +3
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
8:44 下午

yanweining

高值耗材：高值耗材发票警告
Options
    • -39
    • +48
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
    • -0
    • +218
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBillWarning/expensiveGoodsBIllInstanceWarningView.js
    • -1
    • +44
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
  5. /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBillWarning
    • -37
    • +12
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -1
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExpensiveGodownEntryReceivingReportItemVO.java
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBillWarning/expensiveGoodsBIllInstanceWarningView.jsp
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/systemwarning/SystemWarningItemVO.java
    • -4
    • +3
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
6:28 下午

ZhuangQinLiu

去掉是否已经修改属性，默认值false。这样升级脚本才适应
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/security/model/User.java
5:43 下午

liuliben

修改高值耗材属性列宽
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.js
5:30 下午

liuliben

修改高值耗材供应商注册证显示宽度
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
4:50 下午

ZhuangQinLiu

修改用户密码表并加上日志
Options
    • -3
    • +37
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js
    • -1
    • +3
    /ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
    • -0
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
    • -1
    • +3
    /forgon-core/src/main/java/com/forgon/log/model/Log.java
    • -0
    • +7
    /forgon-core/src/main/java/com/forgon/security/service/UserManager.java
    • -0
    • +97
    /forgon-core/src/main/java/com/forgon/security/model/ModifyPwdRecord.java
    • -1
    • +3
    /ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
3:12 下午

ZhuangQinLiu

流程定义加上序列号不能为0的前后台判断
Options
    • -0
    • +5
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java
2:47 下午

liuliben

修改时间格式方法
Options
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java
2:33 下午

adairkang

器械包图片，可以不用解码。如果添加解码，当字符串为空的话，会报错
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
2:31 下午

adairkang

材料定义的查找添加返回值判断
Options
    • -6
    • +11
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
2:13 下午

yanweining

高值耗材：高值耗材代码优化
Options
    • -40
    • +40
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -13
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
    • -4
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExpensiveGodownEntryReceivingReportItemVO.java
2:01 下午

liuliben

修改代码格式
Options
    • -24
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java
1:54 下午

ZhuangQinLiu

JMSZXYY-20 密码安全性问题优化， 代码优化以及流程定义等模块a标签样式修改
Options
    • -9
    • +2
    /ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js
    • -9
    • +3
    /forgon-core/src/main/java/com/forgon/security/action/UserAction.java
    • -6
    • +3
    /ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/finishedApprovalTaskRecordView.js
    • -8
    • +8
    /forgon-core/src/main/java/com/forgon/security/model/User.java
    • -16
    • +18
    /ssts-web/src/main/webapp/systemmanage/userFormExt.js
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.8_4.9.9.sql
    • -1
    • +0
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • -15
    • +14
    /forgon-core/src/main/java/com/forgon/directory/action/PersonalSettingAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -1
    • +3
    /ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
1:46 下午

adairkang

器械包名称有特殊字符导致申请时看不到图片

ZSSXLRMYY-153

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
11:38 上午

liuliben

修改方法注释和删除不用的方法
Options
    • -5
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • -10
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java