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: 1,813

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 15 Jan 2018
10:05 上午

ZhuangQinLiu

流程定义的bug修复代码提交
Options
    • -10
    • +11
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -4
    • +4
    /ssts-web/.settings/org.eclipse.wst.common.project.facet.core.xml
    • -0
    • +8
    /ssts-web/src/main/webapp/homepage/menu.jsp
  4. /ssts-expensivegoods/.settings/gradle
    • -9
    • +93
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java
    • -0
    • +4
    /ssts-expensivegoods/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
    • -2
    • +2
    /ssts-web/.classpath
    • -0
    • +7
    /ssts-tousse/.externalToolBuilders/org.zeroturnaround.eclipse.rebelXmlBuilder.launch
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
    • -33
    • +66
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
  11. /ssts-web/WEB-INF
    • -1
    • +1
    /ssts-client-misc/.settings/org.eclipse.jdt.core.prefs
    • -1
    • +1
    /ssts-toussereturndisinfect/.settings/org.eclipse.jdt.core.prefs
    • -5
    • +17
    /forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowApprovalTaskAction.java
    • -11
    • +17
    /ssts-web/src/main/webapp/systemmanage/workFlow/approvalRecord.js
  16. … 17 more files in changeset.
9:24 上午

niutou_ren

1、修复“修改高值耗材定义”时，无法选择注册证的bug（选择生产厂家之后才能修改注册证->如果有生产厂家，则不需要重新选择就可以修改注册证）

2、导入高值耗材中，增加生产厂家、注册证、注册证有效期等列。

Options
    • -1
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • -2
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
    • -3
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
    • -0
    • +2291
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -7
    • +7
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsImportController.java
    • -172
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js
    • -6
    • +6
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsStockAction.java
    • -68
    • +130
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importexpensivegoods/service/ImportExpensiveGoodsManagerImpl.java
9:19 上午

adairkang

GYSDERMYY-9 申请单显示的发货数量不正确

回收添加对历史回收记录及申请单的锁定

Options
    • -0
    • +12
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -0
    • +176
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
    • -1
    • +0
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Sunday 14 Jan 2018
7:10 下午

chenjiaru

解决：在灭菌那个界面，由于灭菌失败填写的质量监测，只要把“是否整炉”勾上，那么无论选择“重新回收”或者“重新装配”，再次打开都是没有勾上的bug
Options
    • -8
    • +42
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
7:04 下午

chenjiaru

把PackingTask的sourceTousseInstanceIds字段长度从255改为4000（解决中大五院灭菌失败登记质量监测时的报错问题）
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.6_4.9.7_sqlserver.sql
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • -1
    • +2
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.6_4.9.7_oracle.sql
4:37 上午

alan.lee

解决：中山一院消毒供应项目ZSYY-198

不追溯物品灭菌记录和灭菌装载优化

Options
    • -1
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -39
    • +38
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/waste/TousseInstanceWasteTests.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -14
    • +49
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/SterileLoadingManagerTests.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -2
    • +41
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
Saturday 13 Jan 2018
9:53 下午

liuliben

修改高值耗材供应商三证显示方式
Options
    • -17
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.js
    • -0
    • +36
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/ExpensiveGoodsSupplier.java
    • -14
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/ExpensiveGoodsSupplierAction.java
    • -35
    • +83
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
    • -9
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp
9:52 下午

chenjiaru

高值耗材申请单功能部分代码的提交(预入库之后产生外来器械包申请单)
Options
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoodsapplication/ExpensiveGoodsApplication.java
    • -0
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • -4
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js
    • -0
    • +196
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -2
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationFormForApproval.js
8:12 下午

alan.lee

灭菌记录：一键入炉如果存在固定条码，则去做汇总
Options
    • -4
    • +94
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
6:23 下午

liuliben

修复高值耗材授权方面问题
Options
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.jsp
    • -33
    • +37
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js
    • -9
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
    • -33
    • +37
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
6:11 下午

shuyongfu

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

shuyongfu

