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 18 Jan 2017
10:15 下午

terrykwan

迁移AllTests.xml文件到标准的位置，从src/test/java文件夹，转移到了src/test/resources文件夹
Options
  1. /ssts-web/src/test/resources/test/forgon/disinfectsystem/webservice
    • -0
    • +9
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/diposablegoods/AllTests.xml
  3. /ssts-web/src/test/resources/test/forgon/disinfectsystem/diposablegoods
    • -0
    • +906
    /ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json
    • -0
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/AllTests.xml
    • -0
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/AllTests.xml
    • -0
    • +9
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/common/AllTests.xml
  8. /ssts-web/src/test/resources/test
    • -0
    • +1034
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java1
  10. /ssts-web/src/test/resources/test/forgon/disinfectsystem/basedatamanager
    • -0
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/AllTests.xml
  12. /ssts-web/src/test/resources/test/forgon/disinfectsystem/importbasedata
  13. /ssts-web/src/test/resources/test/forgon/tools
    • -0
    • +9
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/disinfectgoods/AllTests.xml
    • -0
    • +10
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/webservice/AllTests.xml
  16. … 43 more files in changeset.
7:21 下午

adairkang

添加灭菌记录，只有已审核的器械包才添加到灭菌记录中，并改为灭菌中

在完成灭菌的时候，只有灭菌中的器械包才变成已灭菌

在灭菌失败的时候，只有灭菌中的器械包，才变成已审核状态

Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
    • -6
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -6
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
6:12 下午

chenjiaru

解决：DGZYY-80 灭菌情况报表单独查询某一个灭菌炉没有数据显示
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
    • -2
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
3:37 下午

adairkang

代理灭菌回收后发货，在发货后单的状态没有变成已发货状态的问题，测试用例也加上了
Options
    • -40
    • +69
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAProxyTousseGoodsInvoiceManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -2
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -9
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForProxyDisinfectionTest.java
3:33 下午

zhonghaowen

调整物品黑白名单过滤设置菜单顺序
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
3:25 下午

chenjiaru

解决：GDSRMYY-264 增加供应室代归还物品权限
Options
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
2:40 下午

terrykwan

不再使用本过滤器来判断用户是否登录，完全使用Spring Security的过滤器，故注释掉不需要的代码，提高性能
Options
    • -1
    • +14
    /forgon-core/src/main/java/com/forgon/register/filter/VersionManagerFilter.java
2:34 下午

terrykwan

缩减ExtJS的布局代码的层次结构
Options
    • -17
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
11:51 上午

zhonghaowen

1.解决DGDHYY-79:某些包只允许有些科室申领

2.解决ZSSZYY-71:借物单的申领范围

Options
    • -2
    • +5
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
  2. /ssts-web/src/main/webapp/disinfectsystem/goodFilterConfig
    • -0
    • +136
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/entity/GoodFilterConfig.java
    • -0
    • +76
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/entity/OrgUnitTemplateItem.java
    • -0
    • +76
    /ssts-web/src/main/webapp/disinfectsystem/goodFilterConfig/goodFilterTemplate.jsp
    • -0
    • +304
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/GoodFilterConfigManagerImpl.java
    • -0
    • +6
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +17
    /forgon-tools/src/main/java/com/forgon/tools/util/ObjectUtil.java
  9. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig
  10. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/dwr/table
  11. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/action
    • -0
    • +158
    /ssts-web/src/main/webapp/disinfectsystem/goodFilterConfig/goodFilterTemplate.js
  13. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/enums
    • -0
    • +47
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service/WhiteListHandler.java
  15. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodFilterConfig/service
  16. … 23 more files in changeset.
11:42 上午

shuyongfu

中大附一物资接口mybatis文件
Options
    • -0
    • +117
    /ssts-web/src/main/resources/config/zsyy/mybatis/syncFromHERP_Mapper.xml
11:35 上午

jeffli

外来器械包管理功能模块增加可自定义打印标签规格的功能。

番禺区中医院PYQZYY-141

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.6.1_4.6.2.sql
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
11:04 上午

jeffli

外来器械包管理功能模块增加可自定义打印标签规格的功能。

番禺区中医院PYQZYY-141

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -2
    • +29
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
10:57 上午

chenjiaru

增加注释
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
9:56 上午

shuyongfu

