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 24 May 2017
10:39 上午

chenjiaru

解决jira问题：DGZYY-96 针对东莞中医院的工作人员绩效评分表的对消毒供应中心工作量统计报表的修改
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/workload.jasper
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -53
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.jsp
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +81
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/StatisticalWorkload.java
    • -20
    • +0
    /ssts-web/src/main/webapp/jasperRtp/workload.jrxml
    • -4
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js
    • binary
    /ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkload.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jasper
    • -1
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +355
    /ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkload.jrxml
    • -29
    • +0
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/YearWorkLoad.java
    • -0
    • +280
    /ssts-web/src/main/webapp/jasperRtp/statisticalWorkload.jrxml
    • -4
    • +6
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
Tuesday 23 May 2017
6:45 下午

zengjc

1.质量监测记录列表隐藏数量、条码、名称、材料列

2.修复在装配页面，勾选右边的材料后，点击【添加质量监测】，保存时点击【保存并新建】，新建的页面材料与上一条一样的问题

3.质量监测重新生成的装配任务，装配时把就包的条码也记到质量监测备注上.

4.修复质量监测报表的监测项的位置显示为null的问题

5.修复质量监测项统计月报的监测项不是单选和多选的细则，在质量检测月报中查不到数据的问题。

6.修改质量监测项统计月报的“季度对比”的字不换行显示

7.支持质量监测定义修改后，保存选不到，需要重新启用的问题.

Options
    • -1
    • +1
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -14
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js
5:13 下午

shuyongfu

解决jira问题:LJSRMYY-15 与手麻接口定时器检索5天内的使用记录
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/ljsrmyy/config.js
    • -4
    • +20
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/ljsrmyy/HerpPathManagerImpl.java
4:11 下午

shuyongfu

解决jira问题:DGZYY-98 申请外来器械住院号提取不到病人姓名

已增加同步病人信息的结果日志记录

Options
    • -30
    • +47
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/log/model/Log.java
    • -17
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
2:09 下午

jeffli

解决bug：科室供应室配置-结算科室配置，直接点添加按钮，会添加一个空白科室。（2级供应室，申领科室配置也有类似情况）

增加器械流转科室配置

Options
    • -0
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -0
    • +11
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -1
    • +148
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
2:03 下午

zengjc

解决定期监测记录有重新回收或装配的记录，打开报错的问题.
Options
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
11:18 上午

chenjiaru

解决jira问题：DGZYY-95 器械包工作量统计报表中 清洗数量下两个数量名字修改
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jasper
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
10:56 上午

shuyongfu

手术预约接口调整
Options
    • -4
    • +16
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
    • -2
    • +7
    /ssts-webservice/src/main/java/net/gzsums/www/esb/MessageServiceSoapImpl.java
    • -0
    • +8
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManager.java
10:18 上午

zhonghaowen

selenium优化二级供应室通过申请单自定义回收
Options
  1. /ssts-selenium-test/src/test/java/test_4_1/factory
    • -56
    • +89
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • -2
    • +12
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -0
    • +43
    /ssts-selenium-test/src/test/java/test_4_1/factory/WaitFactory.java
10:05 上午

zhonghaowen

GYSDERMYY-5:组织机构自动同步功能主分支相关代码提交
Options
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/task/AutoSyncTask.java
    • -7
    • +6
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dwr/DataSynchronizationTableManager.java
Monday 22 May 2017
9:31 下午

chenjiaru

手术排班物品查询报表，增加按器械包过滤，把查询类型为“汇总”的那个报表的手术间字段去掉了。
Options
    • -2
    • +48
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/operationReservationInvoiceView.js
    • -13
    • +0
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/OperationReservationSum_child.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -19
    • +2
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2_child.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -23
    • +9
    /ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jrxml
    • -3
    • +4
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
6:22 下午

zengjc

1.质量监测录多个器械包时，多个器械包，打开记录，显示扫描包条码；

2.修复装配选择多个材料录质量监测记录，第一个数量都是1的问题；

Options
    • -2
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
6:03 下午

zengjc

质量监测选择监测范围为‘灭菌炉记录’时，不能添加器械包和器械.
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
5:57 下午

zengjc

质量监测点击保存并新建，新建的监测项和责任环节跟当前的一样.
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js
    • -4
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
5:23 下午

zhonghaowen

