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 18 Apr 2019
9:50 上午

shuyongfu

测试用例部分引入类包及注解由testng替换成junit,Before,After,DataProvider等,去掉Rollback
Options
    • -3
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java
    • -4
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/EquivalenceTest.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/CustomTousseRecyclingApplicationProvider.java
    • -6
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/service/GoodsStockManagerTests.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingReviewControllerTests.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/GoodFilterConfigTest.java
    • -4
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
    • -7
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java
    • -9
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
    • -9
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/service/ExpensiveGoodsTests.java
    • -4
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recall/TousseInstanceRecallTests.java
    • -21
    • +19
    /ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/service/ExpensiveGoodsGodownTest.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/orgUnit/OrgUnitDataProvider.java
  16. … 7 more files in changeset.
12:32 上午

terrykwan

增加注释
Options
    • -1
    • +6
    /ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java
Wednesday 17 Apr 2019
6:35 下午

zc.li

解决：GDSRMYY-489。广东省人民医院添加两列（灭菌器炉号、炉次）和删除列（监测结果）。监测结果配置为配置项，控制是否查询显示。打印时单元格有空隙问题未解决，建议先转成Excel,在打印。
Options
    • -4
    • +151
    /ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
    • -0
    • +24
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonitoringItemBean.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:38 下午

yk

广州市第十二人民医院发布包
Options
    • -1
    • +1
    /build.gradle
4:03 下午

zc.li

完善：gzzyyfy-44.单价输入0无效的问题。
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
1:08 下午

terrykwan

消毒物品拆包申请的价格，改回原来的取值方式。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
1:06 下午

terrykwan

增加断言检查
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
12:45 下午

terrykwan

消毒物品拆包申请的价格，用材料明细的价格之和。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:32 上午

zc.li

使用pageContext替换request.
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
2:18 上午

terrykwan

改为set方式进行属性注入，解决单元测试运行时，objectDao属性为空的问题
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Tuesday 16 Apr 2019
9:20 下午

zengyuan

广州中医药大学第一附属医院 GZZYYFY-47 发货计划打印消毒物品格式调整 修改
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
9:16 下午

zengyuan

广州中医药大学第一附属医院 GZZYYFY-45 科室申领申请单干预后备注信息太长导致历史回收记录界面点击不了按钮 修改
Options
    • -4
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
7:18 下午

terrykwan

将消毒包的包类型传递到前端 。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • -0
    • +13
    /ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
4:15 下午

zc.li

解决：GZZYYFY-39。config.js中增加配置项科室申领视图列表的排序规则orderRuleOfDepartApplicationView：可控制不同项目的该列表排序规则。
Options
    • -0
    • +54
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
3:34 下午

zc.li

修复：GZZYYFY-37.修复创建申请单时，旧的单材料和新单不显示的问题。
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
12:42 下午

zengyuan

广州中医药大学第一附属医院 GZZYYFY-47 发货计划打印消毒物品格式调整 测试有其他问题 还原指上一版本
Options
    • -3
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
12:41 下午

zengyuan

广州中医药大学第一附属医院 GZZYYFY-47 发货计划打印消毒物品格式调整 测试有其他问题 还原指上一版本
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
11:32 上午

zc.li

no_comment
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:30 上午

zc.li

添加空值判断
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:28 上午

zc.li

完善：GZZYYFY-37.已打印或已发货或部分发货的申请单不合并。
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:19 上午

jason

解决:GZS12RMYY-27 HIS接口由视图改平台

广州12人民医院科室、人员、病人MQ接口功能

Options
    • -0
    • +21
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/zsykzx/WebsphereMqDaoImpl.java
    • -1
    • +23
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/gyey/PatientAdmissionInfo.java
    • -0
    • +1
    /build.gradle
    • -2
    • +40
    /ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • -3
    • +11
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/gyey/PatientAdmissionInfoManagerImpl.java
    • -0
    • +34
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/SimpleStringUtil2.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/config.js
  8. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy
    • -0
    • +29
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/BaseDataDao.java
    • -0
    • +75
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQDataDaoImpl.java
    • -1
    • +6
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/gyey/PatientAdmissionInfoManager.java
    • -3
    • +13
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManager.java
    • -1
    • +10
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java
    • -1
    • +39
    /ssts-web/src/main/webapp/systemmanage/userExtView.js
    • too large
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -0
    • +637
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java
11:11 上午

zengyuan

广州中医药大学第一附属医院 GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
11:04 上午

yanweining

材料退库：解决单价为0时添加失败
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.js
10:32 上午

zc.li

修改旧数据，自定义器械包fordisplay都改为0，避免在自定义器械包管理修改数据影响到以前的单。
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/Constants.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.31_4.9.32.sql
10:14 上午

zc.li

贵港人民医院添加自定义器械包管理菜单
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js
9:21 上午

zc.li

取消错误注释
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.js
Monday 15 Apr 2019
10:44 下午

terrykwan

将消毒物品的包数和材料数传递到前端 。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -14
    • +61
    /ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java
10:43 下午

terrykwan

消毒物品拆包申请时，打印发货计划的时候规格里面申请数量是0的材料不打印 GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • -2
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
10:40 下午

terrykwan

优化注释，改为javadoc方式
Options
    • -77
    • +171
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
7:54 下午

zc.li

解决：GZZYYFY-32，GZZYYFY-44自定义器械包申请后保存包定义并且二次申请可以在器械包申请单选择。自定义器械申请单增加单价输入。
Options
    • -11
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +135
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • -0
    • +245
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgfy/menu/menuconfigure.js
    • -1
    • +11
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -48
    • +94
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -0
    • +47
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +10
    /forgon-core/src/main/java/com/forgon/security/bean/ModuleOperationMapping.java
    • -0
    • +896
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionForm.js
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.js
  16. … 3 more files in changeset.