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
Sunday 08 Jan 2017
10:57 下午

adairkang

录使用记录的时候，器械包添加是否真正使用属性,PDA端处理
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +16
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -0
    • +8
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • -1
    • +39
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -1
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
    • -1
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -0
    • +14
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -16
    • +16
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
12:54 下午

adairkang

更接近失效期的提示信息,失效期与当前时间比较，包括时分秒
Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Saturday 07 Jan 2017
7:14 下午

shuyongfu

科室供应室配置把发货数据依据属性提前到发货参数的第一个属性,与器械包回收后发货紧挨到一起了
Options
    • -23
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
6:58 下午

adairkang

录使用记录的时候，器械包添加是否真正使用属性,针对有配置的医院生效
Options
    • -7
    • +5
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
    • -7
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -0
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
6:21 下午

wangyi

篮筐物品明细增加科室字段
Options
    • -0
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -3
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/basketLoadGoodsViewStyle.css
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/basketLoadGoodsView.jsp
6:12 下午

wangyi

篮筐物品明细增加总数量
Options
    • -7
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/basketLoadGoodsView.jsp
5:58 下午

wangyi

增加图标
Options
    • binary
    /ssts-web/src/main/webapp/images/btn_query.jpg
5:56 下午

wangyi

德阳人民医院查询篮筐内物品总数量
Options
    • -0
    • +271
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/basketLoadGoodsViewStyle.css
    • -0
    • +83
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/basketLoadGoodsView.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +22
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
5:24 下午

shuyongfu

解决jira问题:SSTS-93 器械包定义的是否打印材料清单做成可配置,针对广东省医显示、其它医院隐藏
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
3:02 下午

zhonghaowen

科室申领单保存时如果tousseItem是一次性物品,则将tousseItem的tousseDefitionId置空
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:52 下午

chenjiaru

添加清洗记录时，让结束时间和开始时间一样，也每秒刷新一下
Options
    • -0
    • +4
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -4
    • +9
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -24
    • +44
    /ssts-web/src/main/webapp/js/common.js
    • -2
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
  5. /forgon-core/src/main/java/com/forgon/servertime/dwr
    • -4
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
    • -0
    • +39
    /forgon-core/src/main/java/com/forgon/servertime/dwr/ServerTimeTableManager.java
2:03 下午

adairkang

更接近失效期的提示信息，只针对普通器械包有此功能
Options
    • -0
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
12:44 下午

terrykwan

完善测试用例
Options
    • -12
    • +1057
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
12:44 下午

terrykwan

增加注释
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
10:40 上午

adairkang

使用记录提示更接近失效期的包实例条码，添加当前科室的过滤
Options
    • -0
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Friday 06 Jan 2017
7:47 下午

adairkang

使用记录扫描器械包条码时，提示还有失效期更前的器械包(ZSSZYY-75)，
Options
    • -2
    • +32
    /forgon-tools/src/main/java/com/forgon/tools/string/StringTools.java
7:45 下午

wangyi

未来器械拆包界面增加灭菌日期选项
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -2
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
7:39 下午

adairkang

使用记录扫描器械包条码时，提示还有失效期更前的器械包(ZSSZYY-75)，添加对已扫条码的过滤

pda也加上此功能

Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -0
    • +14
    /forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
    • -4
    • +14
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -3
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -1
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
6:26 下午

wangyi

外来器械干预显示器械总件数
Options
    • -49
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
6:12 下午

shuyongfu

解决jira问题:GDSRMYY-255 敷料包可通过回收清点界面进行回收（bug）

器械包定义修改的相关联动处理

Options
    • -23
    • +38
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
6:06 下午

zhonghaowen

运作监控增加装配任务组统计
Options
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/service/TaskGroupManager.java
    • -0
    • +239
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
    • -0
    • +85
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/IpRoomControlHelper.java
    • -0
    • +62
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager2.java
    • -48
    • +135
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
    • -0
    • +96
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
    • -62
    • +60
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/action/SupplyRoomControlAction.java
    • -0
    • +97
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/action/TaskGroupAction.java
    • -0
    • +110
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/StRoomControlHelper.java
    • -0
    • +96
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RvRoomControlHelper.java
    • -5
    • +7
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
    • -0
    • +5
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
    • -0
    • +86
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/vo/SupplyRoomVo.java
  15. /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/vo
  16. … 5 more files in changeset.
5:59 下午

zhonghaowen

修改科室申领按器械包分组过滤条件
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
5:48 下午

chenjiaru

把方法移到对应的服务类
Options
    • -1
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
    • -15
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java
    • -2
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -10
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
5:35 下午

zhonghaowen

科室申领按器械包分组过滤一次性物品
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
5:01 下午

adairkang

自定义装配界面，标签模板无法打印科室的问题
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
4:50 下午

adairkang

使用记录扫描器械包条码时，提示还有失效期更前的器械包(ZSSZYY-75)
Options
    • -16
    • +25
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -0
    • +13
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
    • -0
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
    • -0
    • +16
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
4:24 下午

adairkang

德阳发货单打印改用江门的(罗乐要求的)
Options
    • -28
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js
4:10 下午

adairkang

德阳市人民医院修改医院名称
Options
    • -22
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js
3:54 下午

wangyi

回收触摸屏添加科室赛选支持分页功能
Options
    • -15
    • +56
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/tit_bg_0201.jpg
    • -0
    • +7
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.5.7_4.5.8_oracle.sql
    • -2
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • -0
    • +3
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.5.7_4.5.8_sqlserver.sql
    • -10
    • +30
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -27
    • +22
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
3:19 下午

chenjiaru

解决：SSTS-92 灭菌篮筐监控增加分页显示功能,能查询和显示第三次以前的数据
Options
    • -0
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitor.jsp
    • -0
    • +31
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
    • -1
    • +94
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -0
    • +10
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -18
    • +183
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitorView.js