forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 66
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 66
Total Lines of Code (LoC): 4,799,871
Net change in LoC this week: 3,270

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 26 Nov
2:16 下午

jason

解决jira问题：ZSYKEQ-37 一次性物品入库单接口对接（改进为同步入库单时，只同步属于当前登录科室的入库单）
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/interfaces/mybatis/syncFromHERP_Mapper.xml
1:52 下午

zc.li

ZSYKEQ-27 新增手术器械包需求量分析报表
Options
    • -1
    • +3
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/InstrumentSetDemandReportHelper.java
11:55 上午

jason

解决jira问题：GZS12RMYY-60【广州市十二人民医院】接口地址切换
Options
    • -3
    • +13
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java
    • -4
    • +13
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/HttpClientHelper.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/primaryJmsIbmListener.xml
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/spring/replicaJmsIbmListener.xml
    • -1
    • +1
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • -3
    • +3
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gzs12rmyy/DatasyncConstant.java
11:36 上午

jason

解决jira问题：ZSYKEQ-37 一次性物品入库单接口对接（改进为同步入库单时，只同步属于当前登录科室的入库单）
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/interfaces/mybatis/syncFromHERP_Mapper.xml
10:29 上午

zc.li

CDSLQYQYYY-145【器械丢失明细报表】【器械丢失汇总报表】新增显示误差类型模式
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -36
    • +0
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -25
    • +79
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MaterialErrorDamageReportHelper.java
10:28 上午

frank.qiu

解决了 CDSLQYQYYY-145 - 【器械丢失明细报表】【器械丢失汇总报表】新增显示误差类型模式
Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
    • -4
    • +38
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissItemView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissTotalView.jsp
    • -7
    • +40
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/materialMissTotalView.js
Tuesday 25 Nov
6:38 下午

jason

解决jira问题：ZSYKEQ-37 一次性物品入库单接口对接（改进为同步入库单时，只同步属于当前登录科室的入库单）
Options
    • -228
    • +57
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/interfaces/mybatis/syncFromHERP_Mapper.xml
    • too large
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • -3
    • +21
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/spring/HERP.xml
    • -0
    • +37
    /ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/InventoryDao.java
5:57 下午

zc.li

提交部分代码 CDSLQYQYYY-145 【器械丢失明细报表】【器械丢失汇总报表】新增显示误差类型模式
Options
    • -2
    • +12
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialErrorDamageVO.java
    • -0
    • +14
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialMissItemBean.java
5:55 下午

zc.li

提交部分代码 CDSLQYQYYY-145 【器械丢失明细报表】【器械丢失汇总报表】新增显示误差类型模式
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialErrorDamageDetailShowErrorType.jasper
    • -0
    • +246
    /ssts-web/src/main/webapp/jasperRtp/materialErrorDamageDetailShowErrorType.jrxml
    • -0
    • +284
    /ssts-web/src/main/webapp/jasperRtp/materialErrorDamageSummaryOfDepartmentShowErrorType.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialMissItemViewShowErrorType.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialMissViewShowErrorType.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialMissView_childShowErrorType.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialErrorDamageSummaryOfMaterialShowErrorType.jasper
    • -0
    • +278
    /ssts-web/src/main/webapp/jasperRtp/materialMissItemViewShowErrorType.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/materialErrorDamageSummaryOfDepartmentShowErrorType.jasper
    • -0
    • +122
    /ssts-web/src/main/webapp/jasperRtp/materialMissView_childShowErrorType.jrxml
    • -0
    • +210
    /ssts-web/src/main/webapp/jasperRtp/materialMissViewShowErrorType.jrxml
    • -0
    • +100
    /ssts-web/src/main/webapp/jasperRtp/materialErrorDamageSummaryOfMaterialShowErrorType.jrxml
4:31 下午

frank.qiu

解决了 ZSYKEQ-27 - 新增手术器械包需求量分析报表
Options
    • too large
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +49
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentSetDemandReport.jsp
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
    • -0
    • +284
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/instrumentSetDemandReport.js
4:24 下午

zc.li

SYKEQ-27 新增手术器械包需求量分析报表
Options
    • -1
    • +20
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestReportStatement.java
4:24 下午

zc.li

SYKEQ-27 新增手术器械包需求量分析报表
Options
    • -0
    • +541
    /ssts-web/src/test/java/test/forgon/disinfectsystem/reports/InstrumentSetDemandReportHelperTests.java
