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

Monday 10 Feb
5:53 下午

zc.li

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • ?
    /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/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerThreadTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java
  6. /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/helper
4:22 下午

jason

解决jira问题：GZSLWQGSKY-3 第三方器械包接收创建材料定义时，增加_LaoKen的后缀
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ThirdPartyTousseReceiveRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/ThirdPartyTousseReceiveRecordManagerImpl.java
Saturday 08 Feb
6:53 下午

zc.li

删除多余代码
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
4:26 下午

frank.qiu

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

frank.qiu

解决了 QHRSGZZYY-3 - 【标签模块管理】新增内置属性“器械包价格”(数据源：器械包、外来器械包、外部代理灭菌包)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
2:55 下午

zc.li

提交后台代码 NYSY-73 美雅洁清洗机MAG-GSZK385的接口对接开发（接口文件为csv格式）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MargeMAGGSZK385ataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMargeMAGGSZK385.java
2:39 下午

linnansheng

新建项目:前海人寿（广州）总医院 project=qhrsgzzyy
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/menu/menuconfigure.js
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/interfaces
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/interfaces/dataSyncConfig.json
  6. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/menu
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/interfaces/mybatis
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/config.js
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/print
  11. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/spring
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/print/printConfig.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/interfaces/mybatis/syncFromHERP_Mapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/qhrsgzzyy/spring/HIS.xml
2:32 下午

frank.qiu

解决了 NFYY-116 - 【干预管理】清洗记录干预、灭菌记录干预增加手动唤醒接口定时器匹配功能
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/images/web/startStdScheduler.png
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js
2:20 下午

zc.li

修复SZLGEY-13 结束秒取值不对的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Marge120CSVDataManagerImpl.java
Friday 07 Feb
6:35 下午

zc.li

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

jason

解决jira问题：XKYY-250单点登录接口开发，对接医院医院集成平台
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/dao/TokenAuthenticationDao.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xkyy/spring/security/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter/AccessTokenAuthenticationToken.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/dao/impl/xkyy
  5. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xkyy/spring/security
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/dao/impl/xkyy/TokenAuthenticationDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter/TokenAuthenticationFilter.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/projectCustomLibs.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-client-misc/src/main/java/com/forgon/disinfectsystem/security/filter/TokenAuthenticationProvider.java
6:03 下午

jason

解决jira问题：GZSLWQGSKY-1【PC】【第三方器械包管理】对接（老肯医疗公司）的器械包接口及支持新建材料定义和包定义
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/LaoKenThirdPartyTousseReceiveRecordManagerImpl.java
4:57 下午

jason

解决jira问题：GZSLWQGSKY-1【PC】【第三方器械包管理】对接（老肯医疗公司）的器械包接口及支持新建材料定义和包定义
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/ThirdPartyTousseReceiveRecordManagerImpl.java
4:42 下午

jason

解决jira问题：GZSLWQGSKY-1【PC】【第三方器械包管理】对接（老肯医疗公司）的器械包接口及支持新建材料定义和包定义（记录新建标识牌、器械包实例绑定标识牌的日志）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/LaoKenThirdPartyTousseReceiveRecordManagerImpl.java
3:38 下午

zc.li

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

jason

解决jira问题：GZSLWQGSKY-1【PC】【第三方器械包管理】对接（老肯医疗公司）的器械包接口及支持新建材料定义和包定义（包定义默认灭菌程序、任务组默认值修改；参数去除后面的空格）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/vo/TousseTurnaroundDetailsEvent.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/vo/MaterialInstanceVo.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/LaoKenThirdPartyTousseReceiveRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/vo/ThirdPartyTousseInstanceVo.java
10:40 上午

jason

解决jira问题：QHRSGZZYY-3【标签模块管理】新增内置属性“器械包价格”(数据源：器械包、外来器械包、外部代理灭菌包)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Thursday 06 Feb
5:57 下午

frank.qiu

解决了 QHRSGZZYY-3 - 【标签模块管理】新增内置属性“器械包价格”(数据源：器械包、外来器械包、外部代理灭菌包)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
11:41 上午

jason

解决jira问题：GZSLWQGSKY-2【PDA】【第三方器械包管理】新增第三方器械包接收功能模块
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/ThirdPartyTousseReceiveRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/ThirdPartyTousseReceiveRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/controller/ThirdPartyTousseReceiveRecordController.java
10:17 上午

jason

解决jira问题：GZSLWQGSKY-1【PC】【第三方器械包管理】对接（老肯医疗公司）的器械包接口及支持新建材料定义和包定义（接口地址修改）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/ThirdPartyTousseReceiveRecordManagerImpl.java
Wednesday 05 Feb
5:44 下午

frank.qiu

解决了 FSSDERMYY-37 - 【外来器械包管理】外来器械包定义新增可设置必填项字段(积分系数)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/fssdermyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
4:54 下午

jason

解决jira问题：CSSZXYY-178【外来器械包申请】界面的【包状态】数据列增加“过滤”按钮
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-core/src/main/java/com/forgon/component/grid/GridManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
3:08 下午

frank.qiu

解决了 NYSY-72 - 定期监测中“监测范围”是“灭菌炉记录”的表单若“灭菌日期”没填，无法在质量监测报表中正常显示数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
1:55 下午

frank.qiu

解决了 NYSY-71 - 外来器械申请单病人住院号输入框，双击回车出现页面锁定无法选择
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js
1:49 下午

frank.qiu

解决了 NYSY-72 - 定期监测中“监测范围”是“灭菌炉记录”的表单若“灭菌日期”没填，无法在质量监测报表中正常显示数据
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
11:45 上午

frank.qiu

解决了 NYSY-71 - 外来器械申请单病人住院号输入框，双击回车出现页面锁定无法选择
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
Sunday 26 Jan
3:37 下午

frank.qiu

解决了 DGZYY-236 - 【回收清点】外来器械单新增快速回收功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/foreignTousseRecycleForTouchScreen.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/foreignTousseRecycleForTouchScreen.jsp
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
3:18 下午

frank.qiu

解决了 SZSDSRMYY-176 - 【回收清点】新增回收时自动创建新标识牌实例功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
3:16 下午

frank.qiu

解决了 SZSDSRMYY-176 - 【回收清点】新增回收时自动创建新标识牌实例功能
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/basedatamanager/tousse/tousseForm.js
11:04 上午

frank.qiu

解决了 SZSDSRMYY-176 - 【回收清点】新增回收时自动创建新标识牌实例功能
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/spring/HIS.xml