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 25 Apr 2021
10:17 上午

shuyongfu

解决:XKYY-184 现场发布包升级到4.1最新版

项目专有的个性化文件移值至对应目录

Options
  1. /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/spring
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/interfaces/dataSyncConfig.json
    • -0
    • +46
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/spring/HERP.xml
  5. /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/interfaces/mybatis
    • -0
    • +34
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/spring/timer.xml
    • -0
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/interfaces/mybatis/SyncSupplierMapper.xml
    • -0
    • +1223
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/print/printConfig.js
    • -0
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • -0
    • +59
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/config.js
  11. /ssts-web/src/main/webapp/disinfectsystem/config/xkyy
    • -0
    • +140
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • -0
    • +98
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/spring/HIS.xml
  14. /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/interfaces
  15. /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/print
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/config/xkyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
10:13 上午

shuyongfu

解决:XKYY-184 现场发布包升级到4.1最新版

升级过程中的语句脚本优化调整(提高性能及各种升级场景的兼容性)

Options
    • -8
    • +8
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.39_4.9.40.sql
    • -2
    • +8
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_oracle.sql
    • -2
    • +7
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_sqlserver.sql
10:12 上午

shuyongfu

解决:XKYY-184 现场发布包升级到4.1最新版

发现有些项目的标识牌定义对应的器械包定义为空,所以不会有对应的清洗篮筐

Options
    • -34
    • +37
    /ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
6:21 上午

LJH

更新系统服务器最新配置项

//如果一个用户属于多个科室，登录完系统需不需要弹出切换科室选项的小窗

defaultShowOrgChange:true,

Options
    • -6
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/nfykdxfsdsyy/config.js
Friday 23 Apr 2021
5:59 下午

frank.qiu

解决使用记录点击返回js报错的问题
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
4:46 下午

jason

解决jira问题：ZJJSRM-53 倍力曼设备接口设置信息中增加【参数匹配方式】的属性
Options
    • too large
    /ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • -10
    • +16
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
4:43 下午

zc.li

解决：ZJJSRM-53。倍力曼设备接口设置信息中增加【参数匹配方式】的属性
Options
    • -1
    • +0
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.73_4.9.73.sql
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.73_4.9.74.sql
4:42 下午

zc.li

解决：ZJJSRM-53。倍力曼设备接口设置信息中增加【参数匹配方式】的属性
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.73_4.9.73.sql
    • -1
    • +1
    /forgon-tools/src/main/java/com/forgon/Constants.java
4:38 下午

zc.li

解决：ZJJSRM-53。倍力曼设备接口设置信息中增加【参数匹配方式】的属性
Options
    • -13
    • +45
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
    • -12
    • +19
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
    • -1
    • +1
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/BelimedSterilizerRecordManagerImpl.java
    • -0
    • +13
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java
3:13 下午

linnansheng

新建项目:茂名市人民医院 project=mmsrmyy
Options
    • -0
    • +86
    /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/spring/HIS.xml
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/interfaces/dataSyncConfig.json
  3. /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/spring
  4. /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/menu
  5. /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy
    • -0
    • +28
    /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  7. /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/interfaces
    • -0
    • +52
    /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • -0
    • +1172
    /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/print/printConfig.js
  10. /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/print
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • -0
    • +787
    /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/menu/menuconfigure.js
  13. /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/interfaces/mybatis
    • -0
    • +147
    /ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/config.js
9:03 上午

LJH

增加一个配置

//如果一个用户属于多个科室，登录完系统需不需要弹出切换科室选项的小窗

defaultShowOrgChange:true,

Options
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/nfykdxfsdsyy/config.js
Thursday 22 Apr 2021
7:03 下午

zc.li

优化：NYSY-25.修复质量监测质量监测统计月报不能完整显示过长的元素名称.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportLineChartView.jasper
    • -0
    • +10
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/QualityMonitoringInspectMonthLineChartBean.java
    • -3
    • +3
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportLineChartView.jrxml
6:08 下午

frank.qiu

优化DGSDBZXYY-126:质量监测报表、质量监测项统计月报要能统计出临床科室登记的质量监测信息
Options
    • -2
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp
5:23 下午

zc.li

