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
Monday 22 Jan 2018
9:56 上午

ZhuangQinLiu

待办任务和流程定义这一模块，演示后需求修改后的部分代码提交
Options
    • -0
    • +13
    /forgon-core/src/main/java/com/forgon/workflow/model/WorkFlowApprovalTask.java
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java
    • -48
    • +54
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js
    • -79
    • +151
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java
    • -15
    • +26
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManager.java
    • -0
    • +187
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecordView.js
    • -198
    • +0
    /ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js
    • -0
    • +26
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskChooseNextOne.jsp
    • -54
    • +57
    /forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowAction.java
    • -16
    • +18
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js
    • -10
    • +21
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java
    • -0
    • +89
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskChooseNextOneForm.js
    • -29
    • +93
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
    • -20
    • +26
    /forgon-core/src/main/java/com/forgon/workflow/service/NodeDefinitionManagerImpl.java
    • -0
    • +26
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp
  16. … 5 more files in changeset.
9:26 上午

chenguina

pda版本更新至4.6.12
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.12_20180117_v4_1_release.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.8_20171215_4.1-release.apk
Sunday 21 Jan 2018
10:50 下午

chenjiaru

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）
Options
    • -19
    • +22
    /forgon-core/src/main/java/com/forgon/security/action/UserAction.java
    • -0
    • +14
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -3
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransition.java
    • -0
    • +18
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManager.java
    • -0
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.jsp
    • -0
    • +93
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
    • -0
    • +6
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +27
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManagerImpl.java
    • -0
    • +18
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -1
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationFormForApproval.js
    • -1
    • +106
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
    • -28
    • +0
    /forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
    • -1
    • +16
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
    • -25
    • +0
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
  16. … 8 more files in changeset.
4:57 下午

niutou_ren

东莞中医院DGZYY-136(器械包信息模块中，过期包数据行颜色调整)

1、增加对即将过期和过期的器械包名称数据列，分别添加黄色和红色提示

2、在工具条上增加红色杠，黄色杠，并对颜色进行注明：黄色代表即将过期；红色代表已经过期。

Options
    • -3
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -0
    • +7
    /ssts-web/src/main/webapp/common/common.css
3:15 下午

jeffli

发货计划界面，物品类型下拉栏中的“外来器械包”默认不勾选。

深圳南山人民医院SZNSRMYY-11

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js
    • -0
    • +10
    /ssts-web/src/main/webapp/ext/js/multiSelectCombo.js
    • -3
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
2:56 下午

niutou_ren

中山一院消毒供应项目ZSYY-218（器械包信息按灭菌日期过滤查询出不对应的数据）

1、添加器械包过滤条件：如果查询条件中有灭菌开始时间或者灭菌结束时间，则添加灭菌记录id不为空的条件（数据库中存在灭菌开始时间不为空，但是灭菌记录id为null的记录，过滤掉这些记录）

2、完善了按任务组和器械包状态过滤时的实现代码

Options
    • -22
    • +13
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
Saturday 20 Jan 2018
4:12 下午

adairkang

条码数据类型
Options
    • -3
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java
3:32 下午

liuliben

修改高值耗材库存预警界面
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsWarningView.jsp
2:46 下午

jeffli

一键退库功能调整
Options
    • -1
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
    • -1
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -34
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js
    • -0
    • +49
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
Friday 19 Jan 2018
10:04 下午

chenjiaru

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）
Options
    • -13
    • +39
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java
    • -0
    • +1
    /ssts-web/src/main/webapp/js/common.js
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
8:14 下午

alan.lee

灭菌完成后去更新包的失效日期
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +8
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • -0
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
6:37 下午

yanweining

高值耗材：高值耗材发票修改
Options
    • -6
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js
    • -102
    • +61
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
5:46 下午

liuliben

修复高值耗材预警问题
Options
    • -29
    • +33
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
    • -194
    • +278
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsWarningView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsWarningView.jsp
    • -4
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/dwr/table/RegistrationCertificateTableManager.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
5:36 下午

liuliben

解决注册证JS报错问题
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
4:29 下午

liuliben

添加高值耗材界面权限管理
Options
    • -9
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.jsp
    • -0
    • +12
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.js
    • -8
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.js
    • -9
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp
    • -3
    • +3
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +18
    /ssts-web/src/main/webapp/homepage/menu.jsp
3:06 下午

alan.lee

解决灭菌转载批量载入显示不全的Bug
Options
    • -135
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • -8
    • +5
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
2:58 下午

jeffli

增加高值耗材退库权限
Options
    • -0
    • +5
    /ssts-web/src/main/resources/systemset/operationDefine.xml
2:24 下午

jeffli

增加高值耗材退库权限
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -126
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp
12:20 下午

shuyongfu

解决灭菌装载的性能问题(页面右下角的入筐器械包列表的加载时间太长,预计效率可以提升3-5倍)
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -2
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseSimpleVO.java
11:52 上午

jeffli

解决入库菜单权限bug
Options
    • -6
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -20
    • +20
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
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