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 39135 is being indexed.

Tuesday 17 Dec 2024
10:31 上午

zc.li

ZSWY-247 【设备运行时间统计报表】运行时间计算方式变更
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceUptimeStatisticsReportHelper.java
10:29 上午

jason

解决jira问题：ZSWY-246【配包注意事项】新增强制查看配包注意事项功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseNoteViewRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
10:24 上午

zc.li

ZSWY-247 【设备运行时间统计报表】运行时间考虑需减去所有中断时间的版本。提交的目的是需求改了，不用这种计算方式，但又想保留代码痕迹,如果以后需要此版本可以直接使用，所以提交。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceUptimeStatisticsReportHelper.java
Monday 16 Dec 2024
6:39 下午

frank.qiu

解决了 ZSWY-246 - 【配包注意事项】新增强制查看配包注意事项功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
6:11 下午

zc.li

完善 ZSWY-247 【设备运行时间统计报表】汇总不在精确到秒，而是把每列的时间忽略秒求和
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceUptimeStatisticsReportHelper.java
5:05 下午

frank.qiu

解决了 ZSYY-396 - 【急用物品处理周期统计报表】新增多项改进(新增多个表格列，移除部分表格列，更改部分表格列取值)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js
3:54 下午

zc.li

SSTS-721 【回收清点】优化因包定义隐藏回收功能引起的待回收申请单列表查询的效率问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
2:38 下午

frank.qiu

解决了 SSTS-722 - 将丢失报损数量减少为0后，回收界面的丢失报损备注没有消失的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.js
2:18 下午

frank.qiu

解决了 SSTS-722 - 将丢失报损数量减少为0后，回收界面的丢失报损备注没有消失的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js
2:09 下午

zc.li

完善 ZSWY-247 【设备运行时间统计报表】新增运行时长计算方式调整，扣除灭菌中断时间；不满足1分钟的不显示
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceUptimeStatisticsReportHelper.java
Sunday 15 Dec 2024
10:47 下午

hongrun.zhou

上传现场最新config.js文件，

新增：

//是否开启手术预约同步按钮,默认为false

enableSyncOperationReservation:true,

//同步手术预约申请单时，若有匹配不到的手术名，是否允许同步

syncOperation_AllowSyncWhenAnyNoMatchingOperationName:true,

//启用回收后生成实例的功能

enableAnInstanceIsGeneratedAfterRecycled:true,

//器械包信息的默认查询数据排序方式

defaultSortingMethodOfTousseInstanceManager:"packing"

修改：

doNotNeedValidateOperationRoomToShowInOperationReservationList:true,

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
10:33 下午

hongrun.zhou

1、手术时间字段jira登记错误，故将原字段SCHEDULED_DATE_TIME修改SCHEDULE_DATE_TIME

2、由于手术预约申请单需要获取状态为5的申请单，故将文件中按手术时间查找手术预约单中，where1=1修改为WHERE STATUS = 5

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/interfaces/mybatis/SyncOperationReservation_Mapper.xml
Friday 13 Dec 2024
6:03 下午

frank.qiu

解决了 SSTS-722 - 将丢失报损数量减少为0后，回收界面的丢失报损备注没有消失的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js
5:42 下午

jason

解决jira问题：ZSYY-403 使用记录定时自动完成审核并生成申请单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/interfaces/mybatis/FindPatientSurgicalStatusMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/his.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/FindPatientSurgicalStatusDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/timer.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OperationInfoVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
5:28 下午

jason

解决jira问题：ZSYY-405 外来器械包申请单装配状态取值异常的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
3:17 下午

frank.qiu

解决了 ZSWY-247 - 【新功能】增加【设备运行时间统计报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceUptimeStatisticsReportView.js
3:16 下午

zc.li

完善 ZSWY-247 【新功能】增加【设备运行时间统计报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceUptimeStatisticsReportHelper.java
12:53 下午

hongrun.zhou

同步现场配置，调整了外部代理灭菌单的条码大小。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
11:55 上午

jason

解决jira问题：GDSRMYY-622【使用记录】快捷干预解除器械包新增同时移除对应回收单的器械包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
Thursday 12 Dec 2024
5:47 下午

zc.li

解决 DGSDBZXYY-222 【设备维护报表】配置项“isDeviceMaintenanceCus”中新增查询项“项目名称”
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/JasperReportManagerImpl.java
5:06 下午

zc.li

解决 DGSDBZXYY-222 【设备维护报表】配置项“isDeviceMaintenanceCus”中新增查询项“项目名称”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DeviceMaintenanceCusDataSourceHelper.java
4:59 下午

frank.qiu

解决了 DGSDBZXYY-222 - 【设备维护报表】配置项“isDeviceMaintenanceCus”中新增查询项“项目名称”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.js
4:51 下午

frank.qiu

解决了 DGSDBZXYY-222 - 【设备维护报表】配置项“isDeviceMaintenanceCus”中新增查询项“项目名称”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.js
4:32 下午

zc.li

解决 ZSYY-396 【急用物品处理周期统计报表】新增多项改进(新增多个表格列，移除部分表格列，更改部分表格列取值)

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UrgentNeedGoodsProcessingCycle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UrgentNeedGoodsProcessingCycleHelper.java
4:13 下午

frank.qiu

解决了 ZSYY-396 - 【急用物品处理周期统计报表】新增多项改进(新增多个表格列，移除部分表格列，更改部分表格列取值)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js
3:19 下午

zc.li

完善 SSZXYY-18 【满意度调查】新增可配置满意度选项以及填写原因的版本
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartSatisfyReportHelper.java
10:56 上午

jason

解决jira问题：BJDWLJZQJY-4【科室问题反馈】新增供应室和服务科室之间进行反馈沟通
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/problemreportmanager/problemreport/service/ProblemManagerImpl.java
10:48 上午

frank.qiu

解决了 FSSZYY-41 - 【一次性物品管理】系统设置的一次性物品的最大申请数量上线提高到99999
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
Wednesday 11 Dec 2024
6:01 下午

jason

解决jira问题：SSZXYY-18【满意度调查】新增可配置满意度选项以及填写原因的版本
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTableAction.java
5:21 下午

terry.kwan

增加一个自定义的servlet过滤器。解决Tomcat的CVE-2016-5388漏洞。GZSZYY-86
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/filter/RemoveProxyHeaderFilter.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/web-xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/web-xml/web.xml