mybatis的数据源与dao bean的spring配置xml文件头的字符与之前版本有差异的修正
Options
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/zsxlrmyy/applicationContext-his-zsxlrmyy.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/gysdermyy/applicationContext-his.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/ljsrmyy/applicationContext-his.xml
Tuesday 17 Jan 2017
11:57 下午

shuyongfu

各项目的mybatis接口spring配置文件配置对应的sqlMapper的配置的classpath*去掉*号
Options
    • -1
    • +18
    /ssts-web/src/main/resources/spring/projects/hdqrmyy/applicationContext-inventory.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/zd5y/applicationContext-inventory-zd5y.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/zd5y/baseDataImport.xml
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/jmrmyy/HIS.xml
    • -4
    • +4
    /ssts-web/src/main/resources/spring/projects/zsxlrmyy/applicationContext-his-zsxlrmyy.xml
    • -3
    • +3
    /ssts-web/src/main/resources/spring/projects/gzs12rmyy/applicationContext-his-gzs12rmyy.xml
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/gd2zyy/HIS.xml
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/gzzyyfs/HERP.xml
    • -4
    • +4
    /ssts-web/src/main/resources/spring/projects/zsly/HERP.xml
    • -3
    • +3
    /ssts-web/src/main/resources/spring/projects/gdsfybjyy/applicationContext-his-gzfdzl.xml
    • -3
    • +3
    /ssts-web/src/main/resources/spring/projects/zjyy/HIS.xml
    • -3
    • +3
    /ssts-web/src/main/resources/spring/projects/sznsfy/HIS.xml
    • -3
    • +3
    /ssts-web/src/main/resources/spring/projects/hdqrmyy/applicationContext-his.xml
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/zjyy/HERP.xml
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/jmrmyy/HERP.xml
  16. … 14 more files in changeset.
10:55 下午

terrykwan

去掉classpath后面的*号，解决DOS下运行gradle报错的问题
Options
    • -3
    • +3
    /ssts-web/src/main/resources/spring/projects/gzfdzl/applicationContext-his-gzfdzl.xml
10:18 下午

chenjiaru

增加注释
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -2
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • -0
    • +5
    /forgon-core/src/main/java/com/forgon/component/grid/GridManager.java
    • -2
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -0
    • +12
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • -0
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
7:38 下午

adairkang

回收后发货，包定义是要回收的，但是是代理灭菌申请单，这时候在发货计划列表中看到发货计划，但是点开却看不到物品
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -0
    • +107
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForProxyDisinfectionTest.java
    • -0
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:18 下午

terrykwan

改进代码，便于本地运行测试用例
Options
    • -1
    • +14
    /forgon-tools/src/main/java/com/forgon/tools/util/PathUtils.java
2:07 下午

jeffli

包定义和包实例增加判断是否为聚合包类型的方法
Options
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
12:53 下午

chenjiaru

解决：GDSRMYY-263 器械包定义里面的拼音码允许用户进行手动修改
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
11:35 上午

wangyi

获取userecord对象异常加try catch
Options
    • -2
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
10:36 上午

shuyongfu

省医聚合包功能新增的po类及原有的po类增加属性
Options
    • -0
    • +69
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ComboTousseComposite.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
9:58 上午

jeffli

在今日本组装配记录中把器械包包装类型改成失效日期为0的包装类型后，失效日期没有变为空。

广东省人民医院GDSRMYY-258

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
9:40 上午

wangyi

触摸屏待回收单列表增加按申请时间排序功能
Options
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.6.0_4.6.1.sql
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -7
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -9
    • +13
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -50
    • +31
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
Monday 16 Jan 2017
10:51 下午

shuyongfu

德阳市人民医院his接口(科室、人员、病人等数据接口)
Options
    • -4
    • +0
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/WebServiceClientHelper.java
8:30 下午

shuyongfu

德阳市人民医院his接口(科室、人员、病人等数据接口)
Options
    • -1
    • +238
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
7:24 下午

chenjiaru

加非空的校验
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
7:12 下午

shuyongfu

德阳市人民医院his接口(科室、人员、病人等数据接口)
Options
    • -2
    • +7
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/FindPatientInfoByHospitalNumDaoImpl.java
    • -1
    • +47
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/WebServiceClientHelper.java
    • -19
    • +25
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SyncOrgUnitAndUserDaoImpl.java
    • -2
    • +6
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -2
    • +23
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/DatasyncConstant.java
6:35 下午

terrykwan

增加注释
Options
    • -1
    • +4
    /ssts-web/src/test/java/test/forgon/tools/IPAddressValidatorTests.java