forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 62
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 62
Total Lines of Code (LoC): 4,714,781
Net change in LoC this week: 2,406

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 09 Jun 2017
1:50 下午

jeffli

解决：HZSRMYY-22

普通器械包标签模版设计页面新增灭菌程序变量

Options
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
11:57 上午

shuyongfu

解决测试用例运行后再运行tomcat后产生两个管理员角色的问题
Options
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
10:37 上午

shuyongfu

小黎提交的现场配置,增加配荐:一次性物品申领时如果库存不足不允许申请
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
10:06 上午

jeffli

增加dwr revserse ajax代码
Options
    • -0
    • +72
    /forgon-tools/src/main/java/com/forgon/tools/dwr/ScriptSessionUtil.java
  2. /forgon-tools/src/main/java/com/forgon/tools/dwr
    • -0
    • +10
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
Thursday 08 Jun 2017
4:45 下午

adairkang

预回收科室分组过滤
Options
    • -12
    • +22
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
4:16 下午

adairkang

预回收添加版本控制，眼科为版本1
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
3:30 下午

shuyongfu

针对中山眼科升级及个性化功能(科室项目经费、his与物资同步接口等)的调整、增加相关po的索引创建、oracle索引的初始化容器的创建管理等
Options
  1. /ssts-web/src/main/resources/data
    • -0
    • +14
    /ssts-web/src/main/resources/config/zsykzx/mybatis/FindPatientInfoByHospitalNumMapper2.xml
    • -1
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.4.0_4.4.1.sql
    • -6
    • +54
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • -11
    • +38
    /ssts-web/src/main/resources/spring/projects/zsykzx/HIS.xml
    • -1
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • -11
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/WareHouse.java
    • -0
    • +14
    /ssts-web/src/main/resources/config/zsykzx/mybatis/FindPatientInfoByTreatmentNumMapper2.xml
    • -1
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/MaterialItem.java
    • -4
    • +3
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.6_4.1.7_sqlserver.sql
    • -0
    • +1127
    /ssts-web/src/main/resources/data/indexes.json
    • -1
    • +1
    /ssts-web/src/main/resources/config/zsykzx/mybatis/syncToHERP_Mapper.xml
    • -1
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -6
    • +6
    /ssts-web/src/main/resources/config/zsykzx/mybatis/queryProject_Mapper.xml
    • -3
    • +52
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
  16. … 9 more files in changeset.
3:21 下午

shuyongfu

退货功能的验证与确认提示筐调换一下位置
Options
    • -11
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js
    • -11
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
2:48 下午

adairkang

手术仪器管理PDA上的发货和签收
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -0
    • +7
    /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/action/TousseDefinitionAction.java
2:31 下午

jeffli

PC端手术预约汇总发货列表，改为按科室合并
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.js
    • -0
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/vo/OperationReservationSummary.java
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManager.java
    • -1
    • +29
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
12:13 下午

shuyongfu

把system.out换成log4j记录日志
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:53 上午

jeffli

解决：ZSYY-74

PC上手术预约发货功能改进

Options
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +19
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/operationreservation/OperationReservation.java
10:40 上午

jeffli

解决：ZSYY-74

PC上手术预约发货功能改进

Options
    • -0
    • +1951
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceForm.js
    • -0
    • +497
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.js
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -0
    • +118
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
10:40 上午

jeffli

解决：ZSYY-74

PC上手术预约发货功能改进

Options
    • -0
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
    • -0
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
    • -0
    • +23
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -76
    • +0
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/operationreservation/model/OperationReservationInvoiceGoodsDetail.java
    • -0
    • +9
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • -0
    • +75
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/OperationReservationInvoiceGoodsDetail.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
9:54 上午

adairkang

删除selenium测试用例的项目编译脚本，不然会报目录不存在
Options
    • -17
    • +0
    /build.gradle
9:52 上午

zhonghaowen

修复申请单打开报错
Options
    • -4
    • +7
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
Wednesday 07 Jun 2017
6:02 下午

shuyongfu

解决添加灭菌记录扫描首尾篮筐后,提示结果不正确的问题
Options
    • -2
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
4:30 下午

adairkang

删除没有用的属性
Options
    • -2
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
3:45 下午

adairkang