优化：NYSY-25.修复质量监测质量监测统计月报不能完整显示过长的元素名称.
Options
    • -20
    • +21
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectQuarterCompareReportView.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportView.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectDayOfMonthReportView.jasper
    • -1
    • +2
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectDayOfMonthReportView.jrxml
    • -4
    • +5
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectCompareReportView.jrxml
    • -6
    • +7
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectQuarterCompareReportView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectCompareReportView.jasper
4:59 下午

zc.li

优化：NYSY-33。在外来器械申请单统计报表增加【材料明细】。材料明细汇总有时显示不全的问题；
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
4:03 下午

frank.qiu

优化DGZYY-178：灭菌炉增加按炉次提醒的灭菌程序设置(强制提醒点击确定后不自动填写灭菌程序)
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
3:20 下午

frank.qiu

优化NYSY-25：质量监测元素名称的最大长度限制增大到150个汉字
Options
    • -0
    • +13
    /ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
2:31 下午

jason

解决jira问题：DGZYY-181 灭菌记录扫描位置保存提交灭菌记录后，重新打开该灭菌记录，位置信息为空（通过干预功能，将包1、篮筐1从灭菌记录中移除，或者删除灭菌记录时，器械包和篮筐的位置信息应该清空）
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
11:06 上午

zc.li

解决：CDSLQYQYYY-89。新增配置项createNormalTousseDefinitionWithSuffixNameWhenCreateCustomTousseDefinition。控制新增自定义器械包后，是否创建同名+(自定义)名称的类型为器械包的包定义。
Options
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
Wednesday 21 Apr 2021
7:00 下午

jason

解决jira问题：KPSZXYY-44 质量监测定义项设置科室后，并不能按照设置的科室过滤显示(质量监测定义和定期监测定义同名时，有些定义查不出来)
Options
    • -1
    • +1
    /ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
6:26 下午

zc.li

解决：NYSY-33。在外来器械申请单统计报表增加【材料明细】;SSTS-364:一张外来器械申请单如果申领了多套不同供应商的外来器械，在外来器械申请单统计报表中这些物品会重复显示，并且供应商也只显示了1.
Options
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp
    • -6
    • +141
    /ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
6:26 下午

zc.li

解决：NYSY-33。在外来器械申请单统计报表增加【材料明细】;SSTS-364:一张外来器械申请单如果申领了多套不同供应商的外来器械，在外来器械申请单统计报表中这些物品会重复显示，并且供应商也只显示了1.
Options
    • -1
    • +15
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jrxml
    • -0
    • +8
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • -1
    • +4
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -18
    • +11
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml
    • -0
    • +24
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseItemVO.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jasper
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport.jasper
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +519
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport.jrxml
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/nfykdxfsdsyy/config.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport_subreport1.jasper
    • -0
    • +127
    /ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport_subreport1.jrxml
6:13 下午

jason

解决jira问题：BJ307YY-91 一次性物品设置了最小最大库存预警功能，用户登录时进行告警弹窗提醒
Options
    • -0
    • +51
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
    • -5
    • +32
    /ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/systemwarning/SystemWarningItemVO.java
6:13 下午

frank.qiu

解决了 BJ307YY-91 - 一次性物品设置了最小最大库存预警功能，用户登录时进行告警弹窗提醒
Options
    • -1
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js
    • -0
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -0
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
3:38 下午

frank.qiu

解决了 SSTS-362 - 整包申请的消毒物品在回收时不允许修改材料数量
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -1
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
2:50 下午

frank.qiu

解决了 SSTS-361 - 回收时修改消毒物品材料数量不允许全部改成0，至少要有一个材料的数量大于0
Options
    • -3
    • +8
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
2:41 下午

frank.qiu

解决了 SSTS-196 - 任务组设置页面，默认光标位置下拉框有错别字“蓝框”
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupForm.js
2:07 下午

jason

解决jira问题：GDSZYY-89 从病人信息接口获取手术单号信息，并给使用记录表单的手术单号输入框赋值
Options
    • -4
    • +4
    /ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdszyy/FindPatientInfoByHospitalNumDaoImpl.java
11:54 上午

jason

解决jira问题：DGZYY-181 灭菌记录扫描位置保存提交灭菌记录后，重新打开该灭菌记录，位置信息为空（灭菌中的，扫描位置后再保存，位置不会保存进去）
Options
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • too large
    /ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • -0
    • +9
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
11:18 上午

frank.qiu

解决了 SSTS-363 - 在IE浏览器下，科室申领模块填写申请单时，双击物品名称图片显示不出来的问题
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js