forgon-ssts-v4.1 / SterileSupplySystem / branches

V4.1.0

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 24
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 24
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 39507 is being indexed.

Tuesday 11 Feb
3:48 下午

jason

解决jira问题：GDSRMYY-623 【预约加急功能】新增预约加急分组设置功能
Options
    • ?
    ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/service/UseRecordUrgentReservationManagerImpl.java
    • ?
    ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/vo/UrgentReservationTousseVo.java
  3. ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/urgentreservationgroup/controller
  4. ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/urgentreservationgroup/dto
    • ?
    ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/controller/UseRecordUrgentReservationController.java
    • ?
    ./ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml
    • ?
    ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/urgentreservationgroup/service/UrgentReservationGroupManagerImpl.java
    • ?
    ./ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
    • ?
    ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/urgentreservationgroup/vo/UrgentReservationGroupVo.java
    • ?
    ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/urgentreservationgroup/dto/UrgentReservationGroupDto.java
    • ?
    ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/service/UseRecordUrgentReservationManager.java
    • ?
    ./ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
  13. ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/urgentreservationgroup
    • ?
    ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/urgentreservationgroup/controller/UrgentReservationGroupController.java
  15. ./ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/urgentreservation/urgentreservationgroup/vo
  16. … 9 more files in changeset.
3:13 下午

frank.qiu

解决了 HZSRMYY-88 - 【质量监测管理】字段“责任人”设置为必填时改进为可根据是否合格来必填
Options
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
2:33 下午

frank.qiu

解决了 DGZYY-236 - 【回收清点】外来器械单新增快速回收功能
Options
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/foreignTousseRecycleForTouchScreen.js
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/foreignTousseRecycleForTouchScreen.jsp
2:29 下午

frank.qiu

解决了 GDSRMYY-623 - 【预约加急功能】新增预约加急分组设置功能
Options
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordView.jsp
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordForm.js
11:41 上午

frank.qiu

解决了 GDSRMYY-623 - 【预约加急功能】新增预约加急分组设置功能
Options
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordView.js
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordForm.js
    • ?
    ./ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
    • ?
    ./ssts-web/src/main/webapp/homepage/menu.jsp
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/common/selectTousseExt4.js
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordView.js
    • ?
    ./ssts-web/src/main/resources/systemset/operationDefine.xml
    • ?
    ./ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordForm.js
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordView.jsp
    • ?
    ./ssts-web/src/main/webapp/homepage/menuconfigure.js
11:18 上午

zc.li

NFYY-116 【干预管理】清洗记录干预、灭菌记录干预增加手动唤醒接口定时器匹配功能

Options
    • ?
    ./ssts-web/src/main/webapp/disinfectsystem/config/nfykdxnfyy/spring/timer.xml
10:24 上午

jason

解决jira问题：GZSLWQGSKY-5【第三方器械包管理】对接（老肯医疗公司）的器械包接口接收同名称的多个标识牌器械包时无法保存
Options
    • ?
    ./ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/LaoKenThirdPartyTousseReceiveRecordManagerImpl.java
Monday 10 Feb
6:58 下午

shuyongfu

处理:GZSLWQGSKY-2 【PDA】【第三方器械包管理】新增第三方器械包接收功能模块

BLXRMYY-48 东软PDA型号：S611D、iDATA 型号T2 扫描接口适配开发

Options
    • ?
    ./ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.40_20250210_v4_1_6p_release.apk
    • ?
    ./ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    ./ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    ./ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.40_20250210_v4_1_release.apk
    • ?
    ./ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.40_20250210_v4_1_nologo_release.apk
6:13 下午

zc.li

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
Options
    • ?
    ./ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java
6:04 下午

zc.li

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
Options
    • ?
    ./ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java
    • ?
    ./ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerThreadTests.java
    • ?
    ./ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
5:57 下午

zc.li

提交后台代码 ZSRY-116 改善多个用户同时进行回收保存操作时出现乐观锁的使用体验。
Options
    • ?
    ./ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerThreadTests.java
    • ?
    ./ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerTests.java
5:53 下午

zc.li

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

jason

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

zc.li

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

frank.qiu

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

frank.qiu

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

zc.li

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

linnansheng

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

frank.qiu

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

zc.li

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

zc.li

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

jason

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

jason

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

jason

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

jason

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

zc.li

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

jason

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

jason

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

frank.qiu

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

jason

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