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
Thursday 04 Aug 2016
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
4:37 下午

jeffli

改进装配扣减一次性物品库存代码，优化速度，增加并发控制。
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +1
    /build.gradle
    • -0
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java
    • -0
    • +2
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
3:49 下午

zhonghaowen

修复发货管理不显示住院号
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
12:48 下午

zhonghaowen

修复申请单信息弹窗不会读取住院号数据
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
12:40 下午

adairkang

结算汇总统计报表，供应室领用，按材料类型过滤数据不对的问题
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:53 上午

adairkang

no_comment
Options
    • -7
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
11:35 上午

wangyi

广东省第二中医院大标签失效期、灭绝期字体调大
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gd2zyy/print/printConfig.js
10:59 上午

adairkang

发货单打印,如果是单张单，可以打印住院号(批量打印按键)
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -1
    • +9
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
10:12 上午

zengjc

添加注释
Options
    • -1
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/tousseMaintain/TousseMaintain.java
Sunday 31 Jul 2016
11:48 下午

shuyongfu

更改器械包定义时,增加判断如果包类型为外部代理灭菌修改名称时,也同步更新相关表的器械包名称字段
Options
    • -1
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
11:44 下午

shuyongfu

不需要用到的方法参数从方法定义中去除
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
11:43 下午

shuyongfu

解决一次性物品入库同步时如果明细有多条相同的一次性物品而追溯系统无此物品会导致同步后新增多份重复的一次性物品定义数据
Options
    • -1
    • +14
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
10:44 下午

adairkang

东华发货单和发货计划打印
Options
    • -15
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
9:05 下午

adairkang

发货单打印
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
11:40 上午

adairkang

东华发货单打印
Options
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
Saturday 30 Jul 2016
4:39 下午

adairkang

东华医院发货计划的打印
Options
    • -8
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js