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

Saturday 25 Jul 2020
4:57 下午

jason

解决jira问题：DGSDBZXYY-46 东莞市东部中心医院 标签模板设计的表格设计器，增加【材料名称[材料规格]】的选项
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
4:50 下午

zengyuan

解决：河北省胸科医院HBSXKYY-11 打印器械包标签的炉号炉次不对 ,小袁测试出IE报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/print/printConfig.js
3:37 下午

jason

解决jira问题：HBSXKYY-9 河北省胸科医院 增加装配人与审核人是否相同的检查
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
2:52 下午

frank

解决查看器械包图片界面器械包名称乱码的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
2:34 下午

shuyongfu

处理:HBSXKYY-9 增加装配人与审核人是否相同的检查

提示信息调整

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.97_20200725_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.97_20200725_v4_1_6p_release.apk
2:20 下午

shuyongfu

处理一张外来器械申请单申请多种外来器械包时,其中的一种外来器械包拆包后部分发货报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
12:03 下午

shuyongfu

解决:HBSXKYY-14 PDA添加清洗记录时支持清洗机的默认清洗程序

增加返回清洗机的"默认清洗程序"字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
11:36 上午

shuyongfu

处理pda端app刚打开时、登录页页面左上角显示"服务器"三个字的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.97_20200725_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.97_20200725_v4_1_release.apk
11:01 上午

shuyongfu

解决:HBSXKYY-9 增加装配人与审核人是否相同的检查

DGSDBZXYY-8 PDA录入清洗时，扫描篮筐不能展开查看筐内物品

HBSXKYY-14 PDA添加清洗记录时支持清洗机的默认清洗程序

版本号由4.9.96调整为4.9.97

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.97_20200725_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.97_20200725_v4_1_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
10:58 上午

shuyongfu

解决:HBSXKYY-9 增加装配人与审核人是否相同的检查

pda审核页面扫描器械包条码时调用的接口增加返回器械包实例的装配人字段

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
Friday 24 Jul 2020
6:53 下午

frank

优化打开窗口的地址
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/js/common.js
6:42 下午

jason

解决jira问题：HBSXKYY-9 河北省胸科医院 增加装配人与审核人是否相同的检查
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
6:32 下午

zengyuan

解决:河北省胸科医院HBSXKYY-9 增加装配人与审核人是否相同的检查,pc端
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
6:09 下午

frank

优化ZSWY-126：装配界面，添加报损或丢失的时候过滤一次性物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/recyclingLostRecordForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordForm.js
5:33 下午

jason

解决jira问题：PYQZYY-173 番禺区中医院 多手术室器械包流转功能改造
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationComparator.java
5:30 下午

frank

优化ZSWY-130：装配界面的待装配任务表格的物品名称和清洗篮筐列的显示方式改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
5:05 下午

frank

解决HBSXKYY-13：回收模块待入筐列表的排序优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/config.js
4:47 下午

zc.li

修复：ZSWY-129。回收保存产生装配任务时，有时会报空指针的问题;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:56 下午

yuandongxiao

selenium代码提交：注释多余操作步骤
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
12:14 下午

terrykwan

提交熊家宇提供的项目现场的配置文件。FSSZYY-4
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/config.js
11:16 上午

shuyongfu

解决:HBSXKYY-14 PDA添加清洗记录时支持清洗机的默认清洗程序

清洗机管理-添加或修改清洗机时，在清洗机form表单页面如果清洗程序grid中删除的清洗程序和表单中的默认清洗程序的值一致时,将默认清洗程序清空。防止出现该清洗机的默认清洗程序不在右边清洗程序grid列表中的情况

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
Thursday 23 Jul 2020
4:51 下午

frank

解决ZSWY-129：弹出两个提示框的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
4:43 下午

jason

解决jira问题：DGSDBZXYY-47 东莞市东部中心医院 外来器械发货单打印格式优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
4:08 下午

zengyuan

解决:东莞市东部中心医院DGSDBZXYY-47 外来器械发货单打印格式优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js
3:53 下午

frank

解决HBSXKYY-12：回收记录保存并新建时记住清洗篮筐
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
2:34 下午

frank

解决DGSDBZXYY-45：历史回收记录列表显示手术间列
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectOperationRoom.jsp
2:32 下午

zc.li

解决：DGSDBZXYY-45。历史回收记录列表显示手术间列并新增手术间查询及过滤功能;
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
10:35 上午

shuyongfu

解决:DGSDBZXYY-7 PDA灭菌记录扫描清洗篮筐，提示信息优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
Wednesday 22 Jul 2020
6:53 下午

frank

优化SZNSRMYY-26：外来器械包干预管理重新拆包的时候，外来器械包默认类型自动被修改等问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js
6:33 下午

shuyongfu

解决:ASSFDZLYY-25 供应室填申请单申领一次性物品发货后，供应室库存没有扣减

处理高值耗材发货的几个问题

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java