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 31 Aug 2017
6:14 下午

cherry

去掉或替换dowait或sleep为jswait

Options
    • -4
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Materials_Godown_Entry.java
    • -15
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
    • -5
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/PackingHistory.java
    • -2
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -1
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java
    • -12
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
    • -3
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
    • -6
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
    • -5
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -15
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java
5:11 下午

adairkang

ZSYY-116 自定义入篮筐和篮筐装载装配优化
Options
    • -3
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +31
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/ClassifyBasketRecyclingSequenceManager.java
    • -0
    • +60
    /ssts-web/src/test/java/test/forgon/tools/util/BarcodeOperatorsTests.java
    • -0
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcodepredicate/BarcodePredicate.java
    • -34
    • +157
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +11
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingBasketItemVo.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  12. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcodepredicate
    • -0
    • +29
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcodepredicate/BarcodeOperators.java
    • -0
    • +71
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/ClassifyBasketRecyclingSequence.java
    • -0
    • +2
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/recyclingrecord/AllTests.xml
  16. … 14 more files in changeset.
4:43 下午

zengjc

jira问题DGZYY-118，灭菌质量监测报表添加‘灭菌炉分组’过滤.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -6
    • +42
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizerQuality.js
    • -0
    • +16
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
3:20 下午

zengjc

修复没有灭菌记录的包扫条码录质量监测报错的问题.
Options
    • -1
    • +3
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
1:54 下午

shuyongfu

no_comment
Options
    • -1
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
9:42 上午

shuyongfu

陈国强发回来的东莞中医院现场配置
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
Wednesday 30 Aug 2017
8:12 下午

adairkang

清洗记录Manager继承BasePoManager
Options
    • -4
    • +2
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java
    • -16
    • +5
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -9
    • +6
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • -4
    • +7
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
    • -3
    • +2
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
7:57 下午

adairkang

修改参数名称
Options
    • -1
    • +1
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
6:03 下午

chenjiaru

解决jira问题：HZSRMYY-30 外来器械包申请列表新增列
Options
    • -1
    • +58
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
5:09 下午

shuyongfu

解决jira问题:SZNSRMYY-7 移动护理接口开发。
Options
    • -0
    • +49
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointUseRecordAction.java
3:14 下午

yanweining

fsfy：inventorydao接口 编码改为utf-8
Options
    • -5
    • +5
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/fsfy/InventoryDaoImpl.java
2:44 下午

jeffli

解决bug：

装配界面，扫描篮筐grid，全选之后，标识牌条码框不会隐藏

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:43 下午

jeffli

标识牌自动创建隐藏的清洗篮筐
Options
    • -0
    • +1
    /build.gradle
2:43 下午

jeffli

标识牌自动创建隐藏的清洗篮筐
Options
    • -1
    • +3
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
    • -0
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcarddefinition/IDCardDefinition.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
    • -2
    • +53
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • -4
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ContainerManagerImpl.java
    • -0
    • +31
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
10:40 上午

chenjiaru

个人桌面显示外部代理灭菌的图标的功能做成可配置
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/hzszxrmyy/config.js
    • -0
    • +5
    /ssts-web/src/main/webapp/homepage/portalPage.js
Tuesday 29 Aug 2017
3:17 下午

adairkang

彻底删除托盘类型及包实例上的托盘条码(数据库中的字段没有删除)

修复容器管理中，选择类型报错的问题

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -33
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/container/Container.java
    • -43
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -2
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -24
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -3
    • +2
    /ssts-web/src/test/java/test/forgon/tools/json/JSONTest.java
    • -11
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -2
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView.js
1:45 下午

adairkang

没有在用了，删除
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:09 上午

chenjiaru

解决jira问题：GXZYYFY-16 使用了科室申领模板录单，在录数字的时候，按回车键的修改
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/config.js
10:58 上午

terrykwan

删除不需要的文件
Options
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/login_box.jpg
10:35 上午

terrykwan

压缩了首页的背景图片，从257K缩小至了58K，加快首页显示的速度
Options
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/theme/images/bg.jpg
10:24 上午

chenjiaru

解决jira问题：HZSRMYY-29 外部代理灭菌模块显示在个人桌面
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/portalPage.xml
    • binary
    /ssts-web/src/main/webapp/themes/portalPage/img/tabs_foreignProxySterilizationManage.png
10:07 上午

jeffli

GDSRMYY-322

使用标识牌进行装配时，不需扫描清洗筐，也可打印出标签

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
10:07 上午

jeffli

STERILESUPPLYSYSTEM-544

多个客户端同时装配并打印时会出现空白提示框

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Monday 28 Aug 2017
6:43 下午

shuyongfu

解决深圳南山人民医院同步病人接口返回数据乱码问题
Options
    • -9
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -3
    • +15
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -3
    • +15
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/sznsrmyy/FindPatientInfoByHospitalNumDaoImpl.java
6:38 下午

shuyongfu

佛山妇幼病人接口增加性别编码与名称转换
Options
    • -1
    • +10
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/FindPatientInfoByHospitalNumDaoImpl.java
    • -0
    • +20
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/DatasyncConstant.java
    • -0
    • +9
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/fsfy/FindPatientInfoByTreatmentNumDaoImpl.java
5:53 下午

yanweining

悬浮预览表失效时期显示update
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
5:51 下午

chenjiaru

处理空异常
Options
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
5:21 下午

yanweining

GZSZYY-1:同步入库单、如果批次，失效期为空的则可以让用户手工录入然后在同步入库。
Options
    • -3
    • +15
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -1
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp
4:17 下午

chenjiaru

解决jira问题：ZSYY-125 新建申请单打开后光标位置改进
Options
    • -5
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
    • -10
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
4:17 下午

cherry

1.回收增加丢失\报损备注

2.优化代码

Options
    • -1
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -3
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyActionHelper.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/JSWaiter.java