forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 62
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 62
Total Lines of Code (LoC): 4,714,781
Net change in LoC this week: 2,406

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
Friday 26 Jan 2018
10:57 上午

adairkang

ZSYY-215 历史签收记录打印
Options
    • -4
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/invoice/signRecord.jsp
    • -0
    • +44
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
    • -1
    • +31
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/action/signRecordAction.java
    • -0
    • +13
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -8
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/signRecord/SignRecord.java
    • -0
    • +131
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/vo/SignRecordPrintTousseVo.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -1
    • +46
    /ssts-web/src/main/webapp/disinfectsystem/invoice/signRecord.js
    • -0
    • +9
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManager.java
    • -0
    • +16
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -0
    • +44
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -7
    • +35
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
10:36 上午

ZhuangQinLiu

注释调整和代码优化

Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/workflow/service/NodeDefinitionManager.java
10:19 上午

yanweining

高值耗材：高值耗材入库，发票修改
Options
    • -1
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js
    • -3
    • +5
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -8
    • +19
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
    • -11
    • +9
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -47
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
    • -2
    • +27
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
    • -144
    • +189
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
    • -4
    • +44
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/commonExpensiveGoodsEntry.js
    • -3
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -1
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
  16. … 3 more files in changeset.
9:56 上午

ZhuangQinLiu

待办任务iframe加载过慢问题优化
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js
    • -109
    • +99
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskChooseNextOneForm.js
    • -15
    • +23
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
    • -5
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp
    • -15
    • +2
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecordView.js
Thursday 25 Jan 2018
7:49 下午

adairkang

注释
Options
    • -2
    • +4
    /forgon-core/src/main/java/com/forgon/directory/model/BarcodeDevice.java
7:48 下午

adairkang

添加注释
Options
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
7:33 下午

chenjiaru

解决jira问题：ZSWY-82 定期监测列表中，灭菌炉信息有部分不显示出来和部分显示了但信息是错误
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
4:05 下午

ZhuangQinLiu

待办任务、流程定义grid列宽度调整
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js
    • -14
    • +14
    /ssts-web/src/main/webapp/systemmanage/workFlow/finishedApprovalTaskRecordView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js
    • -4
    • +2
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlow.jsp
    • -14
    • +14
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecordView.js
3:36 下午

ZhuangQinLiu

grid查询后，查询框本身出现两个下拉框图标.问题解决
Options
    • -7
    • +6
    /ssts-web/src/main/webapp/forgon4/extents/features/GridSearching.js
2:59 下午

ZhuangQinLiu

申请单提交表单可选择流程第一个节点执行人；我的已办任务模块；申请单可查看审批日志
Options
    • -0
    • +283
    /ssts-web/src/main/webapp/systemmanage/workFlow/finishedApprovalTaskRecordView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp
    • -0
    • +26
    /forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java
    • -1
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManager.java
    • -0
    • +30
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowFinishedApprovalTask.jsp
    • -36
    • +194
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -43
    • +10
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
    • -1
    • +11
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java
    • -11
    • +98
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -0
    • +13
    /forgon-core/src/main/java/com/forgon/workflow/service/NodeDefinitionManagerImpl.java
    • -0
    • +2
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecordView.js
    • -1
    • +6
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java
    • -26
    • +48
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskChooseNextOneForm.js
    • -4
    • +18
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java
  16. … 5 more files in changeset.
2:56 下午

jeffli

装配任务组灭菌日期限制功能

贵阳市第二人民医院GYSDERMYY-7

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:55 下午

chenjiaru

ExtJs框架的升级（combo语法的改造）
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js
    • -4
    • +21
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • -20
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
2:43 下午

adairkang

签收记录添加科室编码
Options
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/signRecord/SignRecord.java
    • -0
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
2:24 下午

jeffli

一次性打印标签改进

广州市第十二人民医院GZS12RMYY-2

Options
    • -3
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/print/printConfig.js
2:21 下午

adairkang

修改列名
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/signRecord.js
2:07 下午

adairkang

ZSYY-216 PDA签收功能改进与PC签收一致
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
2:05 下午

adairkang

ZSYY-216 PDA签收功能改进与PC签收一致
Options
    • -3
    • +10
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
  3. /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/vo
    • -0
    • +102
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/vo/SignRecordVo.java
    • -4
    • +87
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -2
    • +14
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManager.java
1:46 下午

jeffli

把敷料包、消毒物品、外部代理灭菌，显示在辅助发货界面中

佛山市妇幼保健医院FSFY-28

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js
1:40 下午

shuyongfu

解决jira问题:FSFY-31 增加配置项，控制系统提示框的停留时间

先只对灭菌页面增加了此功能

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js
    • -45
    • +45
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
11:25 上午

shuyongfu

赖家豪1月11日发回来的简阳市人民医院现场配置文件
Options
    • -6
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/jysrmyy/config.js
Wednesday 24 Jan 2018
8:09 下午

niutou_ren

中山一院消毒供应项目ZSYY-217（器械包信息改进）

1、补漏提交的TousseInstanceManager文件

2、修复是否显示失效日期及预警颜色判断逻辑的bug

Options
    • -22
    • +34
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -3
    • +44
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
8:09 下午

adairkang

签收记录添加签收人编码字段及旧数据升级
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -4
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
    • -2
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/signRecord/SignRecord.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManager.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.7_4.9.8.sql
    • -1
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/action/signRecordAction.java
8:04 下午

jeffli

标识牌删除部分内容

简阳市人民医院JYSRMYY-3

Options
    • -16
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/config/jysrmyy/print/printConfig.js
8:01 下午

jeffli

高值耗材发货扫描自身条码
Options
    • -0
    • +234
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceForm.js
8:00 下午

jeffli

高值耗材发货扫描自身条码
Options
    • -0
    • +26
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
6:08 下午

chenjiaru

ExtJs框架的升级（代码的改造）
Options
    • -8
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
4:26 下午

chenjiaru

记录申请日志时加上物品id
Options
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/updateLog/ApplicationLogManager.java
    • -6
    • +13
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationComparator.java
    • -0
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/updateLog/ApplicationLogManagerImpl.java
    • -1
    • +15
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dto/TousseItemDto.java
3:34 下午

niutou_ren

中山一院消毒供应项目ZSYY-217(器械包信息改进)

改进：

1、过滤条件增加：(1)灭菌炉分组过滤：数据源：灭菌炉分组设置。根据包实例的灭菌记录中的灭菌炉信息和选择的灭菌炉分组进行对应过滤;(2)装配时间过滤：根据包实例的装配时间进行过滤。默认为空，需要精准到时分

2、增加模糊查询、精确查询 两个查询方式，根据器械包名称进行过滤。

3、器械包信息页面中：包实例没有生成灭菌记录时页面上不显示灭菌程序数据

Options
    • -24
    • +167
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
2:46 下午

yanweining

ZSYY-224：停止一次性物品定时同步申请单功能
Options
    • -4
    • +4
    /ssts-web/src/main/resources/spring/projects/zsyy/timer.xml
1:47 下午

chenjiaru

修复干预申请数量的bug
Options
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js