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 16 Apr 2017
1:28 下午

zengjc

解决jira问题GDSRMYY-296,GDSRMYY-306,清洗区工作量不合格报表，设置手术器械科室后对旧的数据也生效，添加设置科室分组，分组的清洗数据会列到查询结果中;设置科室分组的功能做成了配置，目前只有广东省医进行配置.
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -1
    • +58
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/dwr/table/JasperreportsTableManager.java
    • -1
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/washWorkloadReportView.js
    • -6
    • +143
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -1
    • +376
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setDepartmentOption.js
    • -0
    • +5
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
    • -0
    • +53
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
    • -0
    • +10
    /forgon-core/src/main/java/com/forgon/systemsetting/service/HttpOptionManager.java
    • -0
    • +4
    /forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
    • -0
    • +59
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/CrossTableBean.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -2
    • +5
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -0
    • +9
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -198
    • +144
    /ssts-web/src/main/webapp/jasperRtp/mainWashWorkloadReprot.jrxml
  16. … 4 more files in changeset.
Saturday 15 Apr 2017
7:16 下午

terrykwan

优化切换到iframe的方法
Options
    • -2
    • +1
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
4:51 下午

adairkang

删除不用的注入bean
Options
    • -7
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/dwr/TousseGroupTableManager.java
2:37 下午

adairkang

表名修改
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlanItem.java
2:11 下午

adairkang

器械交接单的保存
Options
    • -7
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManager.java
    • -2
    • +61
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • -11
    • +39
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManagerImpl.java
    • -12
    • +53
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java
    • -2
    • +30
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -1
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java
1:42 下午

adairkang

修改注释
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlanItem.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionRecord.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlan.java
1:37 下午

chenjiaru

优化测试用例的测试数据
Options
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -0
    • +20
    /ssts-web/src/main/java/test/forgon/constant/Constants.java
    • -0
    • +6
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
10:19 上午

adairkang

提交注释
Options
    • -3
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java
10:14 上午

adairkang

保存器械交接申请单的接口定义
Options
    • -1
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java
10:11 上午

adairkang

器械交接申请单PO类及对应的Manager方法
Options
    • -0
    • +110
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlanItem.java
    • -0
    • +36
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManagerImpl.java
    • -0
    • +114
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlan.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionRecord.java
    • -0
    • +16
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManager.java
    • -0
    • +28
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanManagerImpl.java
    • -0
    • +26
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionPlanItemManager.java
Friday 14 Apr 2017
6:49 下午

chenjiaru

解决jira问题：ZSYY-47 灭菌管理任务界面增加灭菌开始时间筛选灭菌记录
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
6:48 下午

zhonghaowen

selenium科室申领相关代码提交
Options
    • -5
    • +6
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyServiceImpl.java
    • -2
    • +3
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboServiceImpl.java
    • -7
    • +6
    /ssts-selenium-test/src/test/java/test_4_1/apply/ApplyTest.java
    • -1
    • +29
    /ssts-selenium-test/src/test/java/test_4_1/apply/bo/ApplyGoodBo.java
    • -12
    • +17
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
    • -5
    • +5
    /ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyHelper.java
6:31 下午

shuyongfu

对po类中已经删除的字段,对应的索引配置也删除
Options
    • -1
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
6:10 下午

zhonghaowen

selenium科室申领相关代码提交
Options
  1. /ssts-selenium-test/src/test/java/test_4_1/apply/bo
    • -9
    • +28
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -0
    • +77
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/GdsyApplyServiceImpl.java
    • -0
    • +10
    /ssts-selenium-test/src/test/java/test_4_1/Constants.java
    • -4
    • +4
    /ssts-selenium-test/src/test/resources/test_4_1/config/all/settings.json
    • -0
    • +57
    /ssts-selenium-test/src/test/java/test_4_1/apply/bo/ApplyGoodBo.java
    • -0
    • +20
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboService.java
    • -34
    • +152
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -1
    • +1
    /ssts-web/src/main/webapp/js/common.js
    • -0
    • +68
    /ssts-selenium-test/src/test/java/test_4_1/apply/service/ApplyComboServiceImpl.java
    • -0
    • +41
    /ssts-selenium-test/src/test/java/test_4_1/SettingConstants.java
  12. /ssts-selenium-test/src/test/java/test_4_1/apply
    • -0
    • +198
    /ssts-selenium-test/src/test/java/test_4_1/apply/helper/ApplyHelper.java
  14. /ssts-selenium-test/src/test/java/test_4_1/apply/applyConstants
  15. /ssts-selenium-test/src/test/java/test_4_1/apply/helper
  16. … 5 more files in changeset.
