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 03 Mar 2017
3:38 下午

wangyi

完成:HZSRMYY-11,待回收列表增加搜索功能
Options
    • -10
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.6.8_4.6.9.sql
    • -28
    • +34
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectUser.jsp
    • -0
    • +23
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css
    • -0
    • +37
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -72
    • +91
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -10
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/foreigntousseapplication/ForeignTousseApplication.java
    • -7
    • +4
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -1
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp
    • -0
    • +151
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectOperationRoom.jsp
    • -0
    • +36
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
  16. … 3 more files in changeset.
3:37 下午

shuyongfu

解决jira ZSYY-24 手术名称设置增加标识

中大附一手术名称显示器械包,并区分出哪些手术名称有配置器械包

Options
    • -1
    • +8
    /ssts-web/src/main/webapp/systemmanage/operationNameView.js
    • -1
    • +31
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationName.java
3:19 下午

adairkang

发货速度优化，在发货前查询仓库及库存信息
Options
    • -1
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
    • -8
    • +53
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
3:00 下午

chenjiaru

解决jira两个问题：

GZFDZL-97 告警管理，增加导出excel功能。

GZFDZL-96 告警管理，点击查看所有科室页面，需要增加失效起止过滤条件。

Options
    • -7
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp
    • -1
    • +3
    /forgon-tools/src/main/java/com/forgon/tools/excel/ExcelCellStyle.java
    • -31
    • +39
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -2
    • +211
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java
    • -41
    • +76
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
2:52 下午

shuyongfu

海龙发回的小榄现场his数据库连接的更改
Options
    • -2
    • +2
    /ssts-web/src/main/resources/spring/projects/zsxlrmyy/applicationContext-his-zsxlrmyy.xml
2:11 下午

zhonghaowen

GDSRMYY-274:屏蔽科室申领配置工具栏的上移等图标
Options
    • -21
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
12:02 下午

shuyongfu

解决jira问题:DGZYY-85 一键审核进入列表功能改进
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -6
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
10:19 上午

zhonghaowen

1.解决GDSRMYY-274:科室申领配中更改科室排序的方式

2.解决GDSRMYY-275:科室申领配置中增加搜索框，以方便删除科室

Options
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -4
    • +14
    /ssts-web/src/main/webapp/js/extCompOperationUtil.js
    • -5
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
    • -45
    • +253
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
10:08 上午

zengjc

完善灭菌干预的注释.
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -8
    • +10
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
9:52 上午

adairkang

仓库表创建索引

发货库存加减的算法

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -108
    • +225
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -0
    • +23
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/WareHouse.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
    • -0
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
Thursday 02 Mar 2017
8:48 下午

zengjc

解决jira问题：PYQZYY-148，灭菌干预可以修改灭菌员，干预页面通过扫描用户条码输入灭菌员.
Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js
    • -1
    • +55
    /ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab1.js
    • -1
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
7:05 下午

shuyongfu

手术预约发货增加提交状态的限制，未提交的单打开时提示不能发货只能查看，保存按钮置灰禁用
Options
    • -3
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
4:47 下午

shuyongfu

陈国强现场发回来的配置文件
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
4:46 下午

zhonghaowen

GDSRMYY-270:修复聚合包页面的所属科室不能正确显示
Options
    • -4
    • +19
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • -0
    • +64
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseOrgUnitHandler.java
4:10 下午

shuyongfu

解决jira问题:DGZYY-85 一键审核进入列表功能改进
Options
    • -4
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
4:07 下午

shuyongfu

解决jira问题:ZSYY-22 灭菌管理列表增加刷新列表功能
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
3:41 下午

chenjiaru

删除多余的测试代码
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/homepage/menu.jsp
2:54 下午

wangyi

同步现场最新打印配置
Options
    • -9
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/config/gd2zyy/print/printConfig.js
2:47 下午

zengjc

解决jira问题ZSYY-21，灭菌完成确认的显示改为灭菌卸载，灭菌记录列表、操作提示、相关按钮、表单的显示、器械包信息的显示，都进行修改。
Options
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -3
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -3
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordCompleteForm.js
    • -1
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
2:26 下午