检索仓库和手术间的代码重构
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -4
    • +62
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManagerImpl.java
    • -4
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
3:42 下午

zengjc

1.添加多个包和材料时，点‘添加抽检器械’添加的材料不受包里面包含材料的限制。

2.回收添加质量监测界面的‘保存’和‘取消’按钮，文字居中。

Options
    • -3
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
1:54 下午

adairkang

外来器械添加材料界面重置按钮没有文字的问题及窗口内容居中显示
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addMaterials.jsp
11:33 上午

adairkang

选择手术间的重置按钮文字
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectOperationRoom.jsp
11:27 上午

zengjc

修复回收添加质量监测，监测项选为是否入框时，在清洗篮筐扫描条码没反应的问题.
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp
11:14 上午

shuyongfu

解决添加灭菌记录扫描首尾篮筐后,已扫器械包列表里的科室列的值不正确的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -2
    • +2
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
9:52 上午

shuyongfu

该工程的代码已经迁移到ssts_web工程下,所以进行删除
Options
  1. /ssts-selenium-test
  2. /ssts-selenium-test/src/test/java
  3. /ssts-selenium-test/src/test
  4. /ssts-selenium-test/src
  5. /ssts-selenium-test/src/test/resources
  6. /ssts-selenium-test/src/main/resources
  7. /ssts-selenium-test/src/main
    • -9
    • +0
    /ssts-selenium-test/src/main/resources/rebel.xml
  9. /ssts-selenium-test/src/main/java
    • -71
    • +0
    /ssts-selenium-test/build.gradle
    • -10
    • +0
    /ssts-selenium-test/.classpath
    • -24
    • +0
    /ssts-selenium-test/.project
Tuesday 06 Jun 2017
9:01 下午

terrykwan

删除掉ssts-selenium-test项目中的测试代码，因为该代码迁移到了ssts-web项目中
Options
  1. /ssts-selenium-test/src/test/resources/test_4_1
  2. /ssts-selenium-test/src/test/resources/test
  3. /ssts-selenium-test/src/test/java/test_4_1
  4. /ssts-selenium-test/src/test/resources/test_4_1/config
    • -60
    • +0
    /ssts-selenium-test/src/test/resources/test_4_1/config/all/settings.json
  6. /ssts-selenium-test/src/test/resources/test_4_1/config/all
  7. /ssts-selenium-test/src/test/resources/test_4_1/config/default
    • -29
    • +0
    /ssts-selenium-test/src/test/resources/test_4_1/config/default/config.js
    • -111
    • +0
    /ssts-selenium-test/src/test/resources/test_4_1/config/all/config.js
  10. /ssts-selenium-test/src/test/resources/test/forgon
  11. /ssts-selenium-test/src/test/resources/test/forgon/selenium
  12. /ssts-selenium-test/src/test/resources/test/forgon/selenium/config/default
  13. /ssts-selenium-test/src/test/resources/test/forgon/selenium/config
    • -29
    • +0
    /ssts-selenium-test/src/test/resources/test/forgon/selenium/config/default/config.js
    • -111
    • +0
    /ssts-selenium-test/src/test/resources/test/forgon/selenium/config/all/config.js
  16. … 81 more files in changeset.
8:11 下午

adairkang

手术仪器管理记录的备注字段类型修改
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.8.3_4.8.4_oracle.sql
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.8.3_4.8.4_sqlserver.sql
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
6:56 下午

zengjc

解决jira问题DGZYY-92，回收清点界面增加添加质量监测功能，目前只有东莞中医院进行配置，配置项为:recycleAddQualityMonitoring
Options
    • -0
    • +22
    /ssts-web/src/main/webapp/common/includeCoreExtJsAndCssSize17.jsp
    • -0
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -0
    • +17
    /ssts-web/src/main/webapp/js/common.js
    • -0
    • +93
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp
    • -858
    • +895
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/addQualityMonitoring.png
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/addQualityMonitoringHovert.png
    • -0
    • +48
    /ssts-web/src/main/webapp/common/includeExtJsAndCssSize17.jsp
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
4:55 下午

zhonghaowen

修复科室申领某些同名的一次性物品不能添加和添加后显示不正常
Options
    • -6
    • +11
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
4:38 下午

adairkang

手术仪器管理窗口标题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js