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
Wednesday 10 Apr 2019
3:34 下午

shuyongfu

删除历史版本的apk安装文件,只保留最新版本的一个,历史安装文件已移至下面的svn路径

https://home.forgon.com/svn/Projects/SterileSupplySystem/移动客户端/android/发布程序

Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.66_20190304_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.69_20190401_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.57_20190123_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.58_20190124_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.64_20190225_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.60_20190218_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.59_20190216_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.67_20190320_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.63_20190219_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.56_20190118_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.65_20190226_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.70_20190403_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.68_20190327_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.69_20190402_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.68_20190325_v4_1_release.apk
2:32 下午

shuyongfu

解决Jira问题:GDSZYY-3 PDA的开发（型号eda51）
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.71_20190410_v4_1_release.apk
11:30 上午

zengyuan

修改灭菌报告 打印按钮的隐藏显示控制
Options
    • -2
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp
11:11 上午

zc.li

完善：GDSZYY-2。优化过滤资产归属方式
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
10:56 上午

yanweining

修改器械包定义所属科室表名称：TousseDefinitionBelongDepart
Options
    • -0
    • +149
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongDepartManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -83
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionBelongOrgUint.java
    • -0
    • +48
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongDepartManager.java
    • -4
    • +4
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -3
    • +3
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • -0
    • +83
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionBelongDepart.java
    • -48
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongOrgUintManager.java
    • -149
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongOrgUintManagerImpl.java
10:32 上午

zc.li

解决:GZZYYFY-37.科室供应室配置中，增加一个“不合并的申请单类型”下拉选项,可设置器械包申请单、一次性物品申请单是否为合并类型.已打印或者已发货、部分发货的申请单不合并。
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
10:28 上午

zc.li

解决：GZZYYFY-36。提供科室分组下拉框数据，添加科室分组过滤回收列表。

Options
    • -2
    • +4
    /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
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java
    • -0
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java
Tuesday 09 Apr 2019
6:03 下午

yanweining

GDSZYY-2:包定义增加资产归属管理

新增表：记录器械包定义所属科室信息：

TousseDefinitionBelongOrgUint

Options
    • -0
    • +149
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongOrgUintManagerImpl.java
  2. /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -0
    • +38
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/TousseDefinitionParameterDto.java
    • -5
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
    • -0
    • +83
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionBelongOrgUint.java
    • -2
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -0
    • +11
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
  11. /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service
    • -29
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/setDepartOrgUnitForm.js
    • -6
    • +9
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • -0
    • +48
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/tousseDefinitionBelongOrgUnit/service/TousseDefinitionBelongOrgUintManager.java
    • -21
    • +51
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -55
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
5:47 下午

weizhenyu

GZZYYFY-35:装配界面的打印回收清单格式改进 各科器械的内容字体加大
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
Monday 08 Apr 2019
6:03 下午

zc.li

解决：GZZYYFY-38。科室申领中勾选申请单然后点击打印发货计划时将同一个科室的发货计划申请单排序在一起打印，不分申请单类型，先打印器械包申请单，再打印一次性物品申请单，其他单类型排序第三。
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
3:48 下午

zc.li

完善：ASSGGSRMYY-25。修正消毒供应中心运作监控回收数量和清洗数量。
Options
    • -3
    • +3
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
    • -2
    • +3
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
2:44 下午

zengyuan

新疆军区总医院 XJJQZYY-65 器械材料补充丢失报损能够选择仓库 隐藏材料库存报表页面
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
2:08 下午

yanweining

XJJQZYY-65:器械材料补充丢失报损能够选择仓库

1)显示材料库存报表页面

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
1:59 下午

zengyuan

新疆军区总医院 XJJQZYY-65 器械材料补充丢失报损能够选择仓库
Options
    • -2
    • +47
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js
1:50 下午

yanweining

XJJQZYY-65:器械材料补充丢失报损能够选择仓库

1)补充丢失报损增加仓库id

Options
    • -9
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java
    • -8
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/MaterialSupplementTests.java
11:57 上午

yanweining

