forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 45
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 45
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 34278 is being indexed.

Thursday 28 Jul 2022
4:37 下午

jason

解决jira问题：ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManagerImpl.java
3:27 下午

yuandongxiao

selenium3提交：

1.回收模块测试用例：回收完成并更换篮筐、部分回收、清洗分类类型自动入筐

2.装配模块测试用例：标识牌装配

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/ExpressRecycleHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/AwaitForRecycleHandle.java
    • ?
    /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/java/test/forgon/disinfectsystem/selenium3/page/recycle/ExpressRecyclePage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/RecycleProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/AwaitForRecyclePage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/AwaitForRecycleProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/ExpressRecycleProxy.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestLogin.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/resources/test/forgon/disinfectsystem/selenium/config/all/testcase_data.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/Utils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestRecycle.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/testscript/TestPack.java
11:02 上午

zc.li

接口完善 对已有接口参数的图标的数据 不再更新图标
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
10:28 上午

jason

解决jira问题：GDSZYY-175 【外来器械申请单】模块中推送过来的申请单中新增参数获取到新的手术名称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java
1:36 上午

terry.kwan

标准模板项目的打印器械包明细单代码，删除2个不需要的变量定义
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/standardProjectTemplate/print/printConfig.js
Wednesday 27 Jul 2022
11:54 下午

terry.kwan

标准模板项目的打印器械包明细单代码，改进为支持标识牌的打印纸张设置，支持连续纸，打印高度能根据内容自适应
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/standardProjectTemplate/print/printConfig.js
11:50 下午

terry.kwan

东莞市横沥医院的打印器械包明细单代码，改进为支持标识牌的打印纸张设置，支持连续纸，打印高度能根据内容自适应
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js
10:08 下午

li.wei

根据现场情况修改东莞横沥医院的配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js
6:55 下午

shuyongfu

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

相关的后台业务方法定义

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManagerImpl.java
4:55 下午

frank.qiu

修复(暂挂本问题下)：SZSZLYY-56 当统计的数据中包含只登记了材料，没登记器械包的质量监测记录，数字类型字段的统计结果就会出错。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
11:24 上午

frank.qiu

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

nanlin.zeng

提交大连中心医院现场配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/config.js
Tuesday 26 Jul 2022
7:00 下午

jason

解决：按照科室分组分开打印“待处理外来器械统计表”
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
5:25 下午

frank.qiu

解决了 SSTS-555 - 点开一张回收申请单的历史回收记录，页面会报错:Cannot read properties of null (reading 'applicationItems')
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
3:40 下午

zc.li

修复(暂挂本问题下)：SZSZLYY-56 当统计的数据中包含只登记了材料，没登记器械包的质量监测记录，数字类型字段的统计结果就会出错。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
3:23 下午

frank.qiu

解决了 ZSRY-9 - 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:24 下午

frank.qiu

解决了 ASSGYEY-29 - 【同步入库单】模块的[同步入库单]功能新增屏蔽入库单功能及界面调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp
11:26 上午

frank.qiu

解决了 KPSZXYY-68 - 标签模板的数据源为外部代理灭菌包，标签里的灭菌员数据源是外部代理灭菌单里的灭菌员，而不是登录账号
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
11:16 上午

frank.qiu

解决了 DLZXYY-2 - 外来器械包申请模块中【打印处理外来器械统计表】的打印表格增加2个字段
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js
10:32 上午

jason

解决jira问题：ASSGYEY-29 【同步入库单】模块的[同步入库单]功能新增屏蔽入库单功能及界面调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dwr/InventoryTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ErrorStorageEntrySN.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
10:21 上午

yuandongxiao

selenium3提交：解决添加回收申请单用例执行不稳定的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/RecycleHandle.java
Monday 25 Jul 2022
6:59 下午

frank.qiu

解决了 ASSGYEY-29 - 【同步入库单】模块的[同步入库单]功能新增屏蔽入库单功能及界面调整
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp
6:47 下午

jason

解决jira问题：DGSETYY-52 回收清点确认沟通功能输入沟通人提示报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
5:33 下午

jason

解决jira问题：KPSZXYY-68 标签模板的数据源为外部代理灭菌包，标签里的灭菌员数据源是外部代理灭菌单里的灭菌员，而不是登录账号
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.95_4.9.96_sqlserver.sql
    • ?
    /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/4.9.95_4.9.96_oracle.sql
5:12 下午

frank.qiu

解决了 KPSZXYY-68 - 标签模板的数据源为外部代理灭菌包，标签里的灭菌员数据源是外部代理灭菌单里的灭菌员，而不是登录账号
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
4:28 下午

frank.qiu

解决了 ZSRY-9 - 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/common/previewWangEditor.jsp
3:55 下午

jason

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(保存清洗程序报错)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/action/CleanMethodAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/service/CleanMethodManagerImpl.java
3:23 下午

frank.qiu

解决了 ZSRY-9 - 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:29 下午

jason

解决jira问题：DGSETYY-49 保存清洗记录时，如果清洗程序和清洗物品的清洗程序不符合，提示信息应能提示出所有的物品名称
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
2:25 下午

frank.qiu

解决了 DLZXYY-2 - 外来器械包申请模块中【打印处理外来器械统计表】的打印表格增加2个字段
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js