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

Monday 22 Nov 2021
3:16 下午

shuyongfu

解决:GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
3:06 下午

shuyongfu

解决:GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能

SSTS-454 发货模块 器械包分组过滤,物品类型过滤，时间过滤，组合查询时，如果结果只有代理灭菌单，查询结果其实是不对的，点击提示“获取发货物品失败”

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
2:36 下午

jason

解决jira问题：GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能(代理灭菌单的物品tousseItem没有关联包定义ID)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/vo/TousseItenInfo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
2:19 下午

shuyongfu

解决:GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
1:38 下午

shuyongfu

解决:GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
11:26 上午

shuyongfu

解决:GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
11:12 上午

jason

解决jira问题：XKYY-241 成本核算管理系统里导入数据库报错
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java
10:28 上午

zc.li

修复代理灭菌单的物品包定义为空的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/4.9.81_4.9.82.sql
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
10:22 上午

zc.li

解决 GDSZYY-116 - 聚合包装配界面要记住审核人；普通装配界面改进为按照任务组独立记住配包人和审核人
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView2.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
Sunday 21 Nov 2021
4:50 下午

jason

还原代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/vo/TousseItenInfo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
3:38 下午

jason

解决jira问题：GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能(代理灭菌单的物品tousseItem没有关联包定义ID)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/vo/TousseItenInfo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
8:08 上午

jason

解决：广东省中医院，打印一次物品汇总单页面，没有按照日期查询打印记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanPrintRecordManagerImpl.java
Saturday 20 Nov 2021
11:35 下午

shuyongfu

解决:GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
8:21 下午

jason

解决：广东省中医院，打印一次物品汇总单页面，没有按照日期查询打印记录
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanPrintRecordManagerImpl.java
2:46 下午

jason

解决jira问题：GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
Friday 19 Nov 2021
7:31 下午

jason

代码优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
7:18 下午

frank.qiu

优化 GDSZYY-102 - 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
7:04 下午

shuyongfu

解决:NFYY-22 南方医院idata 80（机器外壳标注型号80，系统显示型号A8），PDA接口开发

ZJYY-61 PDA发货任务模块增加【日期时间范围】的过滤条件

FSFY-77 PDA发货任务页面的时间段过滤，增加时间段的过滤方式

ZSSXLRMYY-211 PDA扫描灭菌篮筐发货给A科室时，会将该篮筐内其他科室申请的物品一起语音播报出来

DGSDBZXYY-183 东软Shaka和霍尼韦尔EDA50P的PDA扫描条码无反应，需要适配开发

GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.25_20211119_v4_1_nologo_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.25_20211119_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.25_20211119_v4_1_6p_release.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
6:59 下午

frank.qiu

优化 GDSZYY-102 - 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
6:49 下午

jason

增加注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManager.java
6:41 下午

frank.qiu

优化 GDSZYY-102 - 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
6:40 下午

frank.qiu

优化 GDSZYY-102 - 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
6:39 下午

shuyongfu

解决:ZJYY-61 PDA发货任务模块增加【日期时间范围】的过滤条件

FSFY-77 PDA发货任务页面的时间段过滤，增加时间段的过滤方式

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
6:26 下午

frank.qiu

优化 GDSZYY-102 - 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
5:49 下午

frank.qiu

解决了 GDSZYY-105 - 回收清点模块支持自定义入筐的篮筐或材料单个删除
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
4:57 下午

frank.qiu

优化 GDSZYY-102 - 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
3:17 下午

jason

解决jira问题：GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
2:48 下午

jason

解决jira问题：GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能(包实例核对状态改为是否接收)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
2:43 下午

jason

解决jira问题：GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能(包实例核对状态改为是否接收)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/vo/TousseInstanceVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
2:17 下午

jason

解决jira问题：GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java