zengjc

修复jira问题DGZYY-73,年度消毒中心指标工作量统计报表，临床器械总件数也包括没有申请科室的器械包.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
1:08 下午

shuyongfu

解决jira问题:ZSYY-22 灭菌管理列表增加刷新列表功能
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
12:52 下午

adairkang

保存灭菌记录的优化及测试用例
Options
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +3
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -0
    • +370
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTestsForSaveOrUpdateSterilizationRecord.java
    • -0
    • +1
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/packing/AllTests.xml
11:52 上午

wangyi

完成：#GDSRMYY-270，聚合包支持多个所属科室
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/ComboToussePackingTests.java
    • -3
    • +10
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -1
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
9:24 上午

chenjiaru

调整报表模块的一些权限
Options
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailView.jsp
    • -5
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
    • -23
    • +20
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -5
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp
    • -5
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.jsp
    • -5
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/goodsDistributeReportChartView.jsp
    • -163
    • +232
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -10
    • +10
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
Wednesday 01 Mar 2017
7:01 下午

chenjiaru

解决jira问题：DGZYY-84 器械包信息的使用记录增加项
Options
    • -1
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
6:14 下午

chenjiaru

调整报表模块的权限管理
Options
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionPicChartView.js
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionPicChartView.jsp
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView.jsp
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/monthDiposableGoodsReportView.jsp
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/monthPackageReportView.js
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/monthReportChartView.js
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMonitoringView.jsp
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/monthDiposableGoodsReportChartView.js
    • -3
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/monthDiposableGoodsReportChartView.jsp
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialWashUnqualifiedView.js
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMonitoringView.js
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/yearUserWorkloadReportView.jsp
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialWashUnqualifiedView.jsp
    • -21
    • +32
    /ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.jsp
  16. … 12 more files in changeset.
2:23 下午

zengjc

修复jira问题:ZSSXLRMYY-118,设备的耗材增加或者减少时，打开维护记录更新总价.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceView.js
    • -0
    • +4
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenance/service/DeviceMaintenanceManager.java
    • -12
    • +11
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenance/action/DeviceMaintenanceAction.java
    • -0
    • +69
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenance/service/DeviceMaintenanceManagerImpl.java
2:15 下午

adairkang

DYSYY-23 核算月报的部分修改
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:19 上午

zhonghaowen

Extjs4.2.5相关后台代码提交
Options
    • -0
    • +1
    /build.gradle
    • -0
    • +114
    /forgon-tools/src/main/java/com/forgon/entity/ExtJsEntity.java
    • -0
    • +2
    /ssts-web/src/main/resources/spring/applicationContext-service.xml
    • -0
    • +440
    /forgon-core/src/main/java/com/forgon/util/ExtGridUtils.java
    • -0
    • +646
    /forgon-core/src/main/java/com/forgon/util/StringUtil.java
    • -2
    • +141
    /forgon-tools/src/main/java/com/forgon/tools/util/ExtJsUtil.java
11:17 上午

zhonghaowen

ExtJs4.2.5相关js,css,jsp文件提交
Options
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-classic/images/tab/tab-default-bottom-active-bg.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-classic-sandbox/images/form/exclamation.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-gray/images/grid/dd-insert-arrow-left.png
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-neptune/images/btn/btn-default-toolbar-medium-over-corners.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-access/images/tree/drop-add.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-neptune/images/btn-group/btn-group-default-framed-notitle-corners.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-neptune/images/btn/btn-default-toolbar-small-over-corners.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-neptune/images/btn/btn-default-toolbar-large-corners.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-classic-sandbox/images/panel-header/panel-header-default-framed-top-sides.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-classic-sandbox/images/form/spinner-small.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-neptune/images/button/default-toolbar-small-arrow-rtl.png
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/themes/images/access/tab-bar/scroll-right.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-neptune/images/btn/btn-default-toolbar-large-focus-sides.gif
    • binary
    /ssts-web/src/main/webapp/forgon4/css/icons/icon-r-delete.png
    • -0
    • +1043
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/ux/event/Player.js
  16. … 3456 more files in changeset.