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 25 Jun 2018
11:59 上午

adairkang

DGZYY-135 DGZYY-129 外来器械回收篮筐的使用及算来器械二次回收
Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -1
    • +108
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
    • too large
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -86
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseIntoBasketInfo.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +26
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen_语音.js
    • -5
    • +37
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -7
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java
    • -2
    • +12
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -116
    • +58
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
9:54 上午

alan.lee

解决 ，灭菌完成测试用例不通过的问题
Options
    • -5
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForCompleteSterileRecord.java
9:21 上午

jeffli

优化发货速度，改为不刷新的锁定
Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
9:19 上午

jeffli

限制包类型的修改
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
9:18 上午

jeffli

系统信息功能
Options
    • -0
    • +6
    /forgon-core/src/main/java/com/forgon/system/system/model/SystemInfo.java
    • -0
    • +70
    /ssts-web/src/main/webapp/systemmanage/system/systemInfo.js
    • -1
    • +11
    /forgon-core/src/main/java/com/forgon/system/system/controller/SystemController.java
  4. /forgon-core/src/main/java/com/forgon/system/system/service
    • -0
    • +29
    /forgon-core/src/main/java/com/forgon/system/system/service/SystemManager.java
9:17 上午

jeffli

贵港市人民医院GGSRMYY-31

有标识牌的器械包退货重装无法打印标签

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
Saturday 23 Jun 2018
2:25 下午

shuyongfu

解决胸科4.0日志文件的异常:java.sql.SQLException: ORA-02292: 违反完整约束条件 (XKYY.FKFDF272D9C9655584) - 已找到子记录
Options
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java
Friday 22 Jun 2018
4:49 下午

shuyongfu

解决高值耗材主页退出系统时没有跳转回高值耗材登录页面的问题(在ie6,ie8跳转到追溯系统的页面,ie11正常)
Options
    • -1
    • +10
    /ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js
4:25 下午

yanweining

GDSRMYY-442:一次性入库单返签
Options
    • -23
    • +56
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -3
    • +15
    /ssts-web/src/main/resources/spring/projects/gdsy/webservice-cxf.xml
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
    • -12
    • +74
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/webservice/server/InventoryStockWebServiceImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
    • -4
    • +23
    /ssts-gdsy-misc/src/main/java/com/forgon/disinfectsystem/inventorymanagement/gdsy/dao/InventoryDaoImpl.java
4:01 下午

shuyongfu

高值耗材系统增加核算月报与明细核算月报
Options
    • -14
    • +16
    /ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js
    • -0
    • +8
    /ssts-web/src/main/webapp/expensivegoodshomepage/menuconfigure.js
3:28 下午

niutou_ren

广东省人民医院GDSRMYY-445（定期质量监测报表改进）

定期监测定义中，如果监测项类型为文本或者文本框，则支持设置默认值（单击"参数值"列）。

在新建定期监测的时候，默认值会直接填入相应的项里。

Options
    • -2
    • +55
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
    • -0
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/customform/formdefinition/FormDefinitionItem.java
    • -0
    • +4
    /ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManagerImpl.java
    • -0
    • +14
    /ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/forminstance/service/FormInstanceManagerImpl.java
    • -2
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
1:53 下午

adairkang

局部变量重命名
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:51 上午

adairkang

重构，改为调用对象的方法
Options
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
10:41 上午

alan.lee

保存生物监测提示信息改进
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js
9:27 上午

shuyongfu

解决核算月报与明细核算月报,选择物品为全部器械包或器械包、一次性物品等也显示出来高值耗退货数据的问题
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
9:22 上午

jeffli

增加系统信息界面，查看当前系统信息
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
9:21 上午

jeffli

包定义保存代码优化，放到manager里面，action不直接修改PO

包名特殊字符校验

Options
    • -0
    • +2422
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -8
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -0
    • +19
    /forgon-tools/src/main/java/com/forgon/tools/util/ForgonNumberUtils.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
9:20 上午

jeffli

增加系统信息界面，查看当前系统信息
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/systemmanage/system/activityView.js
    • -0
    • +107
    /ssts-web/src/main/webapp/systemmanage/system/systemInfo.js
    • -0
    • +37
    /forgon-core/src/main/java/com/forgon/system/system/controller/SystemController.java
  4. /forgon-core/src/main/java/com/forgon/system/system/model
    • -0
    • +82
    /forgon-core/src/main/java/com/forgon/system/system/model/SystemInfo.java
  6. /forgon-core/src/main/java/com/forgon/system/system/controller
  7. /forgon-core/src/main/java/com/forgon/system/system
    • -0
    • +39
    /ssts-web/src/main/webapp/systemmanage/system/systemInfo.jsp
