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
Monday 20 Mar 2017
5:14 下午

chenjiaru

解决jira问题：ZSYY-30 PC端上增加清洗交接记录汇总查询
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.jsp
    • -0
    • +44
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/forgon4/forgonGrid4.js
    • -0
    • +132
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java
    • -2
    • +16
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +154
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordForm.js
  9. /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord
  10. /ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/action
4:27 下午

zhonghaowen

修改借物单的数量增加代发货校验，如果该借物单是代发货的，不允许修改借物单数量
Options
    • -8
    • +9
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
    • -3
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
    • -13
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
    • -0
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
2:48 下午

jeffli

解决：GDSRMYY-288

自定义装配中打印张数是否显示做成可配置项

Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
11:50 上午

jeffli

解决：GDSRMYY-290

解决：GDSRMYY-289

增加’是否显示灭菌程序‘配置项

‘装配界面’与‘自定义装配’界面中的‘灭菌日期‘是否显示做成配置项

Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
11:48 上午

jeffli

解决：GDSRMYY-290

解决：GDSRMYY-289

增加’是否显示灭菌程序‘配置项

‘装配界面’与‘自定义装配’界面中的‘灭菌日期‘是否显示做成配置项

Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
10:46 上午

jeffli

暂时屏蔽功能：装配时校验选中包的包装类型
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
10:40 上午

zhonghaowen

修改借物单审核失败的提示
Options
    • -2
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
10:19 上午

zengjc

解决jira问题: DGDHYY-102,清洗时间修改后的联动修改，修改了清洗时间，会联动修改装配任务，器械包信息的时间，当天装配记录中的清洗时间.
Options
    • -4
    • +62
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -0
    • +4
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • -0
    • +14
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -2
    • +19
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • -1
    • +81
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
5:31 上午

adairkang

多线程完成灭菌的测试用例
Options
    • -0
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/service/GoodsStockManagerTests.java
    • -42
    • +74
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForCompleteSterileRecord.java
Sunday 19 Mar 2017
3:26 下午

shuyongfu

1.修复二级供应室测试用例

2.使用记录转申请单的状态计算调整到设置申请项之后

3.包实例的是否为已发货方法与是否发过货方法重新调整

Options
    • -1
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
    • -4
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -1
    • +1
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
    • -1
    • +1
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
1:00 上午

shuyongfu

解决jira问题:GDSRMYY-253 召回功能BUG

符合召回搜索条件,状态为已使用、已废弃等的器械包只被搜索出来,保存时只对已发货和已灭菌、已签收的包状态改为待召回

Options
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
12:16 上午

terrykwan

增加where条件占位符
Options
    • -1
    • +1
    /ssts-web/src/main/resources/config/demo/mybatis/syncFromHERP_Mapper.xml
12:16 上午

terrykwan

修改为审核时可以不用入灭菌筐
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/demo/config.js
Saturday 18 Mar 2017
6:14 下午

shuyongfu

解决jira问题:HDQRMYY-21 二级供应室增加如果不是自己科室的器械时，需手动发货

测试用例的代码也已提交

Options
    • -5
    • +456
    /ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/TestSecondSupplyRoom.java
5:37 下午

shuyongfu

解决jira问题:HDQRMYY-21 二级供应室增加如果不是自己科室的器械时，需手动发货

旧数据也已增加升级脚本自动升级

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

chenjiaru

解决“使用记录录入明细统计报表”查不出一次物品的bug
Options
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java
    • -4
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
    • -41
    • +118
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jasper
    • -7
    • +7
    /ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:48 下午

jeffli

改造装配代码，完善包装类型和灭菌程序的处理。

装配时校验选中包的包装类型

Options
    • -10
    • +110
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
4:36 下午

shuyongfu

解决jira问题:HDQRMYY-21 二级供应室增加如果不是自己科室的器械时，需手动发货

旧数据也已增加升级脚本自动升级

Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -0
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.7.3_4.7.4.sql
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -3
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
2:05 下午

shuyongfu

解决使用记录录入明细统计报表按一次性物品(高值耗材)名称及条码查询不到数据的问题

