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 12 Aug 2016
6:27 下午

adairkang

器械包发货统计报表,日期范围默认为当天，并从服务器获取当前时间（GZFDZL-39）
Options
    • -6
    • +18
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverStatisticsView.js
  2. /forgon-core/src/main/java/com/forgon/servertime/action
    • -0
    • +47
    /forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/Constants.java
  5. /forgon-core/src/main/java/com/forgon/servertime
5:20 下午

shuyongfu

定时监测记录添加时选择监测项后的返回值需要增加判空处理防止js报错
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
4:31 下午

cherry

删除旧版本PDA

Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.8_20160427.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.10_20160510.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.24_20160804.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.22_20160629.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.6_20160331.apk
4:28 下午

adairkang

4.1去掉导入篮筐数量
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
4:07 下午

shuyongfu

定时监测记录添加时选择监测项后的返回值需要增加判空处理防止js报错
Options
    • -17
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
3:54 下午

wangyi

明细核算月报增加外部编码
Options
    • -20
    • +27
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jasper
    • -10
    • +18
    /ssts-web/src/main/webapp/jasperRtp/DepartmentMonthDetail_child.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +10
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/DepartmentMonthDetailItem.java
3:49 下午

adairkang

包定义，配包注意事项的导入和导出
Options
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -0
    • +5
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
3:15 下午

zhonghaowen

修复提交非整包消毒物品时会出现报错问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
3:00 下午

zengjc

质量监测报表，修正有些材料按条件查询不了的bug.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
2:46 下午

jeffli

修改一次性物品定义时，禁止修改物品类型

增加一次性物品干预功能，在一次性物品管理中可以转换物品类型

Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
    • -0
    • +1104
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/interfere/diposableGoodsView.js
  3. /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/interfere
  4. /ssts-web/src/main/webapp/disinfectsystem/interfere/disposableGoods
    • -0
    • +16
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +74
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
    • -0
    • +63
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/interfere/diposableGoodsView.jsp
    • -12
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
2:18 下午

adairkang

消毒物品等动态生成的包定义，获取其祖先包定义的注意事项
Options
    • -1
    • +5
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
11:59 上午

zengjc

质量监测报表，添加器械包名称过滤.
Options
    • -2
    • +44
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
11:43 上午

cherry

PDA版本更新
Options
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.4.26_20160812.apk
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
11:11 上午

adairkang

装配界面添加配包注意事项的链接，并在材料列表显示清洗质量检查关注点和功能检查，材料定义中添加质量检查关注点和功能检查属性，基础数据导入和导出同步修改了（ZSSXLRMYY-45）
Options
    • -0
    • +32
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
    • -0
    • +20
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
    • -0
    • +2
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -3
    • +33
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -0
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.0_4.3.1_sqlserver.sql
    • -0
    • +56
    /ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingNoteWindow.js
    • -0
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
    • -0
    • +2
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.0_4.3.1_oracle.sql
    • too large
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
10:52 上午

wangyi

回收时给申请单回收时间赋值
Options
    • -0
    • +2
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
10:30 上午

wangyi

一键入筐功能开放
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
10:28 上午

chenjiaru

解决：DGDHYY-28 使用记录模块颜色区分已审核和未审核单据

解决：PYQZYY-57 使用记录列表排序，未审核、未申请的需要默认排列在最上面

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
Thursday 11 Aug 2016
6:37 下午

wangyi

增加灭菌记录统计报表
Options
    • -0
    • +220
    /ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jasper
6:09 下午

wangyi

质量监测增加按物品名称排序
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -58
    • +4
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
    • -24
    • +1
    /ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
5:19 下午

shuyongfu

解决科室申领选择器械包模板选中物品后提交js报错的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
4:41 下午

zengjc

提交灭菌情况报表的javaBean.
Options
    • -0
    • +73
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizationRecordItenBean.java
4:14 下午

wangyi

材料json数量null验证
Options
    • -1
    • +1
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
11:51 上午

adairkang

东华医院同步现场的配置文件

发货单批量打印，一次性物品的打印格式和器械包的打印格式调整成不一样的

Options
    • -5
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
    • -1
    • +16
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js
    • -1
    • +1
    /ssts-web/src/main/resources/config/dgsdhyy/dataSyncConfig.json
    • -19
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
11:15 上午

wangyi

标识牌回收扫包外标签处理
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
10:59 上午

wangyi

外来器械接收、二次回收材料数量分开显示
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/foreignTousseStyle.css
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java
    • -1
    • +10
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • -0
    • +142
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • -10
    • +31
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -37
    • +3
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • -3
    • +11
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
10:52 上午

jeffli

调整省医外部代理灭菌小标签

广东省人民医院GDSRMYY-103

Options
    • -29
    • +69
    /ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
10:43 上午

zhonghaowen

修复科室存在模板时,如果申请物品存在非整包的物品,非整包物品的数量修改后不能正确显示
Options
    • -2
    • +6
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
12:13 上午

shuyongfu

解决jira问题:

DGDHYY-22 人员接口同步按钮的屏蔽

已做成灵活通用的可配置

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/systemmanage/userExtView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/systemmanage/orgUnitExtView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/systemmanage/userExtView.js
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js
Wednesday 10 Aug 2016
5:44 下午

jeffli

解决bug：

修改一次性物品入库单时，新增加一行高值耗材并保存，再次打开该入库单，选择刚才添加的高值耗材并打印，打出来还是批次条码

Options
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
4:19 下午

adairkang

发货单列表物品清单的显示跟拆包后的包定义的清单不一致的问题
Options
    • -6
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
    • -29
    • +49
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java