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
Friday 26 Apr 2019
9:53 下午

shuyongfu

修复测试用例,截止目前433个测试用例(部分测试用例暂时注释、后期再抽时间解决)全部运行通过
Options
    • -18
    • +43
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanPrintByRecyclingNumberTests.java
    • -20
    • +21
    /ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/ApplicationDataProvider.java
    • -8
    • +17
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AllTests.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
    • -5
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisinfectGoodRecyclingApplication.java
    • -1
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -1
    • +139
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerTests.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -3
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/BiologicalMonitoringSituationTest.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/AllTests.java
    • -3
    • +21
    /ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDisposableGoodRecyclingApplication.java
    • -13
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/goodFilterConfig/GoodFilterConfigDataProvider.java
    • -99
    • +174
    /ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java
    • -11
    • +14
    /ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • -6
    • +10
    /ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/GoodFilterConfigTest.java
9:40 下午

shuyongfu

解决修改包定义没有联动修改其它表的包名的问题
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
4:40 下午

yk

新疆军区总医院发布包
Options
    • -1
    • +1
    /build.gradle
3:54 下午

zc.li

修复清点确认，未入筐时，申请单被删除的问题。
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:21 下午

yanweining

GZSZYYGZHC-35:高值耗材包定义被删，导致没法入库
Options
    • -8
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
2:30 下午

weizhenyu

ASSGGSRMYY-28:发货计划优化扫描后物品背景色变色功能
Options
    • -1
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -7
    • +57
    /ssts-web/src/main/webapp/common/common.css
2:06 下午

weizhenyu

ASSGGSRMYY-28:发货计划优化扫描后物品背景色变色功能
Options
    • -3
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js
1:51 下午

zc.li

修复清点确认undefined的问题
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:39 上午

zc.li

修复回收清点时，一键入筐报error的问题。
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js
Thursday 25 Apr 2019
5:15 下午

yk

惠州中心医院发布包
Options
    • -1
    • +1
    /build.gradle
1:40 下午

zc.li

测试用例修复
Options
    • -21
    • +23
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
    • -1
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/AllTests.java
1:34 下午

yanweining

XJJQZYY-74：新华长龙清洗机接口
Options
    • -2
    • +2
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java
Wednesday 24 Apr 2019
8:10 下午

zc.li

回收记录的测试用例修复
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ComboRecyclingApplicationTests.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
7:52 下午

zc.li

装配测试用例修复
Options
    • -15
    • +20
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java
    • -20
    • +20
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
7:36 下午

zc.li

no_comment
Options
    • -2
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/bioreader/service/BioreaderManagerImpl.java
7:29 下午

shuyongfu

解决Jira问题:GDSZYY-6 PDA上传不了灭菌图片
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.74_20190424_v4_1_release.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
7:26 下午

shuyongfu

解决Jira问题:ASSHZZXYY-15 pda灭菌装载时偶尔会出现虚拟篮筐问题

Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.73_20190423_v4_1_release.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
4:56 下午

zengyuan

修改发货计划:1.扫完科室条码以后，弹出发货单，关闭发货单以后，申请科室的下拉框不在获取焦点。2.扫描发货计划右边的申请物品明细不能弹出发货单的问题。
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -2
    • +121
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
4:17 下午

yanweining

XJJQZYY-74：新华长龙清洗机接口
Options
  1. /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -0
    • +14
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
    • -2
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
    • -2
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
    • -5
    • +32
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfChangLong.java
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
    • -0
    • +154
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp
    • -0
    • +385
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java
    • -5
    • +165
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataItemOfChangLong.java
    • -0
    • +47
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java
    • -0
    • +11
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +28
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -0
    • +342
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.js
3:51 下午

yanweining

添加jar包：

解决：JDK8不支持JDBC-ODBC桥

Options
  1. /localrepo/sun/jdbc-odbc/1.0
  2. /localrepo/sun
  3. /localrepo/sun/jdbc-odbc
    • -0
    • +1
    /build.gradle
    • binary
    /localrepo/sun/jdbc-odbc/1.0/jdbc-odbc-1.0.jar
11:21 上午

zc.li

代码优化
Options
    • -10
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
Tuesday 23 Apr 2019
8:34 下午

zc.li

测试用例修复
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -19
    • +17
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/BiologicalMonitoringSituationTest.java
6:33 下午

zc.li

测试用例修复
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -5
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/MaterialSupplementTests.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java
6:31 下午

zc.li

优化：GDSRMYY-491。优化提示信息。
Options
    • -5
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
5:31 下午

zc.li

优化：GZYKDXFSKQ-48。前台不使用map向后台传材料修改的数据。
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
    • -6
    • +6
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
5:09 下午

zc.li

完善：GDSRMYY-491。回收时间取包实例关联的申请单的回收时间。
Options
    • -13
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • -2
    • +4
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
9:52 上午

jason

解决： GGSRMYY-67。系统已经被使用的标签纸模板，可以删除问题。已经被使用的标签模板不允许删除。修改标签模板时增加确认修改的提示信息。
Options
    • -1
    • +19
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
    • -0
    • +92
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java
    • -2
    • +76
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js
    • -1
    • +5
    /ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java
Monday 22 Apr 2019
8:54 下午

shuyongfu

解决导入基础数据测试用例通不过的问题
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/EquivalenceTest.java
5:11 下午

zc.li

解决：GDSRMYY-491。重复回收带标识牌的物品时，回收界面提示的时间信息有误的问题。添加已回收，已消毒，已使用，灭菌中的对应时间；提示优化。
Options
    • -21
    • +78
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
3:45 下午

zc.li

解决：GZYKDXFSKQ-48。在2台不同的电脑，回收同一种消毒物品时，修改的数量会互相干扰的问题。修改消毒物品材料的数量时，不在直接去后台修改，先保存在前台，点击保存时再传到后台处理。
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +13
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
    • -7
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java
    • -36
    • +35
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
    • -2
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -2
    • +20
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js