forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 58
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 58
Total Lines of Code (LoC): 4,712,715
Net change in LoC this week: 1,931

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
Saturday 31 Dec 2016
6:11 下午

shuyongfu

德阳市人民医院科室、人员、住院病人、门诊病人信息接口
Options
    • -0
    • +43
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/DatasyncConstant.java
    • -0
    • +87
    /forgon-tools/src/main/java/com/forgon/tools/json/AESUtil.java
    • -0
    • +230
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SyncOrgUnitAndUserDaoImpl.java
    • -0
    • +87
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/FindPatientInfoByHospitalNumDaoImpl.java
    • -0
    • +52
    /ssts-web/src/main/resources/spring/projects/dysyy/applicationContext-his.xml
    • -0
    • +184
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/WebServiceClientHelper.java
    • -0
    • +7
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SyncSupplierDaoImpl.java
  8. /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy
  9. /ssts-web/src/main/resources/config/dysyy/mybatis
    • -89
    • +0
    /ssts-web/src/main/resources/spring/projects/dysyy/applicationContext-his-gzfdzl.xml
    • -0
    • +79
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -28
    • +0
    /ssts-web/src/main/resources/config/dysyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -22
    • +0
    /ssts-web/src/main/resources/config/dysyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -22
    • +0
    /ssts-web/src/main/resources/config/dysyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
4:02 下午

terrykwan

解决了启用SSO后，web service调用时spring security Authentication对象为空时报错的问题
Options
    • -11
    • +20
    /forgon-core/src/main/java/com/forgon/directory/acegi/tools/AcegiHelper.java
3:33 下午

shuyongfu

申请单表handleDepartId字段不再使用,现删除
Options
    • -10
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
3:30 下午

shuyongfu

测试用例基类clean方法更新相关的表名
Options
    • too large
    /ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
Friday 30 Dec 2016
6:33 下午

shuyongfu

解决灭菌管理-外部代理灭菌同一个器定义的外部代理灭菌包可以录入多行包装类型与灭菌程序相同但不同灭菌筐的数据
Options
    • -6
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
6:24 下午

chenguina

PDA 版本更新到4.5.18
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.16_20161226.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.18_20161230.apk
6:00 下午

adairkang

花都区人民医院外来器械接收单添加病区及接收人，归还人签名的打印
Options
    • -2
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/print/printConfig.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
5:30 下午

zhonghaowen

省医config.js增加是否显示科室分组选择框属性
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
5:12 下午

zhonghaowen

科室申领按科室分组过滤store增加隐藏配置
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
5:03 下午

jeffli

发货时限制固定条码修改后的数量必须大于0
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
4:56 下午

chenjiaru

修改属性名称

Options
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.js
4:53 下午

chenjiaru

增加注释
Options
    • -1
    • +5
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • -1
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
    • -1
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
    • -0
    • +5
    /forgon-core/src/main/java/com/forgon/security/service/UserManager.java
4:43 下午

zhonghaowen

修改供应室修改借物单数量的提示语
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
4:35 下午

zhonghaowen

1.科室申领工具条改成根据屏幕分辨率来分行

2.修复科室申领申请单在1024分辨率下显示不全的问题

3.省医科室申领增加按照回收分组过滤科室功能

Options
    • -0
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java
    • -0
    • +34
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • -37
    • +62
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
    • -2
    • +15
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/action/DepartmentGroupAction.java
4:15 下午

jeffli

发货时允许多次扫描固定条码的包

优化清除条码框代码

Options
    • -27
    • +80
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • -0
    • +2
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
3:48 下午

shuyongfu

东莞东华医院config.js配置调整,使用记录洗手护士允许为空。由罗乐提供
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
3:19 下午

zengjc

定期监测添加质量监测，支持扫描器械包关联炉次炉号.
Options
    • -1
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
1:33 下午

shuyongfu

解决材料入库单失败的问题
Options
    • -2
    • +14
    /ssts-web/src/main/resources/config/zd5y/mybatis/syncFromHERP_Mapper.xml
    • -3
    • +9
    /ssts-web/src/main/resources/spring/projects/zd5y/applicationContext-inventory-zd5y.xml
1:08 下午

adairkang

代理灭菌只能添加非本科室的器械包

代理灭菌扫描篮筐如果不是本科室的篮筐，则申请科室为篮筐的所属科室，并加载篮筐内的包

Options
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp
    • -21
    • +32
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
12:56 下午

zengjc

定期监测，支持扫描器械包自动关联炉次炉号.
Options
    • -0
    • +54
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
10:58 上午

adairkang

代理灭菌添加重复扫描篮筐的验证(ZSWY-57)
Options
    • -0
    • +17
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
10:49 上午

jeffli

PC端发货时，扫描一个新的包，显示在最上方

广东省人民医院GDSRMYY-252

Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
10:24 上午

adairkang

代理灭菌支持扫描篮筐条码添加筐内器械包，进行代理灭菌
Options
    • -26
    • +32
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • -16
    • +86
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
    • -36
    • +38
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
    • -0
    • +34
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
    • -0
    • +6
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • -2
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/ReviewedBasket.java
    • -0
    • +42
    /forgon-tools/src/main/java/com/forgon/tools/MyCollectionUtils.java
    • -0
    • +14
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManager.java
10:18 上午

shuyongfu

解决材料入库单失败的问题
Options
    • -0
    • +130
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • -1
    • +2
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -0
    • +10
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManager.java
12:22 上午

terrykwan

修改sso服务器地址为生产环境现场的地址
Options
    • -5
    • +5
    /ssts-web/src/main/resources/spring/projects/zd5y/applicationContext-acegi-security.xml
12:21 上午

terrykwan

修改sso服务器地址为生产环境现场的地址
Options
    • -2
    • +6
    /ssts-web/src/main/webapp/WEB-INF/web-zd5y.xml
12:20 上午

terrykwan

实现了根据项目名称，自动打包需要包含的sping security xml配置文件，即自动排除不需要的sping security xml配置文件
Options
    • -24
    • +28
    /ssts-web/build.gradle
    • -1
    • +2
    /build.gradle
Thursday 29 Dec 2016
6:54 下午

zengjc

先判空再获取值.
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
6:42 下午

zengjc

删除器械包时，同时删除供应室处理器械包配置，解决jira问题HZSRMYY-6.
Options
    • -5
    • +10
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
6:03 下午

jeffli

发货计划要支持修改发货数量或待发货数量。如：仓库有10个开胸包。但有2个科室分别申领了10个。如果是不追溯的情况下，则没办法各科室各发5个的操作。

东莞中医院DGZYY-64

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js