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 23 Nov 2017
5:07 下午

jeffli

高值耗材退库
Options
    • -3
    • +43
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -0
    • +32
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java
    • -703
    • +744
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.js
    • -0
    • +5
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -3
    • +16
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java
    • -29
    • +56
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp
    • -0
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
    • -0
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsStock.java
    • -3
    • +69
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntryItem.java
4:06 下午

cherry

代码优化
Options
    • -22
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
    • -3
    • +19
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
    • -3
    • +6
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -11
    • +15
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
3:51 下午

yanweining

高值耗材：入库单保存时高值耗材实际类加失效期
Options
    • -1
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsGodownEntryTableManager.java
    • -0
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
2:48 下午

shuyongfu

高值耗材实例po实体类增加失效期字段
Options
    • -1
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java
Wednesday 22 Nov 2017
7:29 下午

yanweining

ZSYY-174:一次性物品入库单的入库时间读取HRP的入库时间，不以同步时间为准。并且另外增加一列同步时间字段列。
Options
    • -4
    • +0
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -0
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
    • -4
    • +0
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
5:14 下午

cherry

代码优化
Options
    • -3
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
    • -3
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
    • -7
    • +13
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyHelper.java
    • -1
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -76
    • +76
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -2
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • -5
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/LoginUtil.java
4:20 下午

jeffli

中山一院消毒供应项目ZSYY-186

一次性物品定义属性增加“物品简称”

Options
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
12:00 下午

chenjiaru

解决jira问题：HDQRMYY-38 器械包工作量统计报表中的器械包名称显示不全
Options
    • -13
    • +13
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad_child.jasper
    • -37
    • +37
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jasper
11:10 上午

adairkang

预处理不合格报表日期过滤问题
Options
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingItemManagerImpl.java
10:56 上午

liuliben

添加未启用高值耗材配置不能添加类型为高值耗材供应商的供应商的判断条件
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js
Tuesday 21 Nov 2017
9:20 下午

adairkang

消毒物品在回收的时候，先删除，再添加，导致申请单回收后还是待回收状态
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
8:30 下午

cherry

代码优化
Options
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -9
    • +10
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization/SterilizationTest.java
    • -12
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
8:08 下午

yanweining

zsyy:一次性物品接口优化
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
7:28 下午

yanweining

ZSYY-174:一次性物品接口优化
Options
    • -1
    • +1
    /ssts-web/src/main/resources/spring/projects/zsyy/timer.xml
    • -5
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/syncDisposableGoodsApplicationForm.js
6:40 下午

liuliben

修改供应商保存判断
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js
6:10 下午

jeffli

中山一院消毒供应项目ZSYY-186

一次性物品定义属性增加“物品简称”

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
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