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
Friday 05 Aug 2016
9:40 上午

adairkang

无菌物品质量确认管理(ZSWY-1)
Options
    • -0
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • -10
    • +30
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java
  4. /ssts-web/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -5
    • +7
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManager.java
    • -2
    • +47
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
  8. /ssts-web/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring
    • -0
    • +355
    /ssts-web/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action/QualityMonitoringAction.java
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -0
    • +6
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
  14. /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/action
    • -8
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
  16. … 3 more files in changeset.
9:34 上午

adairkang

一些代码重构
Options
    • -19
    • +7
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -41
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -4
    • +5
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
9:32 上午

jeffli

优化固定条码消毒物品发货速度
Options
    • -2
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -3
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
Thursday 04 Aug 2016
7:16 下午

wangyi

增加外来器械查询材料定义方法
Options
    • -0
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
    • -0
    • +17
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
6:55 下午

shuyongfu

解决jira问题:

GDSRMYY-104 回收人员与清点人员默认为空

GDSRMYY-105 配包人,审核人默认为空(改进)

Options
    • -3
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -2
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
6:54 下午

shuyongfu

解决器械包告警-批量回收功能的缺陷及扫描清洗筐的提示优化
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
    • -5
    • +8
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
6:10 下午

chenjiaru

解决：GZFDZL-64 控制面板-供应商管理，如果一个公司既是一次性物品供应商也是外来器械供应商的话，系统只能添加一个

做了以下改善：

1、厂商类型的列宽增加了，

2、添加和修改时，公司名称相同，而厂商类型不同也可以保存了

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.js
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java
    • -5
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js
6:10 下午

wangyi

外来器械回收bug修复
Options
    • -1
    • +12
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -23
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
5:42 下午

shuyongfu

解决系统提醒的内容较多导致'查看消息'按钮与消息内容重叠的问题
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
4:50 下午

wangyi

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
    • -15
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
    • -16
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/body_bg.jpg
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/customIntoBasket.png
4:21 下午

shuyongfu

解决jira问题:ZSSXLRMYY-56 消息发布管理 的内容 字数限制太少。需加长JS控制
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/message/messageForm.js
3:01 下午

wangyi

外来器械触摸屏回收问题修改
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -8
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:37 下午

jeffli

解决bug：

发货报错后会返回发货计划列表界面

Options
    • -3
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
10:45 上午

jeffli

优化灭菌物品装载扫描清除条码处理，如果是单个扫描模式，不管扫描成功与否，都清除条码输入框。
Options
    • -1
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
10:29 上午

jeffli

优化审核扫描清除条码处理，如果是单个扫描模式，不管扫描成功与否，都清除条码输入框。
Options
    • -5
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
10:25 上午

wangyi

外来器械回收整合到触摸屏回收里面
Options
    • -1
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java
    • -0
    • +77
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
    • -23
    • +28
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java
    • -3
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/updateAmount.jsp
    • -0
    • +2
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java
    • -47
    • +110
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/AddRecyclingRecordTests.java
    • -0
    • +37
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
    • -0
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -0
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
  16. … 30 more files in changeset.
10:01 上午

chenjiaru

优化以下两点

1、用户手动添加和更新科室

2、从his那边同步和更新科室

无论手动添加还是从his同步的，都不允许出现同名科室

Options
    • -2
    • +13
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -4
    • +6
    /ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • -4
    • +23
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dwr/DataSynchronizationTableManager.java
    • -7
    • +30
    /ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
    • -0
    • +15
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java
9:35 上午

cherry

更新版本及PDA
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.24_20160804.apk
    • -1
    • +1
    /build.gradle
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
9:34 上午

adairkang

东华现场返回的发货计划打印配置
Options
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
9:33 上午

shuyongfu

东莞东华医院现场同步配置文件调整,罗乐提供
Options
    • -4
    • +4
    /ssts-web/src/main/resources/config/dgsdhyy/dataSyncConfig.json
Wednesday 03 Aug 2016
6:46 下午

jeffli

优化发货扫描清除条码处理，如果是单个扫描模式，不管扫描成功与否，都清除条码输入框。
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
10:39 上午

zhonghaowen

ZSSXLRMYY-52 申请物品 页面 增加一个 “提交并新建” 按钮
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
10:26 上午

jeffli

解决bug：

发货单回写时，如果未找到批次，或者物品的物资编码为空，会导致回写数据和发货单不一致（缺少部分item）。

Options
    • -5
    • +9
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
10:06 上午

jeffli

发货超时后返回发货计划列表界面，防止重复提交
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
9:31 上午

adairkang

隐藏打印器械包明细单按钮
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
9:23 上午

adairkang

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
12:18 上午

adairkang

东华医院发货单及中标签打印格式调整
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -26
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
Tuesday 02 Aug 2016
12:02 下午

shuyongfu

解决jira问题:PYQZYY-52 供应室器械包库存，统计数量是‘已发货到科室’、‘已灭菌’都算成供应室库存，需要改进。

先屏蔽了‘科室器械包库存’这个菜单,因为器械包信息和器械包库存临床也能看

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
1:05 上午

adairkang

东华医院中标签打印:

中标签，打两个条码，没有清单

中标签2打印一个条码和清单

Options
    • -13
    • +110
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
Monday 01 Aug 2016
4:47 下午

jeffli

改进装配扣减一次性物品库存代码，优化速度，增加并发控制。
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java