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
Tuesday 21 Nov 2017
4:14 下午

cherry

1.更新selenium到3.7.1

2.更新gson到2.8.2

3.代码优化

Options
    • binary
    /localrepo/org.seleniumhq.selenium/selenium-server-standalone/3.7.1/selenium-server-standalone-3.7.1.jar
  2. /localrepo/org.seleniumhq.selenium/selenium-server-standalone/3.7.1
    • -5
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • -1
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -5
    • +5
    /build.gradle
    • -4
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recall.java
3:35 下午

adairkang

发货物品查询报表，自定义器械包的数量计算问题
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
1:45 下午

jeffli

解决bug：

审核时打印标签，没有读取包定义的打印份数配置

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

yanweining

ZSYY-174:一次性物品接口优化
Options
    • -0
    • +17
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • -2
    • +13
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -10
    • +17
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -1
    • +19
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManager.java
    • -12
    • +38
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/InvoicePlanDao.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -5
    • +48
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/syncDisposableGoodsApplicationForm.js
    • -36
    • +111
    /ssts-web/src/main/resources/config/zsyy/mybatis/InvoicePlanFromHERP_Mapper.xml
10:14 上午

adairkang

6.0中的一些修改，同步过来
Options
    • -20
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java
    • -5
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/service/BarcodeManagerImpl.java
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
    • -1
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestTousseOverLoad.java
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java
    • -4
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/service/BarcodeManager.java
10:00 上午

adairkang

回收明细打印，只有申请单中有的才打印，没有的不打印（一个篮筐实例可能被多个回收记录使用)
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Monday 20 Nov 2017
9:15 下午

alan.lee

入筐器械包页面增加“科室”搜索框
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +48
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • -4
    • +5
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
8:46 下午

yanweining

ZSYY-174:一次性物品入库单的入库时间读取HRP的入库时间，不以同步时间为准。并且另外增加一列同步时间字段列。
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -1
    • +8
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +5
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
8:12 下午

jeffli

东莞中医院DGZYY-132

换药包装配数量丢失

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
7:34 下午

yanweining

ZSYY-177：一次性物品定义名称字符长度调整
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
5:55 下午

shuyongfu

解决关闭召回记录时,器械包实例状态变为已废弃,但没有记录废弃人、废弃时间及原因等字段数据的问题
Options
    • -0
    • +9
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
5:37 下午

chenguina

pda版本更新至4.6.2
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.2_20171120_4.1-release.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.96_20171108_4.1.apk
5:27 下午

shuyongfu

赖家豪发回来的佛山附幼现场printConfig.js配置文件
Options
    • -13
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/print/printConfig.js
3:21 下午

alan.lee

入筐器械包列表增加“科室”字段
Options
    • -0
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -0
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
3:01 下午

jeffli

佛山市妇幼保健医院FSFY-10

打印标签，添加个过滤科室的优化功能

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
2:56 下午

adairkang

重构
Options
    • -2
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/action/MaterialErrorDamageAction.java
2:28 下午

liuliben

增加删除清洗记录时判断是否已装配过篮筐内物品
Options
    • -0
    • +4
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java
2:20 下午

jeffli

解决发货bug
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:11 下午

alan.lee

解决在IE下不显示灭菌装载页面的Bug
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
11:38 上午

chenjiaru

去掉多余的参数
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -3
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -3
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -2
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -3
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java
11:24 上午

alan.lee

待灭菌列表中增加配置项，代码优化
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
    • -7
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
10:12 上午

jeffli

删掉多余代码
Options
    • -6
    • +0
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
Saturday 18 Nov 2017
9:16 下午

chenjiaru

科室申领的优化
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
6:52 下午

shuyongfu

性能优化,对相关的字段创建索引
Options
    • -1
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionPlan.java
    • -1
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/toussetransition/TousseTransitionItem.java
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingdamagerecord/RecyclingDamageItem.java
    • -1
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recall/RecallRecord.java
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/reportoption/WorkScoreConfig.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingBasketSequence.java
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/forminstance/FormInstance.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussereturndisinfect/TousseReturnDisinfectItem.java
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/biologymonitorwarning/BiologyMonitorWarning.java
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord_ClassifyBasket.java
    • -1
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecordOutItem.java
  16. … 38 more files in changeset.
4:53 下午

chenjiaru

解决jira问题：QYSRMYY-18 灭菌视图列表曾加“生物监测状态”属性
Options
    • -0
    • +36
    /ssts-web/src/main/resources/spring/projects/cdlqyq1yy/timer.xml
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -3
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
    • -1
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManager.java
    • -5
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java
    • -0
    • +36
    /ssts-web/src/main/resources/spring/projects/qysrmyy/timer.xml
4:39 下午

adairkang

重构
Options
    • -8
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
4:38 下午

alan.lee

待灭菌搜索列表代码优化
Options
    • -3
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
3:53 下午

adairkang

CDSLQYQYYY-38 成都龙泉科室申请发货计划单调整
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
Friday 17 Nov 2017
9:30 下午

chenjiaru

解决jira问题：GDSRMYY-396 省医临床科室申领界面增加‘申领未消毒敷料’图标
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -2
    • +26
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -4
    • +18
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java
    • -2
    • +4
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -3
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManager.java
    • -2
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js
    • -0
    • +18
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion2.js
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp
8:37 下午

adairkang

ZJYY-7 回收记录单页面“保存并打印”功能打印格式修改
Options
    • -0
    • +7
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingPrintData.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -2
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js