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
Friday 26 Aug 2016
4:10 下午

adairkang

批量打印发货单（DGDHYY-17）
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp
    • -0
    • +6
    /ssts-print/src/main/java/com/forgon/disinfectsystem/printinvoiceconfig/service/PrintInvoiceConfigManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
    • -1
    • +3
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -5
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CSSDConstants.java
    • -12
    • +196
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -4
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig/PrintInvoiceConfig.java
    • -1
    • +8
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -1
    • +21
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
    • -0
    • +48
    /ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfig.jsp
    • -0
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.2.sql
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -0
    • +21
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
  16. … 4 more files in changeset.
2:26 下午

jeffli

调整德阳中标签样式
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js
2:13 下午

jeffli

解决bug：

德阳中标签，科室和炉次为空时显示undefined

Options
    • -0
    • +6
    /ssts-web/src/main/webapp/js/common.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js
11:09 上午

jeffli

在点击添加后的'外部代理灭菌信息'界面中增加打印发货计划按钮(装配并打印申请单).

点击装配并打印标签时不关闭'外部代理灭菌信息'界面.

广东省人民医院GDSRMYY-122

Options
    • -24
    • +82
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -22
    • +16
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
10:39 上午

terrykwan

增加注释信息
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
9:54 上午

zengjc

质量检测项配置的细则和结果，可以直接在列表中双击修改名字,解决jira问题东莞东华人民医院DGDHYY-41.
Options
    • -16
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.js
Thursday 25 Aug 2016
6:23 下午

wangyi

创建还物单时给tousseType赋值
Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
5:18 下午

jeffli

添加德阳市中标签样式
Options
    • -2
    • +52
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js
5:01 下午

shuyongfu

解决jira问题:DGDHYY-38 借物管理归还数量默认值为0 的问题改进
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
4:41 下午

wangyi

修复二级供应室的回收单供应室可以操作问题，原因是一个浏览器登录两个科室的用户做回收操作
Options
    • -0
    • +6
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.js
3:30 下午

jeffli

新建德阳市配置

dysyy

Options
    • -0
    • +89
    /ssts-web/src/main/resources/spring/projects/dysyy/applicationContext-his-gzfdzl.xml
  2. /ssts-web/src/main/resources/config/dysyy
    • -0
    • +59
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js
    • -0
    • +28
    /ssts-web/src/main/resources/config/dysyy/mybatis/SyncOrgUnitAndUserMapper.xml
  5. /ssts-web/src/main/webapp/disinfectsystem/config/dysyy
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/img/logo.jpg
  7. /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print
    • -0
    • +15
    /ssts-web/src/main/resources/config/dysyy/dataSyncConfig.json
  9. /ssts-web/src/main/resources/config/dysyy/mybatis
    • -0
    • +22
    /ssts-web/src/main/resources/config/dysyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +22
    /ssts-web/src/main/resources/config/dysyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +55
    /ssts-web/src/main/resources/spring/projects/dysyy/timer.xml
    • -0
    • +1306
    /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/print/printConfig.js
  14. /ssts-web/src/main/resources/spring/projects/dysyy
  15. /ssts-web/src/main/webapp/disinfectsystem/config/dysyy/img
3:17 下午

terrykwan

增加备注信息，更加准确
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/config/zsly/config.js
11:45 上午

jeffli

优化十八项指标报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:42 上午

zengjc

十八项指标性能优化。
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
10:18 上午

jeffli

增加一次性物品退库单干预功能

增加一次性物品领用干预功能

Options
    • -0
    • +1228
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutView.js
    • -1
    • +1
    /ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/action/ReceiveRecordAction.java
    • -2
    • +10
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
    • -0
    • +84
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutView.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
    • -0
    • +44
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutToSupplyRoomView.jsp
    • -0
    • +1289
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/interfere/godownOutToSupplyRoomView.js
    • -1
    • +1
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
Wednesday 24 Aug 2016
6:09 下午

wangyi

no_comment
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
3:29 下午

adairkang

同步现场的配置
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
1:52 下午

wangyi

no_comment
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
11:46 上午

jeffli

解决bug：

另存为新器械包，会导致发货单上该物品名字改为新的器械包名。例如，发货单A已发货“缝合包”。此时打开缝合包的包定义点另存为新器械包，输入新的包名“临床缝合包”，此时发货单A上的名字会变为“临床缝合包”

Options
    • -11
    • +16
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
11:24 上午

wangyi

篮筐上限问题修复
Options
    • -2
    • +3
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -0
    • +2407
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -49
    • +34
    /ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • -121
    • +202
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -178
    • +59
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
9:31 上午

adairkang

1、优化打印发货计划的设置界面

2、添加发货单打印的设置界面

Options
  1. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig
    • -62
    • +13
    /ssts-print/src/main/java/com/forgon/disinfectsystem/printRecyclingApplicationConfig/action/PrintConfigAction.java
    • -0
    • +37
    /ssts-print/src/main/java/com/forgon/disinfectsystem/printinvoiceconfig/dwr/table/PrintInvoiceConfigTableManager.java
  4. /ssts-print/src/main/java/com/forgon/disinfectsystem/printinvoiceconfig
    • -0
    • +103
    /ssts-print/src/main/java/com/forgon/disinfectsystem/printinvoiceconfig/action/PrintInvoiceConfigAction.java
  6. /ssts-print/src/main/java/com/forgon/disinfectsystem/printinvoiceconfig/service
    • -0
    • +14
    /ssts-print/src/main/java/com/forgon/disinfectsystem/printinvoiceconfig/service/PrintInvoiceConfigManager.java
    • -0
    • +121
    /ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.js
    • -0
    • +76
    /ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp
  10. /ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig
    • -0
    • +567
    /ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigForm.js
    • -0
    • +3
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +6
    /ssts-print/src/main/java/com/forgon/disinfectsystem/printRecyclingApplicationConfig/service/PrintConfigManager.java
    • -0
    • +23
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
  15. /ssts-print/src/main/java/com/forgon/disinfectsystem/printinvoiceconfig/dwr/table
  16. … 5 more files in changeset.
Tuesday 23 Aug 2016
5:55 下午

adairkang

中医药附三发货计划的打印，针对这一个项目做成跟发货单的打印方式一样。目前是4.0的代码,4.1上同步修改,但是没有用中医药附三的数据库测试(数据库不兼容)
Options
    • -14
    • +154
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/print/printConfig.js
4:58 下午

shuyongfu

如果不是供应室用户即临床科室用户查看申请单，则不显示申请科室
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
3:38 下午

jeffli

重新打印界面增加废弃器械包功能

广东省人民医院GDSRMYY-123

Options
    • -4
    • +33
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • -2
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
3:14 下午

jeffli

重新打印界面增加废弃器械包功能

广东省人民医院GDSRMYY-123

Options
    • -2
    • +58
    /ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
3:10 下午

zengjc

解决质量监测项定义的结果不能删除的问题.
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.js
11:30 上午

zengjc

十八项指标速度优化.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:09 上午

zhonghaowen

申请物品快速筛选增加已回收,已发货状态
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
10:44 上午

zhonghaowen

申请物品页面把快速筛选按钮更换成combox
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
10:18 上午

shuyongfu

解决jira问题:

PYQZYY-61 外部代理灭菌 列表增加一列 是否打印。如果已装配的则显示是，未装配则显示否，此列需要显示在前面一点

Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js