Thursday 21 Jun 2018
8:41 下午

shuyongfu

解决Jira问题:GZZYYFY-2 HIS接口调试
Options
    • -53
    • +6
    /ssts-web/src/main/resources/spring/projects/gzzyyfy/HIS.xml
    • -0
    • +109
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/DatasyncConstant.java
  3. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy
    • -0
    • +73
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/HttpInterfaceHelper.java
    • -0
    • +106
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/FindPatientInfoByHospitalNumDaoImpl.java
    • -0
    • +135
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzzyyfy/SyncOrgUnitAndUserDaoImpl.java
6:10 下午

alan.lee

解决：广东省人民医院GDSRMYY-446 灭菌记录修改的改进
Options
    • -4
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js
4:35 下午

yanweining

GZSZYYGZHC-26：高值耗材物品型号对应价格
Options
    • -5
    • +6
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
    • -5
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js
3:45 下午

jeffli

中山六院消毒供应项目ZSLY-359

止血带不能发货，出现一段英文提示

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:59 下午

shuyongfu

胸科医院最新的his与物资接口配置文件(已按4.1 的spring最新版本调整)
Options
    • -0
    • +138
    /ssts-web/src/main/resources/config/xkyy/mybatis/syncFromHERP_Mapper.xml
    • -0
    • +20
    /ssts-web/src/main/resources/config/xkyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
  3. /ssts-web/src/main/resources/config/xkyy
    • -0
    • +34
    /ssts-web/src/main/resources/spring/projects/xkyy/timer.xml
    • -0
    • +61
    /ssts-web/src/main/resources/spring/projects/xkyy/HERP.xml
    • -0
    • +14
    /ssts-web/src/main/resources/config/xkyy/mybatis/SyncSupplierMapper.xml
  7. /ssts-web/src/main/resources/config/xkyy/mybatis
    • -0
    • +108
    /ssts-web/src/main/resources/spring/projects/xkyy/HIS.xml
    • -0
    • +15
    /ssts-web/src/main/resources/config/xkyy/dataSyncConfig.json
    • -0
    • +27
    /ssts-web/src/main/resources/config/xkyy/mybatis/SyncOrgUnitAndUserMapper.xml
  11. /ssts-web/src/main/resources/spring/projects/xkyy
    • -0
    • +20
    /ssts-web/src/main/resources/config/xkyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
10:58 上午

niutou_ren

广州市中医院高值耗材GZSZYYGZHC-26(高值耗材物品型号对应价格)

给高值耗材型号增加参考价属性

1、可以页面修改

2、支持导入

3、默认型号的参考价取定义的参考价

4、导入时，定义的参考价是对应的最后一个型号的参考价

5、申请单，入库单还未处理

Options
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/expensivegoods/ExpensiveGoodsModel.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -7
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsDefinition.js
    • -1
    • +2
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importexpensivegoods/service/ImportExpensiveGoodsManagerImpl.java
10:27 上午

chenguina

pda版本更新至4.6.46
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.44_20180517_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.46_20180619_v4_1_release.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
10:15 上午

jeffli

东莞中医院DGZYY-140

扫描发货提示不准确

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:00 上午

adairkang

序列号初始化导致1000的条码被重复生成的问题
Options
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/SerialNumManagerTests.java
9:45 上午

alan.lee

解决、；广东省人民医院GDSRMYY-441 灭菌管理显示改进
Options
    • -2
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
Wednesday 20 Jun 2018
5:41 下午

jeffli

增加活动管理，限制并发执行的任务，查看当前正在执行的任务
Options
    • -2
    • +15
    /forgon-tools/src/main/java/com/forgon/tools/util/SpringResponseUtils.java
    • -2
    • +0
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/controller/PackingController.java
    • -1
    • +4
    /forgon-core/src/main/java/com/forgon/system/activity/service/ActivityAspect.java
5:13 下午

jeffli

增加活动管理，限制并发执行的任务，查看当前正在执行的任务
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/WEB-INF/spring-mvc-servlet.xml