XJJQZYY-65:器械材料补充丢失报损能够选择仓库

1)补充丢失报损增加仓库id

Options
    • -4
    • +5
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/controller/MaterialErrorDamageController.java
    • -2
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java
    • -2
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManager.java
    • -7
    • +13
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
9:54 上午

zc.li

解决：XJJQZYY-63。消毒供应中心工作人员绩效评分报表增加下送数量评分标准。
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setWorkScoreConfig.js
Sunday 07 Apr 2019
4:05 下午

terrykwan

优化测试用例代码
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
Saturday 06 Apr 2019
11:20 上午

terrykwan

暂时不运行synthetic测试用例，因为需时太长
Options
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AllTests.java
12:34 上午

terrykwan

修改执行的测试用例
Options
    • -1
    • +1
    /ssts-web/build.gradle
Friday 05 Apr 2019
11:52 下午

terrykwan

修改测试用例
Options
    • -1
    • +1
    /ssts-web/build.gradle
11:18 下午

terrykwan

测试xml格式的测试用例报表
Options
    • -2
    • +15
    /ssts-web/build.gradle
6:00 下午

terrykwan

增加Junit测试套件类
Options
    • -0
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recall/AllTests.java
    • -6
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisinfectGoodRecyclingApplication.java
    • -0
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileunload/AllTests.java
    • -0
    • +43
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/AllTests.java
    • -0
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileLoading/AllTests.java
    • -0
    • +46
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AllTests.java
    • -0
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/borrow/AllTests.java
    • -0
    • +18
    /ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/AllTests.java
    • -0
    • +21
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/AllTests.java
    • -0
    • +17
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/AllTests.java
    • -0
    • +18
    /ssts-web/src/test/java/test/forgon/disinfectsystem/printRecyclingApplicationConfig/AllTests.java
    • -0
    • +18
    /ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/AllTests.java
    • -0
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/common/AllTests.java
    • -0
    • +34
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/AllTests.java
    • -0
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/waste/AllTests.java
  16. … 23 more files in changeset.
5:59 下午

terrykwan

排除自动化测试类
Options
    • -0
    • +1
    /ssts-web/build.gradle
4:44 下午

terrykwan

删除几个不需要的测试用例类
Options
  1. /ssts-web/src/test/java/test/forgon/security
    • -0
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestInvoiceItem.java
  3. /ssts-web/src/test/java/test/forgon/junit4
  4. /ssts-web/src/test/java/test/forgon/security/acl
    • -25
    • +0
    /ssts-web/src/test/java/test/forgon/junit4/MyTest1.java
    • -0
    • +0
    /ssts-web/src/test/java/test/forgon/junit4/Junit4MultiTest.java
    • -0
    • +0
    /ssts-web/src/test/java/test/forgon/junit4/Junit4Test.java
Thursday 04 Apr 2019
9:59 下午

zc.li

解决：ASSGGSRMYY-25。解决消毒供应中心运作监控查到器械包回收和发货数量跟器械包工作量统计报表不一致的问题。
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
    • -1
    • +3
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
    • -1
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
    • -1
    • +2
    /ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/WdRoomControlHelper.java
9:16 下午

zc.li

代码优化
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -113
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/GoodFilterConfigTest.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
6:00 下午

shuyongfu

解决Jira问题:XJJQZYY-68 满意度调查表增加查看未填写科室按钮
Options
    • -1
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.js
    • -0
    • +80
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTemplateAction.java
    • -3
    • +2
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManager.java
    • -12
    • +3
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTableManagerImpl.java
    • -12
    • +18
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTemplateManagerImpl.java
    • -3
    • +2
    /ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/service/SatisfactionSurveyTemplateManager.java
5:58 下午

shuyongfu

解决:GZZYYFY-31 PDA发货一次性物品时增加一键扫描一次性物品功能按钮

一键扫描一次性按钮的隐藏与否的补充

版本号调整为4.6.70,提供给某些4.6.69版本进行此功能的更新

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
5:21 下午

weizhenyu

GZZYYFY-35:装配界面的打印回收清单格式改进
Options
    • -18
    • +33
    /ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js