forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 46
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 46
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

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
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 35116 is being indexed.

Wednesday 01 Feb 2023
10:29 上午

li.wei

增加外来器械申请单统计报表材料显示的配置项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
Tuesday 31 Jan 2023
3:43 下午

shuyongfu

处理:GYEY-786 【发货管理】模块新增“一次性物品自定义批量发货”功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
2:08 下午

frank.qiu

解决了 QYSRMYY-46 - 新增【数据实时看板】模块
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/index.jsp
12:01 下午

frank.qiu

解决了 QYSRMYY-46 - 新增【数据实时看板】模块
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/realTimeDashboards/js/index.js
11:23 上午

frank.qiu

解决了 HDQRMYY-54 - 外来器械申请单的病人信息，在回收界面打开该申请单的回收记录里的备注栏无病人信息显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
10:38 上午

jason

解决jira问题：ZJYY-126 外来器械申请单点击“批量确认归还”输入信息后点击确认，会变成“提前归还”的错误,并且二次回收、清洗信息消失
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.4_5.0.5.sql
Monday 30 Jan 2023
6:42 下午

jason

解决jira问题：ZJYY-126 外来器械申请单点击“批量确认归还”输入信息后点击确认，会变成“提前归还”的错误,并且二次回收、清洗信息消失
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
4:34 下午

zc.li

删除多余的历史代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
4:31 下午

zc.li

解决：DGSDBZXYY-191 【十八项指标分析报表】的”器械清洗不合格率“、【工作质量持续收集统计报表】的”器械清洗不合格数“都统计了器械清洗不合格的包数及件数、应改为只统计件数
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
11:28 上午

zc.li

多余代码删除
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:19 上午

zc.li

修复ZSLY-379 修复器械清洗不合格率 复用性物品不合格率 包装不合格率显示为0的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:15 上午

frank.qiu

解决了 SSZXYY-5 - 一体化改造：界面集成改造，实现消毒供应系统的主体页面可被iframe标签嵌入使用
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForSszxyy.jsp
11:11 上午

frank.qiu

解决了 ZJYY-126 - 外来器械申请单点击“批量确认归还”输入信息后点击确认，会变成“提前归还”的错误,并且二次回收、清洗信息消失
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
10:54 上午

zc.li

修复HBTSGRYY-11 外来器械二次回收时新增部分二次回收功能，部分回收时还会产生装配任务的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
10:40 上午

frank.qiu

解决了 SSZXYY-5 - 一体化改造：界面集成改造，实现消毒供应系统的主体页面可被iframe标签嵌入使用
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/logonSSOForSszxyy.jsp
Wednesday 18 Jan 2023
5:14 下午

jason

解决jira问题：ZJYY-84 待回收列表和历史回收记录列表的表格列改进为可配置(代码优化)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Tuesday 17 Jan 2023
6:54 下午

jason

解决jira问题：ZJYY-126 外来器械申请单点击“批量确认归还”输入信息后点击确认，会变成“提前归还”的错误,并且二次回收、清洗信息消失
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.4_5.0.5.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
3:25 下午

frank.qiu

解决了 ZJYY-126 - 外来器械申请单点击“批量确认归还”输入信息后点击确认，会变成“提前归还”的错误,并且二次回收、清洗信息消失
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
2:53 下午

frank.qiu

解决了 DGZYY-187 - 配置项“enableScanSterilizationMonitoringPackage”新增可根据灭菌程序跳过监测包监测提示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilisation/sterilisationForm.js
2:20 下午

li.wei

启用一次性物品物资编码功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js
Monday 16 Jan 2023
4:23 下午

zc.li

解决SSTS-582 - 灭菌干预中，删除篮筐，当篮筐内的物品已发货，已签收，已使用等状态时，也能删除成功，并且会将篮筐内的物品状态改为已审核
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
4:21 下午

frank.qiu

解决了 SSTS-582 - 灭菌干预中，删除篮筐，当篮筐内的物品已发货，已签收，已使用等状态时，也能删除成功，并且会将篮筐内的物品状态改为已审核

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js
11:17 上午

frank.qiu

解决了 ZJYY-126 - 外来器械申请单点击“批量确认归还”输入信息后点击确认，会变成“提前归还”的错误,并且二次回收、清洗信息消失
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
10:36 上午

jason

解决jira问题：DGZYY-187 配置项“enableScanSterilizationMonitoringPackage”新增可根据灭菌程序跳过监测包监测提示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
9:51 上午

zc.li

解决：NYSY-52 相同机器号灭菌参数图表数据与多个接口文件数据混合，导致图表信息错误
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/BelimedSterilizerRecordManagerImpl.java
Friday 13 Jan 2023
5:33 下午

shuyongfu

处理:GDSRMYY-544 在接口的返回内容中发现密码，并且密码没有进行hash就直接以明文保存在数据库中，服务器不应该以任何形式保存明文密码信息 改为三层Base64加密处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/crypto/coder/CoderEncryption.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/base64/base64EncryptSample.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/base64/base64Encrypt.js
5:05 下午

frank.qiu

解决了 ZSYY-302 - 装配聚合包完成装配后且无可装配物品情况下，器械包列表中聚合包名称依然可选此聚合包的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
11:44 上午

zc.li

解决：ZSYY-305 需求变更
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
11:34 上午

shuyongfu

处理:GDSRMYY-544 在接口的返回内容中发现密码，并且密码没有进行hash就直接以明文保存在数据库中，服务器不应该以任何形式保存明文密码信息 加载灭菌记录的接口传输的数据内容调整,去掉了对设备接口对象的传输
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
11:30 上午

zc.li

解决：ZSYY-305 需求变更
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java