解决GDSRMYY-318:省医申请器械包界面需要显示出模版中的消毒物品
Options
    • -3
    • +5
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -4
    • +33
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java
5:17 下午

chenjiaru

提交“灭菌模块”的自动化测试的代码
Options
    • -2
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/sterilization/SterilizationTest.java
5:03 下午

zhonghaowen

修复科室申领申请单填写完，再添加敷料包后装配任务不显示
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
4:33 下午

zhonghaowen

解决GYSDERMYY-5:组织机构自动同步功能
Options
    • -0
    • +66
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/bo/TaskBo.java
    • -0
    • +41
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/enums/SynTaskNameEnum.java
  3. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/factory
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gysdermyy/config.js
  5. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/enums
    • -0
    • +31
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/factory/AutoSyncTaskFactory.java
  7. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/bo
    • -0
    • +32
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/task/AutoSyncUserTask.java
    • -0
    • +69
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/task/AutoSyncTask.java
  10. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/task
    • -0
    • +30
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/task/AutoSyncOrgUnitTask.java
    • -0
    • +70
    /ssts-web/src/main/webapp/systemmanage/userExtView.js
    • -0
    • +70
    /ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • -6
    • +53
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dwr/DataSynchronizationTableManager.java
3:39 下午

chenjiaru

补充，快速炉灭菌的测试用例
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +70
    /ssts-web/src/test/java/test/forgon/disinfectsystem/sterileRecord/SterieRecordManagerTests.java
3:05 下午

shuyongfu

手术预约接口调整
Options
    • -1
    • +1
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
3:02 下午

jeffli

重构发货测试用例代码
Options
    • -24
    • +12
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java
    • -8
    • +16
    /ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java
    • -0
    • +58
    /ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • -0
    • +9
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
10:57 上午

zengjc

修复jira问题GDSRMYY-308，DGDHYY-42，DGDHYY-57，DGZYY-93，质量监测可以添加多个器械包，并且扫描条码可以选择是否重新回收或者装配，一张质量监测记录添加多个器械包和材料，不拆单显示；定期监测页面功能没有修改，但是内部数据结构发生改变；所有跟质量监测相关报表的查询逻辑也进行了修改；修复装配管理选择多个材料添加质量监测记录，切换选择监测项时，材料不断增加的问题。
Options
    • -0
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialWashUnqualifiedAssessMethodView.js
    • -1
    • +5
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java
    • -0
    • +69
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
    • -0
    • +25
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWashReportChartView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp
    • -294
    • +711
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js
    • -0
    • +12
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java
    • -0
    • +118
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringGoods.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -41
    • +216
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
    • -1
    • +24
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialWashUnqualifiedPositionView.js
    • -51
    • +134
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
10:26 上午

chenjiaru

解决jira问题：ZSWY-75 增加快速灭菌的器械包计价方式
Options
    • -16
    • +5
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • -3
    • +0
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
    • -0
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
Saturday 20 May 2017
3:48 下午

chenjiaru

增加手术间名称不允许重名的验证
Options
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomForm.js
    • -22
    • +42
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationroom/service/OperationRoomManagerImpl.java
    • -1
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationroom/service/OperationRoomManager.java
    • -7
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationroom/action/OperationRoomAction.java
Friday 19 May 2017
9:38 下午

cherry

1.针对回收控件升级的修改

2.将刷新页面方法提到公共方法中

3.回收优化调整

Options
    • -35
    • +9
    /ssts-selenium-test/src/test/java/test_4_1/Assemble.java
    • -5
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/Reject.java
    • -5
    • +14
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
    • -25
    • +10
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java
    • -25
    • +8
    /ssts-selenium-test/src/test/java/test_4_1/Disinfection.java
    • -130
    • +62
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -383
    • +203
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
9:04 下午

adairkang

隐藏急用物品处理周期统计报表
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
8:21 下午

adairkang

弹出层的关闭问题
Options
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setMaterialRecycleAmount.jsp
    • -0
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
6:52 下午

adairkang

装配的时候，如果先扫描没有备注信息的记录，再扫描有备注的记录，将备注追加到文件夹项上
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
6:12 下午

adairkang

调整关闭窗口的叉叉按钮的位置
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/skin/myskin/style.css
5:47 下午

adairkang

装配的时候，如果先扫描没有备注信息的记录，再扫描有备注的记录，将备注追加到文件夹项上
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js