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 21 Jul 2016
1:33 上午

wangyi

增加临床科室申请外部代理灭菌功能
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -6
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyItem.java
    • -11
    • +9
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
    • -1
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/foreignproxydisinfection/ForeignProxyDisinfection.java
    • -1
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -4
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -4
    • +15
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/ForeignProxyDisinfectionManagerInvokerThread.java
    • -0
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManager.java
    • -76
    • +153
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -110
    • +44
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
    • -6
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -5
    • +11
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java
    • -0
    • +802
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/tousseitem/service/TousseItemManagerImpl.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -44
    • +14
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
Wednesday 20 Jul 2016
6:18 下午

zengjc

解决装配界面部分器械包显示不了图片的问题，解决jira问题ZSSXLRMYY-43
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/showTousseImage/showTousseIamge.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -1
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
5:44 下午

shuyongfu

处理jira问题:

DGDHYY-4 申请借物的处理科室重选问题 (问题的第二点部分归还未修复)

DGDHYY-6 消毒物品申请单没有默认申请科室和结算科室问题

DGDHYY-7 科室互借在借用科室页面也显示和打印(可以显示,打印暂未处理完成)

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp
    • -30
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • -4
    • +70
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
    • -21
    • +110
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/untracableTousseForm.js
5:44 下午

jeffli

优化添加清洗记录扫描条码的异常处理
Options
    • -11
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
5:41 下午

shuyongfu

东莞东华医院接口调整
Options
    • -2
    • +9
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dgsdhyy/WebServiceClientHelper.java
    • -24
    • +25
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/dgsdhyy/InventoryDaoImpl.java
5:26 下午

jeffli

优化外来器械回收扫描清洗篮筐条码的异常处理
Options
    • -3
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/dwr/table/ContainerTableManager.java
5:22 下午

adairkang

装配界面超时提醒
Options
    • -1
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • -0
    • +24
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -4
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -9
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -0
    • +12
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
4:35 下午

jeffli

解决bug：

外来器械未配置加急，发货计划界面加急数量显示为1

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
3:53 下午

zengjc

器械清洗不合格部位和评估方法数量统计，可以自定义统计项，解决jiar问题ZSSXLRMYY-19
Options
    • -9
    • +58
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.js
    • -1
    • +8
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoringconfig/service/QualityMonitoringConfigManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringItem.java
3:49 下午

adairkang

无语
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
3:47 下午

wangyi

质量检测报表导出excel无名字
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
3:13 下午

jeffli

器械包加急发货处理
Options
    • -1
    • +16
    /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
3:00 下午

jeffli

器械包加急发货处理
Options
    • -0
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
    • -5
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
3:00 下午

jeffli

器械包加急发货处理
Options
    • -1
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • -0
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
2:48 下午

shuyongfu

省医定时废弃器械包实例代码调整
Options
    • -11
    • +17
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
2:47 下午

shuyongfu

器械包库存代码注释
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
10:39 上午

zhonghaowen

解决jira问题:PYQZYY-49 一次性物品需要添加新配置项“最大申请数量”,添加当修改一次性用品申请数量超过最大申请数量时弹出框提示
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
10:14 上午

shuyongfu

省医定时废弃器械包实例代码调整
Options
    • -2
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
9:32 上午

shuyongfu

省医定时废弃器械包实例的定时器代码调整
Options
    • -6
    • +23
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
9:32 上午

shuyongfu

省医定时废弃器械包实例的定时器代码调整
Options
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/gdsy/timer.xml
8:52 上午

adairkang

清洗、审核、灭菌超时提醒
Options
    • -0
    • +7
    /forgon-core/src/main/java/com/forgon/timeout/service/TimeoutManager.java
    • -0
    • +15
    /forgon-core/src/main/java/com/forgon/timeout/action/TimeoutAction.java
    • -0
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -0
    • +6
    /ssts-web/src/main/webapp/ext/fontSize12/treepanel/resources/css/column-tree.css
    • -0
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -10
    • +25
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -1
    • +10
    /forgon-core/src/main/java/com/forgon/timeout/service/TimeoutManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
    • -1
    • +13
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • -11
    • +34
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/timeoutSetting.js
    • -6
    • +32
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -1
    • +32
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
Tuesday 19 Jul 2016
11:32 下午

shuyongfu

物资接口同步代码优化
Options
    • -1
    • +3
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dwr/InventoryTableManager.java
    • -12
    • +28
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
11:31 下午

shuyongfu

更改科室名称时,增加对灭菌炉所属科室名称的联动修改
Options
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
6:21 下午

zhonghaowen

解决jira问题:PYQZYY-49 一次性物品需要添加新配置项“最大申请数量”,一次性物品管理,增加显示最大申请数量,修改自大申请数量
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -1
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
5:32 下午

zhonghaowen

解决jira问题:PYQZYY-49 一次性物品需要添加新配置项“最大申请数量”
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -2
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/goodsapplicationcffirm/goodsApplicationCffirmView.js
5:19 下午

chenjiaru

解决jira问题:DGDHYY-1 人员同步时对手工加入的人员处理
Options
    • -4
    • +7
    /ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • -0
    • +16
    /forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java
    • -4
    • +5
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • -0
    • +18
    /forgon-core/src/main/java/com/forgon/security/model/User.java
    • -0
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
    • -0
    • +1
    /forgon-core/src/main/resources/com/forgon/directory/model/OrgUnit.hbm.xml
    • -6
    • +8
    /ssts-web/src/main/webapp/systemmanage/userExtView.js
    • -0
    • +13
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java
    • -15
    • +25
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/userFormExt.js
4:05 下午

wangyi

修复外来器械添加新的包保存不了
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
2:49 下午

shuyongfu

解决jira问题:GDSRMYY-78 器械包实例废弃或者过期，器械包库存没有相应扣减
Options
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/gdsy/timer.xml
2:33 下午

shuyongfu

解决jira问题:GDSRMYY-78 器械包实例废弃或者过期，器械包库存没有相应扣减
Options
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
1:59 下午

shuyongfu

解决jira问题:GDSRMYY-78 器械包实例废弃或者过期，器械包库存没有相应扣减
Options
    • -0
    • +22
    /ssts-web/src/main/resources/spring/projects/gdsy/timer.xml
    • -0
    • +54
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -0
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java