4:24 下午

zc.li

SYKEQ-27 新增手术器械包需求量分析报表
Options
    • -0
    • +376
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/InstrumentSetDemandReportHelper.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +178
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/InstrumentSetDemandReportVo.java
    • -0
    • +301
    /ssts-web/src/main/webapp/jasperRtp/instrumentSetDemandReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/instrumentSetDemandReport.jasper
11:38 上午

frank.qiu

解决了 SSTS-777 - 器械包定义中，修改了优先处理科室后，任务组项没有联动修改为对应供应室的任务组的问题
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
11:07 上午

frank.qiu

解决了 GZFDZL-173 - 【退货管理】通过HIS收费系统转换的单据，一次性物品扫描条码后退货物品会消失
Options
    • -2
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
Monday 24 Nov
6:15 下午

shuyongfu

处理jira问题:GDSKQYY-14 PDA的灭菌记录登记以及清洗记录登记增加手动选择设备名称以及运行程序功能
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
5:11 下午

frank.qiu

格式化
Options
    • -328
    • +328
    /ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/damageMaterialAdditionalForm.js
4:43 下午

jason

解决jira问题：GZFDZL-175 【接口对接】【科室申领】根据HIS系统提供的收费记录数据生成申请单新增改进(解除退费记录绑定对应的收费记录关系，同一张单上存在多个同名物品生成申请单时自动汇总)
Options
    • too large
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
4:09 下午

jason

解决jira问题：GZFDZL-175 【接口对接】【科室申领】根据HIS系统提供的收费记录数据生成申请单新增改进(解除退费记录绑定对应的收费记录关系，同一张单上存在多个同名物品生成申请单时自动汇总)
Options
    • too large
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
2:48 下午

zc.li

解决 BJDXZLYY-90 一次性物品定义中【包外标签是否打印】设置为否，该物品还会在标示牌中打印出来的问题
Options
    • -1
    • +1
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
Friday 21 Nov
6:53 下午

shuyongfu

处理jira问题:GDSKQYY-14 PDA的灭菌记录登记以及清洗记录登记增加手动选择设备名称以及运行程序功能
Options
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
5:29 下午

frank.qiu

优化了 ZJYY-163

【不良事件管理】新增多项改进(提示增加多个字段、可设置指定科室提醒、界面文字优化)

Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/adverseEvent/searchForm.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventView.jsp
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/adverseEvent/adverseEventReportView.jsp
5:19 下午

frank.qiu

解决了 ZJJSRM-77 倍力曼长龙清洗机设备接口匹配参数不完整
Options
    • -5
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp
4:40 下午

frank.qiu

解决了 BJDXZLYY-89 - 美雅洁清洗机MAG-GSZK260设备接口需要支持【参数图确认】功能和【参数图导出】功能
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.js
    • -0
    • +11
    /ssts-web/src/main/webapp/js/commonUtils.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp
3:58 下午

frank.qiu

解决了 BJDXZLYY-89 - 美雅洁清洗机MAG-GSZK260设备接口需要支持【参数图确认】功能和【参数图导出】功能
Options
    • -1
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.js
    • -5
    • +9
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp
3:27 下午

frank.qiu

解决了 BJDXZLYY-89 - 美雅洁清洗机MAG-GSZK260设备接口需要支持【参数图确认】功能和【参数图导出】功能
Options
    • -1
    • +5
    /ssts-web/src/main/webapp/js/commonUtils.js
3:20 下午

frank.qiu

解决了 BJDXZLYY-89 - 美雅洁清洗机MAG-GSZK260设备接口需要支持【参数图确认】功能和【参数图导出】功能
Options
    • -3
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
2:47 下午

frank.qiu

解决了 BJDXZLYY-89 - 美雅洁清洗机MAG-GSZK260设备接口需要支持【参数图确认】功能和【参数图导出】功能
Options
    • -0
    • +36
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.jsp
    • -1
    • +152
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfExt.js
2:06 下午

zc.li

ZSYKEQ-48 修复使用记录录入日期与手麻系统提供的日期不一致的问题
Options
    • -2
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java
    • -0
    • +21
    /forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java
    • -2
    • +3
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/hrepPath/CommonHerpPathManagerImpl.java
2:03 下午

frank.qiu

解决了 SZSDSRMYY-181 - 接口新增取值【手术医生核算科室】，使用记录中使用物品明细中的结算科室取值变更
Options
    • too large
    /ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js