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 31 May 2017
10:58 上午

cherry

增加成都市五冶医院配置
Options
  1. /ssts-web/src/main/resources/config/cdswyyy
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/img/logo.jpg
  3. /ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/img
    • -0
    • +22
    /ssts-web/src/main/resources/config/cdswyyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +55
    /ssts-web/src/main/resources/spring/projects/cdswyyy/timer.xml
  6. /ssts-web/src/main/resources/spring/projects/cdswyyy
    • -0
    • +28
    /ssts-web/src/main/resources/config/cdswyyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -0
    • +67
    /ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/config.js
  9. /ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy
    • -0
    • +22
    /ssts-web/src/main/resources/config/cdswyyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +15
    /ssts-web/src/main/resources/config/cdswyyy/dataSyncConfig.json
    • -0
    • +1315
    /ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/print/printConfig.js
  13. /ssts-web/src/main/resources/config/cdswyyy/mybatis
    • -0
    • +89
    /ssts-web/src/main/resources/spring/projects/cdswyyy/applicationContext-his-cdswyyy.xml
  15. /ssts-web/src/main/webapp/disinfectsystem/config/cdswyyy/print
10:18 上午

zhonghaowen

1.解决GDSRMYY-319:供应室的用户有权限修改‘‘已打印但未发货’’的申请单。

2.解决GDSRMYY-321:科室申领中申请单类型筛选功能改进

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
Sunday 28 May 2017
8:22 下午

terrykwan

guava lib库升级到21.0，解决兼容性问题
Options
    • -1
    • +11
    /build.gradle
Saturday 27 May 2017
9:16 下午

adairkang

打印当前页在ie8下超出了表格范围的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
8:33 下午

shuyongfu

解决jira问题:ZSYY-69 增加急用物品处理周期统计报表

包实例、装配任务等表增加相应的字段进行关联,并且各个相关的业务模块对新的字段维护对应的值

Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:42 下午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:37 下午

chenguina

PDA版本更新至4.5.64
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.64_20170524.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.62_20170512.apk
6:33 下午

cherry

优化调整
Options
    • -52
    • +56
    /ssts-selenium-test/src/test/java/test_4_1/Review.java
    • -53
    • +93
    /ssts-selenium-test/src/test/java/test_4_1/ALL.java
    • -44
    • +45
    /ssts-selenium-test/src/test/java/test_4_1/Assemble.java
    • -3
    • +6
    /ssts-selenium-test/src/test/java/test_4_1/Delivery.java
    • -240
    • +400
    /ssts-selenium-test/src/test/java/test_4_1/Recyle.java
    • -2
    • +2
    /ssts-selenium-test/src/test/java/test_4_1/tools/Utils.java
6:03 下午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:16 下午

adairkang

ZSYY-75 两个同名的加急物品放在两个清洗篮筐，扫了两个篮筐后，装配任务的加急数量还是显示1个

同时在装配任务也显示加急数量

Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
5:02 下午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:53 下午

adairkang

手术预约单如果有空单，则不在待发货列表中显示
Options
    • -1
    • +2
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java
4:08 下午

shuyongfu

解决jira问题:ZSYY-80 手术名称设置增加追加发货物品添加栏
Options
    • -0
    • +3
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
3:08 下午

adairkang

加急显示的字体按配置调小
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
2:31 下午

shuyongfu

解决jira问题:ZSYY-79 报损功能在系统上的显示字眼不统一 需要更正
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/supplyRoomApplianceMonthStatistics.jrxml
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseMaterialErrorDamageManager.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialCheckManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/SupplyRoomMaterialStocktaking.java
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseMaterialErrorDamage.java
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ErrorDamageDetailVo.java
    • -1
    • +1
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SupplyRoomMaterialStocktaking.java
    • -1
    • +1
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManager.java
1:58 下午

shuyongfu

解决jira问题:ZSYY-80 手术名称设置增加追加发货物品添加栏
Options
    • -6
    • +16
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
1:58 下午

shuyongfu

解决jira问题:ZSYY-69 增加急用物品处理周期统计报表

