forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 62
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 62
Total Lines of Code (LoC): 4,714,781
Net change in LoC this week: 2,406

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
Thursday 01 Apr 2021
4:16 下午

zc.li

修复核算月报科室发货的数据全退货时，数量格式显示异常的问题；
Options
    • -6
    • +12
    /ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jasper
    • -4
    • +7
    /ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml
    • -6
    • +8
    /ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml
    • -6
    • +8
    /ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jasper
    • -2
    • +5
    /ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthReport.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jasper
    • -9
    • +11
    /ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml
    • -6
    • +8
    /ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml
4:14 下午

zc.li

解决：ZJJSRM-50.外来器械申请单统计报表中增加“床位”列.(修复床位数据为空时，会出现null的问题)
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jasper
4:07 下午

jason

解决jira问题：SSTS-326 器械包信息，通过筛选条件查询后的结果，勾选其中几条结果，导出，导出内容不为选中的内容
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
4:05 下午

frank.qiu

解决了 SSTS-326 - 器械包信息，通过筛选条件查询后的结果，勾选其中几条结果，导出，导出内容不为选中的内容
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
    • -10
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
2:14 下午

frank.qiu

解决了 SSTS-349 - 回收模块的视频监控录像在器械包信息显示不出来
Options
    • -6
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/videoMonitor/common/heartbeatRequestCommon.js
1:58 下午

yuandongxiao

广医二院的批量打印发货计划的打印配置，手选申请单打印改为用二等分的连续纸进行打印。
Options
    • -2
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/config/gyey/print/printConfig.js
1:54 下午

jason

解决jira问题：SSTS-347 视频监控模块，新建保存摄像头 定义和电脑工作站定义时，有重复项时，前端没有提醒，后台有相关的报错提示信息
Options
    • -2
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/service/CameraDefinitionManagerImpl.java
    • -4
    • +14
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/service/WorkstationManagerImpl.java
1:49 下午

frank.qiu

解决了 SSTS-347 - 视频监控模块，新建保存摄像头 定义和电脑工作站定义时，有重复项时，前端没有提醒，后台有相关的报错提示信息
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/videoMonitor/cameraDefinitionView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/videoMonitor/computerDefinitionView.js
11:46 上午

frank.qiu

解决了 ZSRY-15 - 修改标识牌标签“小标签”模板的打印格式
Options
    • -1
    • +201
    /ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js
11:38 上午

jason

解决jira问题：SSTS-348 科室互借，删除状态为已借出的单，失败
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
11:34 上午

zc.li

解决：ZJJSRM-50.外来器械申请单统计报表中增加“床位”列.
Options
    • -23
    • +37
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jasper
11:06 上午

terry.kwan

广医二院的批量打印发货计划的打印配置，改为用二等分的连续纸进行打印。
Options
    • -1
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/config/gyey/print/printConfig.js
11:05 上午

jason

解决jira问题：SSTS-348 科室互借，删除状态为已借出的单，失败
Options
    • -1
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
    • -11
    • +8
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
10:55 上午

frank.qiu

解决了 ZJJSRM-51 - 重新打印标识牌时，增加确认功能，提示重复的标识牌会有影响，确认后再打印
Options
    • -2
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
Wednesday 31 Mar 2021
9:13 下午

frank.qiu

解决jqueryAjaxRequest无效的问题
Options
    • -8
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/videoMonitor/common/heartbeatRequestCommon.js
8:24 下午

zc.li

解决历史BUG，SSTS-350，物品发放分布饼图查询不带有[的消毒物品可能会报错的问题(String index out of range: -1)；
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
8:22 下午

jason

解决jira问题：DGKHYY-27 HIS系统传送外来器械申请单到追溯系统时，申请单的申请科室和结算科室可通过配置文件配置
Options
    • -2
    • +2
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java
    • -4
    • +4
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java
    • -2
    • +2
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointForeignTousseApplicationAction.java
5:51 下午

LQC

no_comment
Options
    • -39
    • +39
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js
5:51 下午

LQC

no_comment
Options
    • -4
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
5:00 下午

zc.li

修复ZSYY-291 修复退货时，materialAmountAtThatTime值为空的问题。
Options
    • -1
    • +1
    /ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
4:41 下午

frank.qiu

解决了 GDSZYY-81 - 手术室必须查看外来器械装配时拍摄的图片才能签收和录入病人使用记录
Options
    • -2
    • +160
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
4:39 下午

jason

解决jira问题：GDSZYY-81 手术室必须查看外来器械装配时拍摄的图片才能签收和录入病人使用记录
Options
    • -0
    • +28
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
3:08 下午

jason

解决jira问题：GDSZYY-82 修改外来器械申请单时支持删除单上的外来器械包
Options
    • -0
    • +43
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
2:49 下午

shuyongfu

解决:

SSTS-277 PDA科室互借，扫描条码时会自动将条码填充到借用科室栏

DGSETYY-2 海信PDA型号为NX的，扫描条码可以正常登录系统和在其他各环节扫描条码时可以正常显示对应的数据

NFYY-9 小码哥-东集PDA录入使用记录功能光标定位失误

DGZYY-180 PDA上添加灭菌记录时，强制用户先扫描灭菌炉条码、灭菌程序条码后才能扫描器械包

版本由4.7.16调整为4.7.17

Options
    • -4
    • +4
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.17_20210331_v4_1_6p_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.11_20201214_v4_1_nologo_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.10_20201204_v4_1_nologo_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.13_20210119_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.13_20210119_v4_1_6p_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.10_20201204_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.17_20210331_v4_1_nologo_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.13_20210119_v4_1_nologo_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.12_20210105_v4_1_6p_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.12_20210105_v4_1_nologo_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.10_20201204_v4_1_6p_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.11_20201214_v4_1_6p_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.12_20210105_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.17_20210331_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.11_20201214_v4_1_release.apk
2:18 下午

terry.kwan

提交文字边缘描了白边的logo，解决首页的深色背景下logo看不清的问题。ASSGYEY-44
Options
    • binary
    /ssts-web/src/main/webapp/disinfectsystem/config/gyey/img/logo_gyey.png
2:13 下午

shuyongfu

解决:DGZYY-180 PDA上添加灭菌记录时，强制用户先扫描灭菌炉条码、灭菌程序条码后才能扫描器械包
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
11:13 上午

frank.qiu

解决了 SZYK-34 - 针对设备运行结束后提醒功能的改进
Options
    • too large
    /ssts-web/src/main/webapp/js/common.js
10:11 上午

frank.qiu

解决了 GDSZYY-82 - 修改外来器械申请单时支持删除单上的外来器械包
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
10:10 上午

frank.qiu

解决了 SZYK-34 - 针对设备运行结束后提醒功能的改进
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
    • -51
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • too large
    /ssts-web/src/main/webapp/js/common.js
10:09 上午

jason

解决jira问题：SZYK-34 针对设备运行结束后提醒功能的改进
Options
    • -8
    • +15
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java
    • -1
    • +2
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManager.java