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 17 Jan 2018
7:25 下午

shuyongfu

由于小庄误改,现恢复到12335版本
Options
    • -2
    • +1
    /ssts-web/src/main/resources/log4j.properties
7:08 下午

shuyongfu

1.增加对高值耗材的快速回收时的提示消息

2.德阳的定时转换功能调整为对未审核和已审核的使用记录进行定时转换申请单(之前只对已审核的使用记录进行定时转换)

Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
6:40 下午

ZhuangQinLiu

查看审批记录 样式更新和回退代码更新
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js
    • -0
    • +6
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
6:25 下午

ZhuangQinLiu

待办任务审批过程中出现 一直加载问题解决
Options
    • -66
    • +35
    /ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js
    • -10
    • +5
    /forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java
    • -4
    • +46
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -190
    • +93
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
    • -5
    • +21
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java
6:19 下午

yanweining

高值耗材：高值耗材发票
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
5:54 下午

jeffli

高值耗材实例列表增加结算状态显示
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.js
5:41 下午

shuyongfu

解决灭菌装载的待灭菌物品列表点击批量载入汇总的包时后台报错，且页面一直在加载提示js报错的问题
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
5:25 下午

jeffli

优化保存高值耗材定义的代码
Options
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
5:05 下午

yanweining

高值耗材：高值耗材发票
Options
    • -11
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
    • -108
    • +124
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -3
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsBill.java
    • -50
    • +51
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -6
    • +5
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
    • -29
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js
5:05 下午

adairkang

高值耗材打印，不打印非植入物的高值耗材
Options
    • -1
    • +26
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintData.java
    • -0
    • +10
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/vo/UseRecordPrintItem.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoods.java
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
4:49 下午

yanweining

高值耗材：高值耗材入库
Options
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
    • -2
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
4:42 下午

niutou_ren

在高值耗材定义（页面）中，添加型号
Options
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoods.java
    • -1
    • +16
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • -6
    • +178
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js
    • -1
    • +32
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoods/ExpensiveGoodsModel.java
    • -0
    • +4
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
4:38 下午

chenjiaru

高值耗材申请单功能部分代码的提交
Options
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java
    • -2
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationFormForApproval.js
4:03 下午

jeffli

外来器械参数设置增加配置属性

中山一院消毒供应项目ZSYY-203

Options
    • -1
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -0
    • +4
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -0
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
3:35 下午

alan.lee

解决：1.添加灭菌记录，篮筐和固定条码冲突的问题

2.灭菌装载单个固定条码不能载入的问题

Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
2:28 下午

yanweining

高值耗材：高值耗材入库
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
2:06 下午

jeffli

外部代理灭菌包图片显示

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

Options
    • -1
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp
    • -2
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
1:49 下午

alan.lee

灭菌装载页面针对固定条码，汇总
Options
    • -144
    • +126
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +26
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -3
    • +3
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
    • -119
    • +51
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
1:46 下午

ZhuangQinLiu

待办任务bug修复和用户下拉框优化
Options
    • -0
    • +15
    /forgon-core/src/main/java/com/forgon/workflow/model/WorkFlowApprovalTask.java
    • -71
    • +29
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -17
    • +17
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
    • -1
    • +11
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java
    • -5
    • +6
    /ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js
    • -4
    • +24
    /forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowAction.java
    • -0
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java
    • -2
    • +29
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java
12:54 下午

liuliben

修改注册证重复验证
Options
    • -5
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
12:49 下午

yanweining

高值耗材：高值耗材入库申请单过滤
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
11:44 上午

jeffli

发货超时改为1分钟
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
11:16 上午

chenjiaru

解决jira问题：JMSZXYY-11 科室申领筛选优化、默认排序修改
Options
    • -4
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -0
    • +16
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
10:36 上午

chenjiaru

调整高值耗材申请单的UI
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js
Tuesday 16 Jan 2018
9:29 下午

liuliben

修改高值耗材授权界面ID值
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.js
8:51 下午

jeffli

高值耗材退库增加型号的处理

自购入库，目前不需要做退库

预入库，退库时，库存直接减掉（未发货之前，从设备科扣减。发货后，从临床扣减）

Options
    • -8
    • +19
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
    • -3
    • +3
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -2
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java
    • -1
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntry.java
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
8:44 下午

shuyongfu

解决jira问题:GDSRMYY-401 库存对比修复
Options
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
8:39 下午

shuyongfu

广东省医单点登录配置文件
Options
    • -5
    • +2
    /ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-gdsy.xml.back
8:27 下午

liuliben

修改高值耗材库存预警登录提示只有是高值耗材供应商才提醒
Options
    • -1
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -17
    • +10
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
8:27 下午

cherry

代码优化
Options
    • -4
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java