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 20 Jul 2017
11:09 上午

chenjiaru

解决jira问题：成都市龙泉驿区第一人民医院CDSLQYQYYY-12 器械包规格大小统计
Options
    • -20
    • +24
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -10
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.js
  3. /ssts-web/src/main/webapp/disinfectsystem/extStoreHelper
    • -5
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -2
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
    • -0
    • +10
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • -1
    • +13
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -6
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/recyclingRecord/foreignTousseApplicationView.jsp
    • -7
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/reportoption/GoodsOptionManagerImpl.java
    • -0
    • +101
    /ssts-web/src/main/webapp/jasperRtp/tousseSpecificationSizeStatistics.jrxml
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -1
    • +12
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +47
    /ssts-web/src/main/webapp/jasperRtp/tousseSpecificationSizeStatistics_child.jrxml
    • -11
    • +28
    /forgon-tools/src/main/java/com/forgon/tools/util/SqlUtils.java
  16. … 23 more files in changeset.
10:29 上午

adairkang

ZSYKZX-70 回收清点待回收列表增加预回收后的颜色改变。
Options
    • -2
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroup.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
Wednesday 19 Jul 2017
4:41 下午

shuyongfu

解决jira问题:ZSSZYY-110 使用记录的快速回收按钮需要隐藏,客户用不上此功能,防止误点 增加新的配置项
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsszyy/config.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
4:13 下午

jeffli

同步陈国强现场修改，有一定隐患，包名字可能会超出范围（陈国强 16:12:06

现在用小标签的包名字都是字少的，等以后如果有字多的再调整。）

Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
3:50 下午

chenguina

PDA版本更新至4.5.78
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.76_20170711.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.78_20170719.apk
2:40 下午

jeffli

解决：CDSLQYQYYY-13

外来器械拆分界面增加一个包装人条码扫描

Options
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
2:13 下午

shuyongfu

解决jira问题:GXZYYFY-14 组织结构查询问题
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java
2:07 下午

zhonghaowen

extjs4.2.5增加注解
Options
    • -47
    • +8
    /forgon-core/src/main/java/com/forgon/util/ExtGridUtils.java
    • -6
    • +23
    /forgon-tools/src/main/java/com/forgon/tools/util/ExtJsUtil.java
11:27 上午

jeffli

还原中山一院标识牌大标签格式
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
11:14 上午

shuyongfu

如果goodsType为消毒物品,即点击科室申领页面的消毒物品申请单按钮时,模板只列出类型为消毒物品的包
Options
    • -0
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java
11:09 上午

zhonghaowen

ObjectUtil增加对集合类型比较的支持
Options
    • -12
    • +55
    /forgon-tools/src/main/java/com/forgon/tools/util/ObjectUtil.java
10:22 上午

shuyongfu

解决历史回收记录按科室过滤不出结果的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp
9:34 上午

jeffli

解决：CDSLQYQYYY-13

外来器械拆分界面增加一个包装人条码扫描

Options
    • -3
    • +41
    /ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
Tuesday 18 Jul 2017
8:31 下午

shuyongfu

清远市人民医院接口调整
Options
    • -3
    • +9
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/SyncOrgUnitAndUserDaoImpl.java
    • -0
    • +10
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/DatasyncConstant.java
4:16 下午

jeffli

解决：ZSYY-103

标识牌小标签打印格式调整

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
2:51 下午

jeffli

解决：ZSYY-103

标识牌小标签打印格式调整

Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js
2:51 下午

jeffli

解决：ZSYY-103

标识牌小标签打印格式调整

Options
    • -2
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
    • -0
    • +5
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java
    • -0
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
    • -0
    • +15
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java
    • -0
    • +11
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcarddefinition/IDCardDefinition.java
    • -0
    • +3
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
2:09 下午

jeffli

解决补充标识牌时添加报错
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js
11:22 上午

jeffli

解决：ZSYY-104

新增标识牌使用状态和补充打印功能调整

Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
10:55 上午

chenjiaru

解决jira问题：SSTS-117 供应室添加代理灭菌单，保存后在待灭菌物品列表没显示
Options
    • -76
    • +86
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
    • -1
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -3
    • +8
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManager.java
    • -11
    • +5
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
9:42 上午

jeffli

解决：ZSYY-104

新增标识牌使用状态和补充打印功能调整

Options
    • -0
    • +39
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
    • -3
    • +30
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcarddefinition/IDCardDefinition.java
    • -1
    • +1
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -22
    • +34
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js
Monday 17 Jul 2017
7:43 下午

shuyongfu

清远市人民医院接口调整
Options
    • -9
    • +12
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/qysrmyy/SyncOrgUnitAndUserDaoImpl.java
6:29 下午

shuyongfu

黎子聪发回来的广东省医现场配置文件
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
2:49 下午

zhonghaowen

解决GDSRMYY-345:外来器械申领界面的材料顺序与导入表格的顺序不符
Options
    • -2
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
2:22 下午

zhonghaowen

解决GDSRMYY-345:外来器械申领界面的材料顺序与导入表格的顺序不符
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
11:44 上午

chenjiaru

修复已审核的“外来器械包”和“外部代理灭菌包”在灭菌装载和待灭菌视图列表看不到的缺陷。
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
10:55 上午

shuyongfu

解决打开未审核的使用记录点审核并转换申请单后未成功的问题
Options
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
10:41 上午

zhonghaowen

GDSRMYY-341:将颜色种类放到配置文件中
Options
    • -3
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -1
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
8:59 上午

terrykwan

增加等待直到完成了跳转到回收界面的代码，避免偶尔没完成跳转就执行下一句代码，导致Selenium运行不可靠的问题
Options
    • -0
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
2:07 上午

terrykwan

代码优化：

1、去掉了多处等待的代码

2、重构了部分函数

Options
    • -38
    • +13
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/GdsyApplyServiceImpl.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/BorrowApplyServiceImpl.java
    • -25
    • +35
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/ApplyServiceImpl.java
    • -6
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java
    • -6
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyActionHelper.java