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

Friday 01 Jul 2022
5:19 下午

jason

解决jira问题：SZSDSRMYY-83 外来器械参数设置区域增加【归还后释放清洗篮筐】参数，外来器械包二次回收后，在清洗消毒模块可登记多条清洗记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.92_4.9.93.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
    • ?
    /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
5:17 下午

zc.li

解决：SZSDSRMYY-83 外来器械参数设置区域增加【归还后释放清洗篮筐】参数，外来器械包二次回收后，在清洗消毒模块可登记多条清洗记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java
5:17 下午

zc.li

解决：SZSDSRMYY-83 外来器械参数设置区域增加【归还后释放清洗篮筐】参数，外来器械包二次回收后，在清洗消毒模块可登记多条清洗记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/WashModule.java
5:16 下午

zc.li

解决：SZSDSRMYY-83 外来器械参数设置区域增加【归还后释放清洗篮筐】参数，外来器械包二次回收后，在清洗消毒模块可登记多条清洗记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
5:16 下午

frank.qiu

解决了 SZSDSRMYY-83 - 外来器械参数设置区域增加【归还后释放清洗篮筐】参数，外来器械包二次回收后，在清洗消毒模块可登记多条清洗记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
4:49 下午

jason

解决jira问题：SSTS-537 科室申领，加急标识移除异常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
4:46 下午

frank.qiu

解决了 GYEY-766 - 清洗机耗材使用管理功能开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
3:55 下午

zc.li

修复 未装配物品材料过滤异常的问题：ZJYY-98 “外来器械申请单统计报表”查询结果的物品名称、材料明细、材料汇总列，应在外来器械包申请单提交后就可显示出对应的值
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:20 下午

zc.li

修复 未装配物品过滤异常的问题：ZJYY-98 “外来器械申请单统计报表”查询结果的物品名称、材料明细、材料汇总列，应在外来器械包申请单提交后就可显示出对应的值
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:13 下午

jason

解决jira问题：SSTS-545 优化干预清洗记录的判断装配时间是否比清洗结束时间晚的查询语句，提升查询效率，减少资源占用
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
11:52 上午

zc.li

解决(处理开启一些配置项后报错的问题)：ZJYY-98 “外来器械申请单统计报表”查询结果的物品名称、材料明细、材料汇总列，应在外来器械包申请单提交后就可显示出对应的值
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
11:27 上午

zc.li

解决：ZJYY-79 开启recycleClassifyBasketAfterPacked配置项后，装配时发现清洗篮筐内的物品回收录入错误后，应允许进行修改

编辑 备注分配

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
11:21 上午

zc.li

解决：ZJYY-79 开启recycleClassifyBasketAfterPacked配置项后，装配时发现清洗篮筐内的物品回收录入错误后，应允许进行修改

编辑 备注分配

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
10:55 上午

zc.li

解决：ZJYY-109 运作监控导出按钮点击后页面报错，功能不可用
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
Thursday 30 Jun 2022
6:45 下午

zc.li

解决：ZJYY-79 开启recycleClassifyBasketAfterPacked配置项后，装配时发现清洗篮筐内的物品回收录入错误后，应允许进行修改

编辑 备注分配

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
4:24 下午

linnansheng

提交讯飞语记安装包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/VoiceNote_1291.apk
3:12 下午

jason

解决jira问题：DGSETYY-44 提供给第三方系统调用的使用记录登记接口增加对物品科室共用配置的支持，以及返回的异常信息中将包名称、条码等重要信息通过单独的字段返回
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/HIPMessageWebServiceImplV2.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/common/CssdUseRecordServiceV4Impl.java
11:02 上午

zc.li

解决：ZJYY-98 “外来器械申请单统计报表”查询结果的物品名称、材料明细、材料汇总列，应在外来器械包申请单提交后就可显示出对应的值
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Wednesday 29 Jun 2022
5:40 下午

jason

解决jira问题：BJ307YY-98 外来器械包只有植入物的情况下，填写使用记录后，转换申请单时不进行转换的改进(兼容材料“是否植入物”字段为空的情况)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
5:21 下午

frank.qiu

解决了 GYEY-772 - 【设备耗材消耗管理】模块新增权限管理功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.js
5:03 下午

frank.qiu

解决了 GYEY-772 - 【设备耗材消耗管理】模块新增权限管理功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
4:52 下午

frank.qiu

解决了 GYEY-772 - 【设备耗材消耗管理】模块新增权限管理功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
4:23 下午

frank.qiu

解决了 GYEY-772 - 【设备耗材消耗管理】模块新增权限管理功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/resources/systemset/operationDefine.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menu.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialType/view.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialAddRecord/view.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/view.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/view.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialUseRecord/view.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialType/view.js
2:26 下午

frank.qiu

解决了 GYEY-766 - 清洗机耗材使用管理功能开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/homepage/menuconfigure.js
11:08 上午

jason

解决jira问题：ZSRY-33 - 【质量监测】模块的“质量监测记录”中的字段“登记人”改进为可修改为非当前用户
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
11:06 上午

frank.qiu

解决了 ZSRY-33 - 【质量监测】模块的“质量监测记录”中的字段“登记人”改进为可修改为非当前用户
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
10:33 上午

jason

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(已经保存的清洗记录可以查看耗材消耗明细)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
10:28 上午

frank.qiu

解决了 GYEY-766 - 清洗机耗材使用管理功能开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
Tuesday 28 Jun 2022
6:03 下午

frank.qiu

解决了 GYEY-766 - 清洗机耗材使用管理功能开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js
5:43 下午

jason

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java