根据使用记录登记一次性物品或高值耗材的条码查到对应的一次性物品id设值到一次性物品使用明细表的字段中

Options
    • -2
    • +13
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
Friday 17 Mar 2017
4:44 下午

zhonghaowen

解决GDSRMYY-286:培训管理中上传不了视频文件,修改情况如下:

1.上传附件最大限制为1G

2.增加前端js校验文件大小(只支持ie10以上和非ie的浏览器)

3.增加后端校验文件大小

Options
    • -0
    • +18
    /forgon-core/src/main/java/com/forgon/exception/exceptionHandler/ExceptionHandler.java
    • -0
    • +24
    /ssts-web/src/main/webapp/js/uploadFiles.js
    • -0
    • +9
    /forgon-core/src/main/java/com/forgon/exception/exceptionDTO/AbstractExceptionDTO.java
    • -0
    • +44
    /forgon-core/src/main/java/com/forgon/exception/exceptionHandler/UploadExceptionHandler.java
    • -0
    • +90
    /forgon-core/src/main/java/com/forgon/exception/exceptionDTO/UploadExceptionDTO.java
    • -0
    • +24
    /forgon-core/src/main/java/com/forgon/exception/UploadException.java
    • -2
    • +14
    /forgon-knowledge/src/main/java/com/forgon/knowledge/service/KnowledgeFileManager.java
  8. /forgon-core/src/main/java/com/forgon/exception/exceptionHandler
  9. /forgon-core/src/main/java/com/forgon/exception/exceptionDTO
    • -0
    • +94
    /forgon-tools/src/main/java/com/forgon/tools/util/ObjectUtil.java
    • -46
    • +59
    /forgon-knowledge/src/main/java/com/forgon/knowledge/service/KnowledgeFileManagerImpl.java
    • -63
    • +87
    /forgon-knowledge/src/main/java/com/forgon/knowledge/controller/KnowledgeFileController.java
    • -57
    • +72
    /forgon-core/src/main/java/com/forgon/attachfile/service/AttachFileManagerImpl.java
    • -3
    • +4
    /ssts-web/src/main/resources/spring/applicationContext.xml
    • -20
    • +27
    /ssts-web/src/main/webapp/networkdisk/addFile.jsp
    • -1
    • +8
    /ssts-web/src/main/webapp/common/includeUploadFilesJSAndCSS.jsp
    • -1
    • +5
    /forgon-tools/src/main/java/com/forgon/tools/AppKeys.java
4:37 下午

zhonghaowen

修改getTotal()方法
Options
    • -2
    • +2
    /forgon-core/src/main/java/com/forgon/util/ExtGridUtils.java
3:01 下午

shuyongfu

修复回收更改科室的测试用例的问题
Options
    • -0
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java
11:51 上午

jeffli

解决：ZSSXLRMYY-123

器械包标签的失效期由7天误打印为180天的问题

Options
    • -1
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
10:52 上午

zengjc

灭菌完成确认功能，已废弃的包添加废弃人、废弃时间、废弃原因，并且写日志.
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
10:51 上午

shuyongfu

针对消毒供应中心员工工作统计评分报表创建相应的索引
Options
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
    • -0
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -1
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java
    • -1
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingRecord.java
    • -3
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
    • -3
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -1
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/LostMaterialItem.java
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -1
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifiedItem.java
9:50 上午

wangyi

完成：DGDHYY-101，回收后修改科室名称关联修改
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Thursday 16 Mar 2017
7:17 下午

adairkang

GDSRMYY-285 《器械包实际负载组合统计报表》增加“排序方式”的选项
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -3
    • +30
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOverLoad.js
7:02 下午

jeffli

解决：ZSSXLRMYY-123

器械包标签的失效期由7天误打印为180天的问题

Options
    • -2
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
4:09 下午

jeffli

解决：GZFDZL-102

删掉有标识牌的器械包定义，在标识牌信息页面不会联动删除

Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
3:35 下午

chenguina

PDA 版本更新至4.5.44
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.44_20170316.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.40_20170313.apk