forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 58
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 58
Total Lines of Code (LoC): 4,712,442
Net change in LoC this week: 1,934

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 19 Jan 2018
10:47 上午

chenjiaru

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）
Options
  1. /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action
    • -0
    • +128
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransition.java
    • -0
    • +71
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
  4. /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition
  5. /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition
    • -0
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js
  7. /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service
    • -0
    • +132
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java
    • -0
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.jsp
    • too large
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +89
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.js
  12. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition
    • -4
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java
    • -5
    • +15
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +9
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
    • -0
    • +10
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
10:25 上午

yanweining

高值耗材：高值耗材发票优化
Options
    • -20
    • +6
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
Thursday 18 Jan 2018
10:31 下午

shuyongfu

功能调整:原功能"包含有高值耗材实例的状态为已结算的使用记录不能删除,为未结算才能删除"调整为"包含有高值耗材实例的结算状态为“已结算”的使用记录不能删除,为未结算才能删除"
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
10:28 下午

shuyongfu

解决问题:高值耗材录使用记录，录两个一样高值耗材定义的物品，库存只扣减1，删掉两个物品后，库存也只增加1
Options
    • -1
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsStockManagerImpl.java
9:52 下午

niutou_ren

修改ExpensiveGoodsManager类中的函数名（getDisposableGoodsTypeTreeJson() -> getExpensiveGoodsTypeTreeJson()）
Options
    • -1
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsStockAction.java
9:29 下午

niutou_ren

1、修改错误的函数名

2、调整高值耗材定义界面

Options
    • -1
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • -116
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js
    • -1
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
9:25 下午

adairkang

DGSFYBJY-6 设置打印发货计划汇总单
Options
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -0
    • +20
    /forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -1
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/config.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java
6:40 下午

ZhuangQinLiu

按钮文字居中显示
Options
    • -33
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
6:32 下午

ZhuangQinLiu

去掉按钮文字居中代码 提交
Options
    • -3
    • +2
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
6:10 下午

shuyongfu

解决状态为灭菌中的灭菌记录的器械包从列表删除后(只是从灭菌物品列表里删除,并未点保存),然后重新载入(或扫描被删除的包条码)及一键入炉不成功的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -6
    • +28
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -1
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
6:06 下午

yanweining

高值耗材：高值耗材入库修改
Options
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsBillItem.java
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
    • -11
    • +14
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -57
    • +63
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
    • -1
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
5:49 下午

jeffli

优化提示信息
Options
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
5:37 下午

jeffli

已退库的高值耗材不允许再次退库
Options
    • -0
    • +10
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
3:23 下午

jeffli

外部代理灭菌包标签问题

江门市中心医院JMSZXYY-12

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
3:01 下午

jeffli

解决bug

添加自定义标签时名称总是提示包含+-*/

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
2:47 下午

ZhuangQinLiu

工作流节点添加 节点自动加1
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js
2:43 下午

ZhuangQinLiu

待办任务按钮文字居中显示
Options
    • -30
    • +55
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
2:33 下午

jeffli

解决bug，退库后库存没有减少
Options
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
2:28 下午

alan.lee

灭菌记录代码改进
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
2:04 下午

alan.lee

解决灭菌记录，在IE下删除固定条码js报错的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
11:56 上午

ZhuangQinLiu

工作流
Options
    • -11
    • +6
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js
11:38 上午

chenjiaru

高值耗材申请单功能部分代码的提交(预入库之后产生外来器械包申请单)
Options
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -0
    • +6
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
11:37 上午

ZhuangQinLiu

待办任务代码更新
Options
    • -9
    • +5
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java
    • -7
    • +1
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
11:24 上午

ZhuangQinLiu

删除节点bug解决
Options
    • -0
    • +19
    /forgon-core/src/main/java/com/forgon/workflow/service/NodeDefinitionManagerImpl.java
10:36 上午

alan.lee

解决灭菌转载不能载入的问题
Options
    • -1
    • +1
    /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
10:33 上午

liuliben

修改注册证重复验证方式
Options
    • -17
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js
    • -23
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
12:27 上午

alan.lee

待灭菌器械包信息汇总
Options
    • -0
    • +14
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -1
    • +45
    /ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/vo/TousseInstanceVo.java
    • -14
    • +34
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -2
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
Wednesday 17 Jan 2018
10:08 下午

yanweining

高值耗材：高值耗材入库
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
9:47 下午

jeffli

修改一键退库bug
Options
    • -2
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
9:35 下午

chenjiaru

高值耗材申请单功能部分代码的提交(预入库之后产生外来器械包申请单)
Options
    • -1
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java