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

Wednesday 17 Aug 2022
11:13 上午

jason

解决jira问题： BJDXZLYY-31 库位管理模块增加与卡迪斯智能货柜系统进行对接功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java
10:37 上午

jason

解决jira问题： BJDXZLYY-31 库位管理模块增加与卡迪斯智能货柜系统进行对接功能(服务器响应超时提示信息修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java
10:30 上午

shuyongfu

处理:ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识

DGSHLYY-6 PDA【回收清点】模块在待回收列表扫描录入了使用记录的标识牌或包外唯一标签条码，可以打开对应的申请单

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
10:25 上午

frank.qiu

解决了 BJDXZLYY-31 - 库位管理模块增加与卡迪斯智能货柜系统进行对接功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.js
10:16 上午

zc.li

完善：GDSZYY-182 数据调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
Tuesday 16 Aug 2022
5:43 下午

jason

解决jira问题： BJDXZLYY-31 库位管理模块增加与卡迪斯智能货柜系统进行对接功能(服务器响应超时提示信息修改；库位编码(托盘号)异常情况处理)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js
3:43 下午

zc.li

完善：GDSZYY-182 数据调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:39 下午

zc.li

完善：GDSZYY-182 数据调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:55 下午

jason

解决jira问题：ZSSXLRMYY-217 包定义的是否装配字段为否的物品，录入清洗记录后，器械包信息的清洗记录应可查到回收及清洗信息(保存清洗记录时，联动修改不装配的器械包实例上的清洗信息)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
10:51 上午

yuandongxiao

selenium3：修复自动化数据运行报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
Monday 15 Aug 2022
6:57 下午

frank.qiu

解决了 SSTS-562 - 器械包工作量统计报表，当查询条件选择申请科室 过多时，后台会提示“Request header is too large”，并且不会查询出数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
5:41 下午

yuandongxiao

selenium3提交测试用例：今天本组装配记录修改包实例信息
Options
    • ?
    /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/page/pack/PackProxy.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/PackHandle.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/TestMainProcess.java
5:40 下午

zc.li

完善：GDSZYY-182 数据调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:32 下午

zc.li

完善：GDSZYY-182 数据调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
2:30 下午

frank.qiu

解决了 DGSETYY-50 - 回收清点确认沟通功能背景颜色改进为可配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
2:27 下午

frank.qiu

解决了 DGSETYY-50 - 回收清点确认沟通功能背景颜色改进为可配置
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
11:53 上午

yuandongxiao

自动化测试项目开启聚合包功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/config.js
Friday 12 Aug 2022
5:27 下午

zc.li

完善：GDSZYY-182 数据调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
5:06 下午

yuandongxiao

selenium3提交测试用例：聚合包装配、器械材料补充、标识牌补充
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/RecycleHandle.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/pack/PackHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/RecyclePage.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/TestPack.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/pack/PackPage.java
4:35 下午

shuyongfu

处理:ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识

DGSHLYY-6 PDA【回收清点】模块在待回收列表扫描录入了使用记录的标识牌或包外唯一标签条码，可以打开对应的申请单

ZSRY-37 PDA【回收清点】模块在添加回收物品时新增扫描条码添加物品

ZSRY-36 PDA端【回收清点】模块预回收申请单界面器械包名称改进为支持换行显示

CSSZXYY-167 东集 型号：CRUISE Asset R2 登陆不了系统，需要做适配开发

BJCYLYY-48 东集小马哥PDA升级到新版4.7.28后修改广播名称导致其他系统不能调用PDA扫描头

版本由4.7.29升级至4.7.30

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.30_20220812_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.30_20220812_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.30_20220812_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
3:43 下午

jason

解决jira问题：GYEY-777 【灭菌目的设置】模块界面以及存储方式改进(联动修改灭菌程序的灭菌目的字段)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.97_4.9.98_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/action/SterilisationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.97_4.9.98_oracle.sql
1:53 下午

jason

ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识

相关的后台业务方法定义

ZSRY-37 PDA【回收清点】模块在添加回收物品时新增扫描条码添加物品

后台业务方法的定义

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Thursday 11 Aug 2022
6:52 下午

zc.li

解决：GDSZYY-182 设计满足广东省中医院需求的个性化的【各分院消毒炉次及各类包统计表】
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/javabeansource/SteAmountEachBranchReportVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/steAmountEachBranchReport.jasper
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/jasperRtp/steAmountEachBranchReport.jrxml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
6:18 下午

frank.qiu

解决了 GZTHZL-16 - 装配时，提示不能同时装配多个器械包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
3:01 下午

frank.qiu

解决了 GDSZYY-182 - 设计满足广东省中医院需求的个性化的【各分院消毒炉次及各类包统计表】
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/steAmountEachBranchReport
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/steAmountEachBranchReport/steAmountEachBranchReport.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/report/steAmountEachBranchReport/steAmountEachBranchReport.jsp
2:25 下午

jason

解决jira问题：BJDXZLYY-31 库位管理模块增加与卡迪斯智能货柜系统进行对接功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManager.java
11:15 上午

zc.li

解决：ZSYY-325 “工作质量持续收集统计报表”的项目个性化字段【普通器械清洗不合格率】、【专科器械清洗不合格率】、【手术器械清洗不合格率】统计的总件数数值与器械包工作量统计报表不一致
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/service/OrgUnitGroupManagerImpl.java
Wednesday 10 Aug 2022
5:44 下午

zc.li

解决 SZSDSRMYY-87 有标识牌的物品回收提示“ID=.........的装配任务已不存在”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
5:00 下午

frank.qiu

解决了 BJDXZLYY-31 - 库位管理模块增加与卡迪斯智能货柜系统进行对接功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/goodsAccess.js
4:20 下午

jason

解决jira问题：ZSSXLRMYY-217 包定义的是否装配字段为否的物品，录入清洗记录后，器械包信息的清洗记录应可查到回收及清洗信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java