forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 58
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 58
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 1,813

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
Wednesday 24 Apr 2019
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
10:39 上午

jason

解决:ASSZYYFS-27 一次性物品没这个批次库存数量，但是系统告警提示这批次物品即将过期
Options
    • -2
    • +11
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -2
    • +22
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -3
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
Friday 19 Apr 2019
8:33 下午

shuyongfu

解决Jira问题:GDSRMYY-490 外部代理灭菌包从一级供应室拿到二级供应室代理灭菌后无法发货

同时代理灭菌单的发货状态根据包实例进行重新计算

Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
7:31 下午

weizhenyu

广州中医药附一的回收清单打印的时候，报错undefined的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
5:02 下午

zc.li

解决:ASSDGSZYY-38.东莞市中医院打印回收清单改进. 新生儿，内十科，归入新建组：临床科室；门诊外科和血透室病区，归入门诊专科组 。
Options
    • -1
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
11:01 上午

zengyuan

广州中医药大学第一附属医院 GZZYYFY-47 解决申请消毒物品并且是拆包申请的，先填数量，再修改科室的话，打印出来小计会是0的问题。
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
Thursday 18 Apr 2019
9:09 下午

zengyuan

showResult提示框修改提示时间
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
9:50 上午

shuyongfu

测试用例部分引入类包及注解由testng替换成junit,Before,After,DataProvider等,去掉Rollback
Options
    • -3
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition.java
    • -4
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/EquivalenceTest.java
    • -2
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/CustomTousseRecyclingApplicationProvider.java
    • -6
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/service/GoodsStockManagerTests.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/controller/PackingReviewControllerTests.java
    • -4
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/goodFilterConfig/GoodFilterConfigTest.java
    • -4
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
    • -7
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/DeleteRecyclingRecordItemTests.java
    • -9
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/material/service/MaterialEntryManagerTests.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
    • -9
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/service/ExpensiveGoodsTests.java
    • -4
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recall/TousseInstanceRecallTests.java
    • -21
    • +19
    /ssts-web/src/test/java/test/forgon/disinfectsystem/expensivegoods/service/ExpensiveGoodsGodownTest.java
    • -2
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/orgUnit/OrgUnitDataProvider.java
  16. … 7 more files in changeset.
12:32 上午

terrykwan

增加注释
Options
    • -1
    • +6
    /ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java
Wednesday 17 Apr 2019
6:35 下午

zc.li

解决：GDSRMYY-489。广东省人民医院添加两列（灭菌器炉号、炉次）和删除列（监测结果）。监测结果配置为配置项，控制是否查询显示。打印时单元格有空隙问题未解决，建议先转成Excel,在打印。
Options
    • -4
    • +151
    /ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
    • -0
    • +24
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonitoringItemBean.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:38 下午

yk

广州市第十二人民医院发布包
Options
    • -1
    • +1
    /build.gradle
4:03 下午

zc.li

完善：gzzyyfy-44.单价输入0无效的问题。
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
1:08 下午

terrykwan

消毒物品拆包申请的价格，改回原来的取值方式。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
1:06 下午

terrykwan

增加断言检查
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
12:45 下午

terrykwan

消毒物品拆包申请的价格，用材料明细的价格之和。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:32 上午

zc.li

使用pageContext替换request.
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
2:18 上午

terrykwan

改为set方式进行属性注入，解决单元测试运行时，objectDao属性为空的问题
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Tuesday 16 Apr 2019
9:20 下午

zengyuan

广州中医药大学第一附属医院 GZZYYFY-47 发货计划打印消毒物品格式调整 修改
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
9:16 下午

zengyuan

广州中医药大学第一附属医院 GZZYYFY-45 科室申领申请单干预后备注信息太长导致历史回收记录界面点击不了按钮 修改
Options
    • -4
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp