forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

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

Friday 13 Aug 2021
1:58 下午

jason

解决jira问题：SSTS-151 自定义器械包默认装配组没有设置会导致自定义器械包申请单提交报错(申请已经存在的包定义)
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
11:24 上午

jason

解决jira问题：SSTS-418 同步组织结构时，如果数据源的科室名称末尾带有空格，则同步到我们系统后该科室末尾也带有空格
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
10:16 上午

jason

解决jira问题：SSTS-419 图片保存方式设置为“保存到数据库”，无法正常上传图片
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
Thursday 12 Aug 2021
3:34 下午

frank.qiu

解决了 ZSYKZX-153 - 更新至ssts-zsykzx-4.1.510-R31632-20210715后，添加申请单时看不见【科研项目】字段了
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
2:59 下午

frank.qiu

解决了 SSTS-417 - 同时开启配置项enablePackingSerialNum和showORRoomColumnInHistoryRecyclingRecordList，回收页面样式会错乱
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
1:52 下午

zc.li

解决：SSTS-416。回收清点模块，输入一个错误非篮筐条码时，报“行: 2000 错误: 无法获取属性“errorMessage”的值: 对象为 null 或未定义”。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
10:45 上午

huang.cl

提交现场的配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xkyy/config.js
10:45 上午

huang.cl

提交现场的配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xkyy/config.js
10:32 上午

LQC

//桌面快捷图标配置

desktopShortcutIconsConfig:["外来器械申请"]

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
Wednesday 11 Aug 2021
6:16 下午

zc.li

修复包定义测试用例不通过的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionManagerTests.java
5:21 下午

jiayu.xiong

更新
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/config.js
3:35 下午

zc.li

解决：GDSZYY-98。【定时完成灭菌】设置为”是“，当灭菌记录中有物品时，灭菌炉不能定时自动完成灭菌。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
2:28 下午

shuyongfu

解决:GDSZYY-97 扫码登录的固定密码改为复杂密码

整体封装便于后续扩展与维护

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/forgon-tools/src/main/java/com/forgon/servlet/ForgonServletContextListener.java
1:47 下午

zc.li

解决：SSTS-415。解决装配任务已经装配完了，部分回收时有时会提示装配任务已不存在的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:22 上午

LQC

no_comment
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js
11:10 上午

zc.li

解决：SSTS-415。带标识牌的器械包登记了材料的丢失或报损，回收时先部分回收该带标识牌的器械包，待该标识牌装配完成后，再去回收剩下的器械包，该标识牌会变成已回收状态。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
Tuesday 10 Aug 2021
6:57 下午

frank.qiu

解决了 XKYY-229 - 发货管理里打印发货单，打印出来的出库单号显示undefined
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/xkyy/print/printConfig.js
6:53 下午

zc.li

修复HttpOption修改或保存可能因为id为空导致报错的问题；
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
6:47 下午

frank.qiu

解决满意度调查表打印时出现underfine的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js
6:30 下午

frank.qiu

解决了 ZSSXLRMYY-214 - 材料上传了多张图片，在装配界面只能查看到一张图片的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
6:17 下午

frank.qiu

解决了 XKYY-201 - 满意度调查表定义改进（pringConfig修改为引用各自项目的）
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp
6:10 下午

zc.li

解决：XKYY-224。广州胸科升级前后对比-4.1版本中历史装配记录需增加【转换病人】功能。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/reports/dataindex/PrepareDataForDataIndex.java
6:06 下午

zc.li

解决：XKYY-224。广州胸科升级前后对比-4.1版本中历史装配记录需增加【转换病人】功能。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/gdszyy/SyncForeignTousseApplicationDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
6:05 下午

zc.li

解决：XKYY-224。广州胸科升级前后对比-4.1版本中历史装配记录需增加【转换病人】功能。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/action/ButtJointForeignTousseApplicationAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestForeignTousseGoodRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/controller/ForeignTousseApplicationController.java
6:05 下午

zc.li

解决：XKYY-224。广州胸科升级前后对比-4.1版本中历史装配记录需增加【转换病人】功能。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/recycle/TestForeignTousseApplicationRecycled.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/szsdsrmyy/ForeignTousseWebServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ForeignTousseRecyclingTests.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceExImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketsRecyclingSequenceTests.java
5:48 下午

frank.qiu

解决了 XKYY-224 - 广州胸科升级前后对比-4.1版本中历史装配记录需增加【转换病人】功能
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/foreigntousseapplication/foreignTousseInfoForm.js
    • ?
    /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/recyclingRecord/foreignTousseApplicationForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
5:26 下午

frank.qiu

解决了 XKYY-201 - 满意度调查表定义改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/printSatisfy.js
5:18 下午

jason

解决jira问题：XKYY-201 满意度调查表定义改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/satisfactionsurvey/SatisfactionSurveyTemplate.java
4:50 下午

jason

解决jira问题：XKYY-201 满意度调查表定义改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/satisfactionsurvey/SatisfactionSurveyTemplate.java
4:48 下午

frank.qiu

解决了 XKYY-201 - 满意度调查表定义改进
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/print/printSatisfy.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js