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 29 Jun 2018
10:03 上午

jeffli

树形列表组件fancy tree
Options
    • binary
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-material/vline-rtl.gif
    • binary
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-themeroller/icons.gif
    • too large
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/jquery.fancytree-all.min.js
    • binary
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-bootstrap/vline-rtl.gif
    • -0
    • +122
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-material/ui.fancytree.less
    • -0
    • +707
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/modules/jquery.fancytree.dnd5.js
    • binary
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-xp/vline.gif
    • -0
    • +535
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-awesome/ui.fancytree.css
    • too large
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/jquery.fancytree-all-deps.js
    • -0
    • +351
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-bootstrap/ui.fancytree.less
    • binary
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-win7/loading.gif
    • binary
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-win8/icons.gif
    • binary
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-vista/vline.gif
    • binary
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/skin-win8/loading.gif
    • too large
    /ssts-web/src/main/webapp/js/fancytree2.29.0/dist/modules/jquery.fancytree.js
  16. … 119 more files in changeset.
Wednesday 27 Jun 2018
5:21 下午

niutou_ren

开平市中心医院KPSZXYY-17(材料盘点时同一材料不同价格的需要排在一起)

开平市中心医院KPSZXYY-19(材料盘点系统界面中的盘点信息顺序，和所导出的表格顺序不一致)

在材料定义增加顺序号的基础上，材料盘点时，按照顺序号，材料定义id进行升序排序

保持材料盘点页面中显示的盘点项顺序与导出excel文件中的顺序一致

Options
    • -1
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • -2
    • +18
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItem.java
    • -2
    • +8
    /ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryMaterialForm.js
5:02 下午

niutou_ren

开平市中心医院KPSZXYY-16（材料管理中增加盘点序号）

材料定义中，增加顺序号，顺序号可以为空，可以重复，可以不连续

材料定义页面的默认排序，由原来的id升序改为sequence，id升序

Options
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
    • -1
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
    • -0
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
3:39 下午

cherry

增加新疆军区总医院和深圳市蛇口人民医院的配置，更新版本号
Options
  1. /ssts-web/src/main/resources/config/szsskrmyy
  2. /ssts-web/src/main/resources/config/xjjqzyy
    • -0
    • +131
    /ssts-web/src/main/resources/spring/projects/xjjqzyy/HIS.xml
    • -0
    • +88
    /ssts-web/src/main/webapp/disinfectsystem/config/szsskrmyy/config.js
  5. /ssts-web/src/main/resources/config/szsskrmyy/mybatis
    • -0
    • +15
    /ssts-web/src/main/resources/config/szsskrmyy/dataSyncConfig.json
    • -0
    • +1172
    /ssts-web/src/main/webapp/disinfectsystem/config/szsskrmyy/print/printConfig.js
    • -0
    • +39
    /ssts-web/src/main/resources/config/szsskrmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +111
    /ssts-web/src/main/resources/config/szsskrmyy/mybatis/syncFromHERP_Mapper.xml
    • -0
    • +26
    /ssts-web/src/main/resources/config/xjjqzyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -1
    • +1
    /build.gradle
    • -0
    • +15
    /ssts-web/src/main/resources/config/xjjqzyy/dataSyncConfig.json
    • -0
    • +39
    /ssts-web/src/main/resources/config/xjjqzyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
  14. /ssts-web/src/main/resources/spring/projects/xjjqzyy
    • -0
    • +26
    /ssts-web/src/main/resources/config/szsskrmyy/mybatis/SyncOrgUnitAndUserMapper.xml
  16. … 12 more files in changeset.
3:11 下午

alan.lee

洁定灭菌炉接口解析方法，曾输出匹配失败的日志
Options
    • -0
    • +1
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
2:11 下午

shuyongfu

陈国强5月30日发回来的广州市中医院现场config.is配置文件.
Options
    • -1
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
2:08 下午

shuyongfu

解决Jira问题:DGZYY-129 外来器械二次回收装筐保存的问题

解决单独的外来器械包录入使用记录转换申请单后,申请单在待回收列表没有显示出来的问题

Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:44 上午

adairkang

KPSZXYY-21 打印状态显示错误
Options
    • -0
    • +19
    /ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
11:00 上午

alan.lee

解决:消毒追溯系统V4.1稳定版SSTS-128 器械包信息模块的回收记录标签，增加回收物品的来源“科室”信息的显示
Options
    • -0
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
10:16 上午

alan.lee

解决:佛山市妇幼保健医院FSFY-47 器械包信息功能增强
Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -0
    • +19
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -1
    • +55
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
    • -2
    • +68
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
Tuesday 26 Jun 2018
4:36 下午

jeffli

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

发货物品查询器械包名称显示不全

Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
10:33 上午

jeffli

发货测试用例
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • -0
    • +10
    /ssts-web/src/test/java/test/forgon/constant/Constants.java
Monday 25 Jun 2018
8:59 下午

niutou_ren

东莞中医院DGZYY-139(清洗消毒提示优化)

1、后端处理时，查询到具体的需要扫描的篮筐名称

2、前端在以前提示第几次清洗的基础上，根据是否有清洗顺序的配置，来进行不同的提示。

Options
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -2
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
8:55 下午

adairkang

KPSZXYY-18 材料发货增加打印状态，打印时间
Options
    • -2
    • +27
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialInvoice.java
    • -2
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
    • -8
    • +17
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +5
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
7:15 下午

adairkang

DGKHYY-11 发货单及发货计划单格式改进
Options
    • -44
    • +51
    /ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/print/printConfig.js
    • -0
    • +13
    /ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintRowVo.java
    • -0
    • +1
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:46 下午

yanweining

高值耗材:解决高值耗材入库单按申请单号排序时报错
Options
    • -2
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntry.java
    • -12
    • +0
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • -0
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
5:11 下午

adairkang

DGKHYY-11 发货单格式调整
Options
    • -18
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/print/printConfig.js
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