3:54 下午

chenjiaru

补：删除科室的测试用例
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/treenode/service/THTreeNodeManagerImpl.java
    • -0
    • +68
    /ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
3:13 下午

jeffli

解决：GDSRMYY-277

退货记录信息中的‘退货人科室’改为‘退货科室’

Options
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js
    • -9
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
    • -8
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.js
2:55 下午

adairkang

核算月报对消毒物品的数量的计算，整包取包数量，拆包取材料数量

回收及预回收保存，消毒物品的价格计算

Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
2:52 下午

chenjiaru

完善测试用例的基础数据
Options
    • -0
    • +4
    /forgon-core/src/main/java/com/forgon/directory/service/DirectoryHelper.java
12:00 下午

shuyongfu

解决jira问题:GDSRMYY-304 召回信息中导出的表格与器械包召回的包不符

保存前的搜索结果与保存后记录导出分开处理

Options
    • -0
    • +10
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManager.java
    • -6
    • +13
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/action/RecallRecordAction.java
    • -7
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js
10:33 上午

jeffli

解决：ZSYY-50

加急物品打印的标签增加标识符号

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
10:33 上午

jeffli

解决：ZSYY-50

加急物品打印的标签增加标识符号

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.jsp
    • -1
    • +24
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
Thursday 13 Apr 2017
11:07 下午

chenjiaru

解决jira问题：ZSYY-47 灭菌管理任务界面增加灭菌开始时间筛选灭菌记录
Options
    • -18
    • +11
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • -1
    • +105
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
5:39 下午

adairkang

拆包的消毒物品，价格不对的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:39 下午

wangyi

回收测试用例优化
Options
    • -0
    • +9
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
4:37 下午

chenjiaru

补：修改科室的测试用例
Options
    • -14
    • +44
    /ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jrxml
    • -3
    • +9
    /ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/sterilizingStoveUseCountDetail.jasper
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -1
    • +295
    /ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java
    • -63
    • +50
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -4
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
    • -2
    • +0
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -3
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java
    • -0
    • +16
    /forgon-core/src/main/java/com/forgon/directory/model/OrgUnit.java
3:06 下午

jeffli

解决退货测试用例通不过问题
Options
    • -0
    • +84
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ApplicationSpecificationHelper.java
2:21 下午

shuyongfu

解决jira问题:GDSRMYY-304 召回信息中导出的表格与器械包召回的包不符

召回项的科室及统计数量调整为不统计状态为已使用或已废弃的包及聚合包内的包实例

Options
    • -7
    • +14
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
2:19 下午

cherry

去掉不需要的数据 以免有误解
Options
  1. /ssts-selenium-test/src/test/resources/test_4_1/config/gzzyyfs
  2. /ssts-selenium-test/src/test/resources/test_4_1/config/gxzyyf1
  3. /ssts-selenium-test/src/test/resources/test_4_1/config/gd2zyy
  4. /ssts-selenium-test/src/test/resources/test_4_1/config/gdsfybjyy
    • -2
    • +0
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
  6. /ssts-selenium-test/src/test/resources/test_4_1/config/zsly
  7. /ssts-selenium-test/src/test/resources/test_4_1/config/gdsy
  8. /ssts-selenium-test/src/test/resources/test_4_1/config/hdqrmyy
  9. /ssts-selenium-test/src/test/resources/test_4_1/config/zsykzx
  10. /ssts-selenium-test/src/test/resources/test_4_1/config/zsyy
  11. /ssts-selenium-test/src/test/resources/test_4_1/config/sznsfy
  12. /ssts-selenium-test/src/test/resources/test_4_1/config/jmrmyy
  13. /ssts-selenium-test/src/test/resources/test_4_1/config/gyey
  14. /ssts-selenium-test/src/test/resources/test_4_1/config/zsxlrmyy
  15. /ssts-selenium-test/src/test/resources/test_4_1/config/gzfdzl
  16. … 47 more files in changeset.
11:09 上午

jeffli

如果不是供应室用户，隐藏申请单退货按钮
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
9:36 上午

jeffli

普通退货和申请单退货增加申领规格的处理
Options
    • -10
    • +27
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -1
    • +8
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +80
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ApplicationSpecificationHelper.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java