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

Thursday 20 Feb
6:36 下午

jason

解决jira问题：GZSLWQGSKY-8 与嘉和美康集成平台的单点登录接口开发
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzslwqgskyy/spring/security
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gzslwqgskyy/spring/security/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/dao/impl/gzslwqgskyy/TokenAuthenticationDaoImpl.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/dao/impl/gzslwqgskyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/projectCustomLibs.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/dao/TokenAuthenticationDao.java
5:42 下午

shuyongfu

处理:SSTS-730 关于PDA端发货计划 追溯的包，扫描固定条码提示“Transaction rolled back”的BUG
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
5:35 下午

jason

解决jira问题：ZJYY-157【借物管理】自动还物功能支持消毒物品
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
11:05 上午

zc.li

解决 GDSZYY-252 【接口对接】洁定GSS67H17灭菌器接口对接
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp
Wednesday 19 Feb
4:18 下午

zc.li

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/NewClassifyBasketThread.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
3:11 下午

jason

解决jira问题：XJJQZYY-137 千樱SCM-D/JSB(1.5)设备接口与追溯系统灭菌记录保存数据冲突导致已发货器械包状态异常。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.34_5.0.35.sql
3:08 下午

jason

解决jira问题：XJJQZYY-137 千樱SCM-D/JSB(1.5)设备接口与追溯系统灭菌记录保存数据冲突导致已发货器械包状态异常。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.34_5.0.35.sql
2:16 下午

jason

解决jira问题：GZSZYY-107【设备维护与监测管理】自定义模式新增项目分组功能(工作区域)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusdef/service/DeviceMaintenanceCusDefManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusdef/action/DeviceMaintenanceCusDefAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusdef/service/DeviceMaintenanceCusDefManager.java
11:57 上午

frank.qiu

解决了 GZSZYY-107 - 【设备维护与监测管理】自定义模式新增项目分组功能(工作区域)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.js
11:36 上午

jason

解决jira问题：ZSRY-117 中二花都院区HIS使用东软集成平台接口信息，含（患者信息接口、人员组织机构接口）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/zsdxfsdeyy/FindPatientInfoByTreatmentNumDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/zsdxfsdeyy/DatasyncConstant.java
11:34 上午

frank.qiu

解决了 GZSZYY-107 - 【设备维护与监测管理】自定义模式新增项目分组功能(工作区域)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomDefView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/reportforms/deviceMaintenanceCusReportView.js
11:07 上午

zc.li

SSTS-735 设备接口代码调整 没改代码逻辑 提高可读性
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/log/service/LogManager.java
11:01 上午

jason

解决jira问题：XJJQZYY-137 千樱SCM-D/JSB(1.5)设备接口与追溯系统灭菌记录保存数据冲突导致已发货器械包状态异常。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/Constants.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/SenohSterilizerRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/dataUpdater/sqls/5.0.34_5.0.35.sql
10:44 上午

zc.li

SSTS-735 设备接口代码调整 没改代码逻辑 抽离代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
10:25 上午

zc.li

SSTS-735 设备接口代码调整 没改代码逻辑 删除了两个try-catch
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
Tuesday 18 Feb
6:32 下午

zc.li

SSTS-735 设备接口完善 降低运行停止概率
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
6:24 下午

zc.li

SSTS-735 设备接口完善 降低运行停止概率
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcess.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
5:29 下午

zc.li

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
5:20 下午

jason

解决jira问题：XJJQZYY-137 千樱SCM-D/JSB(1.5)设备接口与追溯系统灭菌记录保存数据冲突导致已发货器械包状态异常。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
4:50 下午

zc.li

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
4:26 下午

zc.li

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
2:54 下午

jason

解决jira问题：KLMYSRMYY-31 【物品黑白名单过滤设置】中器械包添加选择框不显示已添加的器械包和新增批量添加按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
2:50 下午

frank.qiu

解决了 KLMYSRMYY-31 - 【物品黑白名单过滤设置】中器械包添加选择框不显示已添加的器械包和新增批量添加按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/goodFilterConfig/goodFilterTemplateForm.js
2:40 下午

shuyongfu

处理:GZSLWQGSKY-7 【PDA】【患者使用记录】支持扫描第三方器械包条码录入器械包信息 发货扫第三方条码的处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:08 下午

frank.qiu

解决了 NYSY-73 - 美雅洁清洗机MAG-GSZK385的接口对接开发（接口文件为csv格式）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp
1:49 下午

frank.qiu

解决了 GZSLWQGSKY-6 - 【第三方器械包管理】当接收包类型为外来器械包时，取接口中的"SubTurnaroundID"作为包实例条码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/thirdPartyTousse/thirdPartyTousseForm.js
11:45 上午

shuyongfu

处理:GZSLWQGSKY-7 【PDA】【患者使用记录】支持扫描第三方器械包条码录入器械包信息 发货扫第三方条码的稍后处理(等ssts-207提交后一起提交)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
10:42 上午

zc.li

SSTS-735 设备接口完善 降低运行停止概率
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
10:42 上午

shuyongfu

处理:GZSLWQGSKY-7 【PDA】【患者使用记录】支持扫描第三方器械包条码录入器械包信息
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
10:16 上午

zc.li

SSTS-735 设备接口完善 降低运行停止概率
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java