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
Wednesday 01 Mar 2017
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.
10:36 上午

chenjiaru

规范编码格式
Options
    • -4
    • +0
    /ssts-web/src/test/java/test/forgon/constant/Constants.java
    • -0
    • +4
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -3
    • +4
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java
10:00 上午

zengjc

对设备维护与监测管理的耗材实例判空，相关jira问题:ZSSXLRMYY-118
Options
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenance/action/DeviceMaintenanceAction.java
9:58 上午

chenjiaru

规范编码格式
Options
    • -0
    • +4
    /ssts-web/src/test/java/test/forgon/constant/Constants.java
    • -1
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java
    • -3
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java
Tuesday 28 Feb 2017
9:20 下午

chenjiaru

完善“权限管理”模块
Options
    • -0
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionView.js
    • -3
    • +35
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.js
    • -7
    • +7
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseGroup/tousseGroupView.js
    • -5
    • +10
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -11
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionView.jsp
    • -12
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.jsp
    • -3
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseGroup/tousseGroupView.jsp
7:26 下午

jeffli

解决bug：

用户退出或者会话超时后丢失fso参数设置

Options
    • -0
    • +12
    /ssts-web/src/main/webapp/common/includeExtJsAndCss.jsp
    • -0
    • +12
    /ssts-web/src/main/webapp/common/include_Ext2_Js.jsp
7:02 下午

adairkang

DYSYY-24 发货单打印格式调整
Options
    • -7
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
6:46 下午

zhonghaowen

解决GDSRMYY-270:聚合包定义中同一个聚合包需要可以绑定多个所属科室
Options
    • -0
    • +15
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManager.java
    • -0
    • +33
    /forgon-core/src/main/java/com/forgon/command/DeleteCommand.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -0
    • +54
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseOrgUnitAdd.java
    • -0
    • +30
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseOrgUnitDelete.java
    • -0
    • +114
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseManagerImpl.java
    • -0
    • +34
    /forgon-core/src/main/java/com/forgon/command/AddCommand.java
  8. /forgon-core/src/main/java/com/forgon/command
    • -0
    • +28
    /forgon-core/src/main/java/com/forgon/command/DataBaseCommand.java
    • -0
    • +34
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/comboTousse/service/ComboTousseOrgUnitProducer.java
    • -8
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js
    • -0
    • +99
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ComboTousseOrgUint.java
    • -68
    • +172
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp
    • -0
    • +33
    /forgon-core/src/main/java/com/forgon/command/UpdateCommand.java
6:19 下午

adairkang

核算月报中，自定义器械包算数量的时候，如果按材料数量算，并且当材料数量为0时，使用包的数量（与周经理确认过)
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:17 下午

wangyi

触摸屏回收选择科室弹出框样式修改
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -5
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp
4:47 下午

shuyongfu

解决一键入炉对不追溯物品的修复处理
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
4:34 下午

jeffli

解决bug：

发货扫描一次性物品，每次只能扫描1个

Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
3:48 下午

wangyi

解决：DYSYY-26，触摸屏添加器械包页面布局修改
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -3
    • +19
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
    • -3
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
2:32 下午

zengjc

解决jira问题:ZSSXLRMYY-118,设备维护与监测管理，添加数量和价格，由于数据结构有改变，添加了数据库升级脚本，相关报表也做了兼容旧数据的改动.
Options
    • -0
    • +21
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenance/service/DeviceMaintenanceManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.6.7_4.6.8_sqlserver.sql
    • -18
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceView.js
    • -0
    • +75
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/ConsumptiveInstance.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -1
    • +6
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenance/service/DeviceMaintenanceManager.java
    • -20
    • +84
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenance/action/DeviceMaintenanceAction.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -8
    • +40
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/devicemaintenance/DeviceMaintenance.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.6.7_4.6.8_oracle.sql
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
2:29 下午

chenjiaru

修复“生物监测结束后提醒功能的测试用例”在oracle通不过的问题
Options
    • -0
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java
12:48 下午

wangyi

格式化代码
Options
    • -1
    • +0
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ChangeBasketForRecyclingTests.java
11:51 上午

chenjiaru

补“生物监测结束后提醒功能”的测试用例
Options
    • -0
    • +1
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/sterileRecord/AllTests.xml
    • -1
    • +4
    /ssts-web/src/main/resources/spring/projects/dgszyy/timer.xml
    • -8
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManagerImpl.java
    • -0
    • +124
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/BiologyMonitoringWarningTest.java
    • -2
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/biologymonitorwarning/service/BiologyMonitorWarningManager.java
11:48 上午

wangyi

增加回收测试用例
Options
    • -0
    • +1
    /ssts-web/src/test/resources/test/forgon/disinfectsystem/recyclingrecord/AllTests.xml
    • -0
    • +305
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ChangeBasketForRecyclingTests.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
10:17 上午

jeffli

解决： DYSYY-22

外来器械自定义标签增加手术医生,外来器械供应商,手术时间,手术间,手术名称

Options
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
Monday 27 Feb 2017
7:50 下午

adairkang

多线程同时插入库存表,可能会产生多条记录的问题
Options
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManager.java
    • -0
    • +4
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -46
    • +119
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
    • -0
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/service/GoodsStockManagerTests.java
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
4:19 下午

zhonghaowen

DYSYY-9:修改根据借物单id来查找该借物单上的物品被转换成申请单的情况和根据器械包实例id来查找借物单的id方法
Options
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
3:49 下午

jeffli

解决bug：

扫描条码超过待发数量时，无法扫描，也没有语音提示

Options
    • -13
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
2:53 下午

chenjiaru

在含植入物器械包灭菌监测及发放情况报表增加一个“器械包条码”字段
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseSterilizationMonitorAndDelivery.jasper
    • -12
    • +13
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java
    • -2
    • +56
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseSterilizationMonitorAndDelivery.jrxml
2:13 下午

chenjiaru

解决修改材料定义的“是否植入物”属性，没有联动修改相关联的包定义的“是否包含植入物”
Options
    • -0
    • +12
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
11:44 上午

wangyi

去掉无用的代码
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
11:31 上午

wangyi

手术预约列表增加手术名称显示列
Options
    • -3
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js