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

Monday 25 Jul 2022
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
11:58 上午

jason

解决jira问题：ZSRY-9 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进(升级语句修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.93_4.9.94_oracle.sql
11:17 上午

yuandongxiao

selenium提交：

1.回收模块测试用例：扫描物品物品条码进行回收、丢失标识牌、丢失及报损材料

2.清洗模块测试用例：单独添加材料进行清洗、添加空的清洗记录、手动完成清洗记录

Options
    • ?
    /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/TestWash.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/wash/WashPage.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/CustomRecycleHandle.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/CustomRecycleProxy.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/wash/WashHandle.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/wash/WashProxy.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/recycle/RecyclePage.java
    • ?
    /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/testscript/TestRecycle.java
Friday 22 Jul 2022
4:44 下午

frank.qiu

解决了 ZSRY-9 - 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进
Options
    • ?
    /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/basedatamanager/tousse/foreignTousseView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
4:18 下午

frank.qiu

解决了 ZJYY-108 - PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识（引入json3文件）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoom.jsp
4:13 下午

frank.qiu

解决了 ZJYY-108 - PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoom.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/operationRoom/operationRoomView.js
4:12 下午

jason

解决jira问题：ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationRoom/OperationRoom.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/directory/model/BarcodeDevice.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationroom/service/OperationRoomManagerImpl.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
3:13 下午

frank.qiu

配置项enableTheFunctionOfPrintProcessingOfForeignToussed删除最后一个字符d
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
2:36 下午

linnansheng

更新保定市 三个院区的his路径
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bdsdyzxyy_zy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bdsdyzxyy_xy/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/bdsdyzxyy_dy/spring/HIS.xml
Thursday 21 Jul 2022
1:57 下午

yuandongxiao

新建项目：自动化测试（配置所需的配置项，用于专门做自动化测试）

project=autotest

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/interfaces/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/interfaces/dataSyncConfig.json
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/print
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/spring/HIS.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/interfaces
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/config.js
  12. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/spring
  13. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/autotest/interfaces/mybatis
1:54 下午

jason

解决jira问题：SSTS-552 消毒供应中心物品领用，材料领用总数大于库存时报null提示的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-receiverecord/src/main/java/com/forgon/disinfectsystem/receiverecord/service/ReceiveRecordManagerImpl.java
11:58 上午

jason

解决jira问题：ZSRY-9 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进(升级语句修改)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.93_4.9.94_sqlserver.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.93_4.9.94_oracle.sql
Wednesday 20 Jul 2022
4:57 下午

frank.qiu

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

frank.qiu

解决了 DGSETYY-47 - 回收外来器械包申请单时，在外来器械包清点修改材料数量界面，增加点击外来器械包名称查看该包的仪器图谱功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/showFullImg.jsp
2:21 下午

frank.qiu

解决了 SSTS-551 - 消毒供应中心物品领用中，领用单信息的删除功能不能删除选中的条目
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
1:53 下午

frank.qiu

解决了 SSTS-551 - 消毒供应中心物品领用中，领用单信息的删除功能不能删除选中的条目
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutToSupplyRoomView.js
1:50 下午

frank.qiu

解决了 DGSETYY-47 - 回收外来器械包申请单时，在外来器械包清点修改材料数量界面，增加点击外来器械包名称查看该包的仪器图谱功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
11:19 上午

jason

解决jira问题：ZSRY-9 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进(导入导出基础数据，导出器械包定义时屏蔽"配包注意事项”列的内容;标识牌打印的备注中打印的内容调整为“标识牌”中的“描述”内容)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
10:23 上午

jason

解决：新疆军区总医院 新华长龙清洗机清洗参数接口同步时，报“设备品牌:【XinHua】,设备型号:【changlong DC-5】,机器号:【1】获取接口数据有误!：could not execute query”异常
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java
Tuesday 19 Jul 2022
3:44 下午

jason

解决jira问题：ZSRY-9 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionNote.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
3:44 下午

frank.qiu

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

frank.qiu

解决：ZJYY-84待回收列表和历史回收记录列表的表格列改进为可配置(滚动分页显示有问题)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
2:45 下午

frank.qiu

解决了 ZSRY-9 - 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进（改动记录图片和视频显示100%）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
2:33 下午

frank.qiu

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