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
Sunday 18 Dec 2016
11:13 下午

chenjiaru

解决：PYQZYY-122 灭菌记录各种监测的结果和历史记录的结果
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -38
    • +51
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
    • -2
    • +50
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
    • -2
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
    • -7
    • +0
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
    • -4
    • +4
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -14
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • -3
    • +34
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • -21
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
    • -2
    • +17
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -12
    • +15
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -1
    • +30
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java
  16. … 3 more files in changeset.
10:31 下午

chenjiaru

外来器械使用后交接报表的清洗者签名，如果篮筐责任人有则取记篮筐责任人，如果没有则记清洗操作员
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:14 下午

jeffli

重构装配代码
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:56 下午

adairkang

核算月报价格统计或者数据统计只有一列的时候，使用单列的模板，同时显示的名称从配置中读取

Options
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
5:50 下午

adairkang

核算月报单价格统计或者数据统计只有一列的模板

Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jasper
5:42 下午

adairkang

核算月报单价格统计或者数据统计只有一列的模板

Options
    • -13
    • +13
    /ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jasper
5:04 下午

terrykwan

增加对只引用了Ext4的API的jsp文件的支持
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
4:25 下午

adairkang

价格统计或者数据统计只有一列的模板
Options
    • -70
    • +2
    /ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jasper
4:07 下午

adairkang

核算月报只有一列的模板
Options
    • -0
    • +313
    /ssts-web/src/main/webapp/jasperRtp/monthReportOneColumn.jrxml
2:53 下午

adairkang

中大五院发货计划打印，签名的项只在最后一页上打印
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
12:04 下午

zengjc

从责任环节进入质量检测的录入，监测项支持不做限制，目前只有中大五院，番禺区中医院进行配置。
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
Friday 16 Dec 2016
5:50 下午

adairkang

添加配置，审核界面，审核人是否可以为空
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • -0
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
4:51 下午

zengjc

灭菌未确认记录显示部分功能漏提交的代码.
Options
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
4:09 下午

zengjc

配了灭菌需要完成确认，则确认的灭菌记录在当天的灭菌记录列出.
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java
    • -2
    • +11
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
    • -0
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
3:49 下午

zhonghaowen

修改科室申领申请单弹框大小
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
3:03 下午

jeffli

器械包定义增加自定义装配打印标签属性
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.4.8_4.4.9.sql
    • -0
    • +10
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
    • -4
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +22
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
2:23 下午

zhonghaowen

1.修改打印发货计划设置弹窗大小

2.修改打印发货单设置弹窗大小

Options
    • -6
    • +10
    /ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigForm.js
    • -3
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js
1:41 下午

jeffli

外部代理灭菌，临床科室填单后，供应室不能修改

番禺区中医院PYQZYY-123

Options
    • -2
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
    • -1
    • +6
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • -1
    • +6
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
12:44 下午

adairkang

审核后清除审核人
Options
    • -6
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
11:28 上午

wangyi

修复批量补充标识牌丢失未过滤掉
Options
    • -0
    • +3
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
10:30 上午

zengjc

补充器械的时候，选择分类类型时，器械类型要从新选择.
Options
    • -1
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js
9:38 上午

wangyi

回收入筐按钮慢问题优化
Options
    • -25
    • +6
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -6
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
    • -6
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
    • -0
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -9
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
    • -9
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
9:27 上午

jeffli

装配管理界面增加打印顺序下拉框 广东省人民医院GDSRMYY-236
Options
    • -2
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -2
    • +105
    /ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
Thursday 15 Dec 2016
8:38 下午

chenjiaru

还原svn的代码
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -4
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -28
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
8:20 下午

wangyi

修复空闲的篮筐关联丢失、报损记录状态未改变
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
8:02 下午

wangyi

质量监测上传图片bug修复
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/showUploadIamge.js
6:40 下午

zengjc

修正定期监测添加质量监测，在质量监测中扫描器械包，保存不了质量监测的bug.
Options
    • -72
    • +80
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
    • -21
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
6:37 下午

chenjiaru

解决：DGZYY-61 器械包信息清洗人获取数据改变
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -2
    • +14
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -0
    • +28
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +16
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -1
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
    • -2
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -0
    • +6
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
    • -0
    • +6
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • -0
    • +6
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
4:30 下午

wangyi

修复装配完成后修改丢失数量，添加时提示装配任务不存在问题
Options
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -2
    • +0
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • -2
    • +3
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • -1
    • +5
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
4:14 下午

zengjc

定期监测扫描器械包条码，找不到的时候有提示。
Options
    • -0
    • +2
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js