1月10日李健平发回来的珠江医院现场配置文件
Options
    • -4
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
    • -2
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
    • -1
    • +1
    /ssts-web/src/main/resources/config/zjyy/dataSyncConfig.json
6:01 下午

shuyongfu

1月7日陈国强发回来的现场config.js配置文件
Options
    • -1
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
3:29 下午

jeffli

rebel文件改为相对路径
Options
    • -1
    • +1
    /ssts-expensivegoods/src/main/resources/rebel.xml
Friday 12 Jan 2018
4:59 下午

ZhuangQinLiu

流程定义 解决同一个流程出现多个名称一样的节点
Options
    • -0
    • +18
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js
4:51 下午

ZhuangQinLiu

流程定义bug问题部分更新
Options
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManager.java
    • -49
    • +93
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js
    • -12
    • +36
    /forgon-core/src/main/java/com/forgon/workflow/action/WorkFlowAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -3
    • +21
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js
    • -42
    • +91
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java
    • -0
    • +564
    /ssts-web/src/main/webapp/dataUpdater/logs/updateReport.txt
4:42 下午

yanweining

高值耗材：高值耗材验收单表打印
Options
    • -9
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
4:24 下午

niutou_ren

修改高值耗材页面由于没有关联注册证id导致的提交数据丢失的bug
Options
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -9
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js
    • -5
    • +6
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • -1
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
4:13 下午

liuliben

修复供应商添加证件时判断条件
Options
    • -7
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
2:36 下午

yanweining

高值耗材：高值耗材入库代码修改
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -2
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -8
    • +7
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • -20
    • +7
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -53
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
    • -8
    • +8
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
    • -52
    • +39
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -1
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
1:48 下午

adairkang

东莞妇幼的配置项，弄错了，配置到了广东省妇幼保健院了
Options
    • -3
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsfybjyy/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/config.js
1:40 下午

liuliben

高值耗材授权功能添加上传附件功能
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoods/ExpensiveGoodsAuthorization.java
    • -0
    • +110
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoods/AuthorizationCertification.java
    • -21
    • +146
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.jsp
    • -1
    • +51
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoods/RelevancyGoodsAuthorization.java
    • -14
    • +104
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • -134
    • +494
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js
    • -3
    • +14
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
    • -4
    • +137
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/ExpensiveGoodsSupplier.java
1:39 下午

liuliben

高值耗材供应商三证管理功能
Options
    • -1
    • +32
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
    • -2
    • +45
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java
    • -17
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/ExpensiveGoodsSupplierAction.java
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp
    • -1
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.js
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
    • -21
    • +148
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
12:04 下午

yanweining

ZSYY-210：一次性物品入库单管理增加打印批号按钮
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
11:59 上午

niutou_ren

江门市中心医院JMSZXYY-10

1、把江门市材料发货单的备注项的数据源由remark改为remark2，显示备注

2、在invoiceView.js的批量打印功能中，增加备注筛选，如果所选发货单的备注都相同，则显示备注；否则，不予显示备注

Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/print/printConfig.js
    • -1
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
11:50 上午

adairkang

DGSFYBJY-7 设置打印回收清单
Options
    • -0
    • +40
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/DepartRecycleTousse.java
    • -0
    • +58
    /ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsfybjyy/config.js
11:35 上午

ZhuangQinLiu

在申请单在跑流程时，不让其修改流程定义内容
Options
    • -24
    • +33
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java
9:32 上午

alan.lee

灭菌记录代码优化
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -9
    • +36
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Thursday 11 Jan 2018
10:20 下午

chenjiaru

高值耗材申请单功能部分代码的提交
Options
    • -10
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java
10:16 下午

niutou_ren

修改高值耗材导入模板（把注册证id改为：注册证）并修复1个bug

1、没有在spring中配置ImportExpensiveGoodsManagerImpl导致的空指针异常

Options
    • -8
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js
    • too large
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -13
    • +3
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importexpensivegoods/service/ImportExpensiveGoodsManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/importExpensiveGoods.jsp