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

Monday 11 Jul 2022
3:06 下午

zc.li

完善：GDSZYY-137【工作质量持续收集统计报表】报表名字调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
3:02 下午

jason

解决jira问题：XJJQZYY-113 千樱脉动真空灭菌器（PLC型号S7-1200）设备接口开发，基于西门子profinet协议
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/SenohSterilizerRecordManagerImpl.java
2:51 下午

jason

解决jira问题：ZJYY-111 增加批量修改器械包所属种类功能(代码优化)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
2:07 下午

zc.li

完善：GDSZYY-137【工作质量持续收集统计报表】处理临床器械总件数，处理手术器械总件数增加手术器械科室分组设置过滤和院区过滤。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/BrancheOfHospitalManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReports.java
1:47 下午

yuandongxiao

selenium3提交：添加返回修改、终止、删除申请单的测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestApply.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyPage.java
Friday 08 Jul 2022
6:54 下午

jason

解决jira问题：ZJYY-111 增加批量修改器械包所属种类功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
6:31 下午

jason

解决jira问题：ZJYY-111 增加批量修改器械包所属种类功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/datamodifyrecord/DataModifyRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
    • ?
    /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/datamodifyrecord/service/DataModifyRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dto/ModifyTousseDefinitionDto.java
6:25 下午

zc.li

解决：GDSZYY-139 设计满足广东省中医院需求的个性化的【各任务组质量监测汇总报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js
6:23 下午

zc.li

解决：GDSZYY-139 设计满足广东省中医院需求的个性化的【各任务组质量监测汇总报表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/QualityMonitoringReportTaskGroupVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/qualityMonitoringReportTaskGroupReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/qualityMonitoringReportTaskGroupReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringReportTaskGroup.jsp
    • ?
    /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
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringReportTaskGroup.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
6:06 下午

frank.qiu

解决了 ZJYY-111 - 增加批量修改器械包所属种类功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
5:58 下午

zc.li

修复：GDSZYY-137【工作质量持续收集统计报表】 改善标准分母为0是显示改为-
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollectionCustom3.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollectionCustom3.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollectionCustom2.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollectionCustom2.jrxml
4:59 下午

zc.li

修复：GDSZYY-137【工作质量持续收集统计报表】 和去年对比 改善标准替换分母
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollectionCustom3.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/workQualityCollectionCustom3.jasper
4:01 下午

zc.li

修复：GDSZYY-137【工作质量持续收集统计报表】 不配置查询异常的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
3:47 下午

zc.li

修复：GDSZYY-137【工作质量持续收集统计报表】 不配置时页面报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js
3:29 下午

frank.qiu

解决年度消毒供应中心员工工作量统计报表 oracle查询报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
3:03 下午

frank.qiu

解决了 ZJYY-101 - 【明细核算月报】的搜索组合框改进为查询出结果时不清除搜索文本
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/js/multiSelectCombo.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
2:45 下午

frank.qiu

格式化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/js/multiSelectCombo.js
2:23 下午

yuandongxiao

selenium3提交：自定义器械包主流程测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestApply.java
1:38 下午

shuyongfu

版本由4.7.28调整为4.7.29,解决如下问题:

BDDYZXYY-3 在发货区使用PDA登录账号，界面提示：“请稍候，正在获取灭菌炉分组”，然后显示没有网络登录不进系统

SZSDSRMYY-72 灭菌装载模块中，将篮筐物品统计信息和篮筐物品明细合并显示

DGZYY-198 清洗篮筐的责任人字段设置不允许为空后，在PDA端保存清洗记录时没有检查清洗篮筐责任人是否为空的问题，以及清洗篮筐责任人赋值的改进

DGSETYY-31 PDA端使用记录模块中病人使用记录功能增加特殊感染类型

DGSETYY-34 PDA端使用记录模块支持设置物品加急

GDSZYY-169 PDA端【使用记录】的病人使用记录列表新增扫码过滤筛选使用记录功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.29_20220708_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.29_20220708_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.29_20220708_v4_1_nologo_release.apk
11:24 上午

linnansheng

selenium3提交：优化外部代理灭菌测试用例，去掉一些没用到的多余的导入包，规范命名规则
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/ForeignProxyDisinfectionPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/ForeignProxyDisinfectionHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/ForeignProxyDisinfectionProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/basepage/BaseHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestForeignProxyDisinfection.java
10:22 上午

jason

解决jira问题：GDSZYY-172配置项enableTheFunctionOfPrintingOfForeignTousseToBeReceived的名称修改以及改进为支持多种打印方式及界面调整(选中的申请单合并打印)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
Thursday 07 Jul 2022
7:04 下午

yuandongxiao

selenium3提交：自定义器械包申领测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestApply.java
5:09 下午

zc.li

解决历史bug：SSTS-544 加急数量异常增加
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
4:12 下午

linnansheng

selenium3提交：外部代理灭菌模块测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/ForeignProxyDisinfectionProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/ForeignProxyDisinfectionHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/basepage/BaseHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestForeignProxyDisinfection.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/AllTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/sterile/ForeignProxyDisinfectionPage.java
3:52 下午

yuandongxiao

selenium3提交：敷料包流程测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestPack.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
3:08 下午

frank.qiu

解决了 SSTS-532 - 明细核算月报-科室分组 项，无法搜索筛选
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
3:03 下午

frank.qiu

解决了 SSTS-526 - 科室申领-已打印-下拉菜单-过滤 结果不正常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
2:37 下午

zc.li

解决历史bug：SSTS-544 加急数量异常增加
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
1:57 下午

yuandongxiao

selenium3提交：修复外来器械拆分小包测试用例运行不稳定的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestMainProcess.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/userecord/UseRecordHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/personaldesktop/PersonalDesktopProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackProxy.java
12:00 下午

frank.qiu

解决了 GDSZYY-172 - 配置项enableTheFunctionOfPrintingOfForeignTousseToBeReceived的名称修改以及改进为支持多种打印方式及界面调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js