包实例、装配任务等表增加相应的字段进行关联,并且各个相关的业务模块对新的字段维护对应的值

Options
    • -0
    • +5
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -21
    • +29
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • -0
    • +59
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -8
    • +38
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • -4
    • +20
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
12:56 下午

adairkang

ZSYY-73 PC回收和装配任务界面增加加急类型显示
Options
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
    • -0
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1024/images/style.css
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -0
    • +12
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
    • -0
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -0
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -43
    • +99
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
    • -0
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
11:47 上午

zhonghaowen

解决DGZYY-99:回收页面的消毒物品材料显示问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -3
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
11:37 上午

shuyongfu

创建测试用例器械包的固定条码基础数据方法调整,增加删除器械包的条码表数据及对增加器械包的固定条码的代码加上事务,防止与多线程灭菌的测试用例出现锁表的情况
Options
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
11:23 上午

chenjiaru

解决jira问题：ZSYY-80 手术名称设置增加追加发货物品添加栏
Options
    • -14
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationName.java
10:47 上午

cherry

增加佛山妇幼的配置

Options
    • -2
    • +0
    /ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml
  2. /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/img
    • -1
    • +1
    /build.gradle
    • -0
    • +28
    /ssts-web/src/main/resources/config/fsfy/mybatis/SyncOrgUnitAndUserMapper.xml
  5. /ssts-web/src/main/webapp/disinfectsystem/config/fsfy
    • -0
    • +67
    /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js
    • -12
    • +32
    /ssts-web/src/main/resources/jdbc.properties
    • -0
    • +1315
    /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/print/printConfig.js
    • -0
    • +55
    /ssts-web/src/main/resources/spring/projects/fsfy/timer.xml
  10. /ssts-web/src/main/resources/config/fsfy/mybatis
  11. /ssts-web/src/main/resources/config/fsfy
  12. /ssts-web/src/main/webapp/disinfectsystem/config/fsfy/print
    • -0
    • +89
    /ssts-web/src/main/resources/spring/projects/fsfy/applicationContext-his-fsfy.xml
    • -0
    • +15
    /ssts-web/src/main/resources/config/fsfy/dataSyncConfig.json
  15. /ssts-web/src/main/resources/spring/projects/fsfy
  16. … 3 more files in changeset.
9:50 上午

chenjiaru

修复，添加手术和添加手术的所属科室时报错提示不准确的缺陷
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/systemmanage/operationNameView.js
12:34 上午

shuyongfu

创建测试用例基础的器械包固定条码位置调整,之前放的位置会有问题
Options
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
Friday 26 May 2017
10:06 下午

chenjiaru

合并重复的代码
Options
    • -67
    • +44
    /ssts-web/src/main/webapp/systemmanage/operationNameView.js
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
9:15 下午

chenjiaru

解决jira问题：ZSYY-80 手术名称设置增加追加发货物品添加栏
Options
    • -20
    • +175
    /ssts-web/src/main/webapp/systemmanage/operationNameView.js
    • -0
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationNameManager/action/OperationNameAction.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.8.2_4.8.3.sql
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationNameManager/service/OperationNameManagerImpl.java
    • -1
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationName.java
    • -1
    • +3
    /ssts-web/src/main/webapp/systemmanage/operationNameView.jsp
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
8:08 下午

chenjiaru

手术名称和手术使用器械包明细PO增加属性
Options
    • -2
    • +51
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationName.java
6:40 下午

chenjiaru

手术名称和手术使用器械包明细PO增加属性
Options
    • -5
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationUseTousseItem.java
6:36 下午

chenjiaru

手术名称和手术使用器械包明细PO增加属性
Options
    • -1
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationUseTousseItem.java
    • -0
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationName.java
5:18 下午

zengjc

解决jira问题DGZYY-97，触摸屏清洗时，增加配置是否扫描篮筐的时候要输入责任人，目前东莞中中医院启用该配置；在清洗篮筐增加责任人的显示，此版本之前，触摸屏清洗所有的篮筐责任人都一样，此版本后，一个篮筐就一个责任人.
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -10
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js